Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REST Client - Avoid creating a field for NOOP HeaderFiller #46227

Merged
merged 1 commit into from
Feb 12, 2025
Merged

REST Client - Avoid creating a field for NOOP HeaderFiller #46227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions .../main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ public void forSubResourceMethod(ClassCreator subClassCreator, MethodCreator sub
collectHeaderFillers(subInterfaceClass, subMethod, headerFillersByName);
String subHeaderFillerName = subInterfaceClass.name().toString() + sha1(rootInterfaceClass.name().toString()) +
"$$" + methodIndex + "$$" + subMethodIndex;
createAndReturnHeaderFiller(subClassCreator, subConstructor, subMethodCreator, subMethod,
createAndReturnHeaderFiller(subClassCreator, subClinit, subMethodCreator, subMethod,
invocationBuilder, index, generatedClasses, subMethodIndex, subHeaderFillerName, headerFillersByName,
Collections.emptyList());
}
Expand All @@ -535,7 +535,7 @@ public void forMethod(ClassCreator classCreator, MethodCreator constructor,
clientBasicAuth.value("password").asString()));
}

createAndReturnHeaderFiller(classCreator, constructor, methodCreator, method,
createAndReturnHeaderFiller(classCreator, clinit, methodCreator, method,
invocationBuilder, index, generatedClasses, methodIndex,
interfaceClass + "$$" + method.name() + "$$" + methodIndex, headerFillersByName, enhancers);
}
Expand Down Expand Up @@ -593,18 +593,19 @@ public void accept(AddHeadersEnhancer.Context context) {
}
}

private void createAndReturnHeaderFiller(ClassCreator classCreator, MethodCreator constructor,
private void createAndReturnHeaderFiller(ClassCreator classCreator, MethodCreator clinit,
MethodCreator methodCreator, MethodInfo method,
AssignableResultHandle invocationBuilder, IndexView index,
BuildProducer<GeneratedClassBuildItem> generatedClasses, int methodIndex, String fillerClassName,
Map<String, ParamData> headerFillersByName,
List<AddHeadersEnhancer> addHeadersEnhancers) {
FieldDescriptor headerFillerField = FieldDescriptor.of(classCreator.getClassName(),
"headerFiller" + methodIndex, HeaderFiller.class);
classCreator.getFieldCreator(headerFillerField).setModifiers(Modifier.PRIVATE | Modifier.FINAL);
ResultHandle headerFiller;
FieldDescriptor headerFillerField = null;
// create header filler for this method if headerFillersByName is not empty
if (!headerFillersByName.isEmpty() || !addHeadersEnhancers.isEmpty()) {
headerFillerField = FieldDescriptor.of(classCreator.getClassName(),
"headerFiller" + methodIndex, HeaderFiller.class);
classCreator.getFieldCreator(headerFillerField).setModifiers(Modifier.STATIC | Modifier.PRIVATE | Modifier.FINAL);

GeneratedClassGizmoAdaptor classOutput = new GeneratedClassGizmoAdaptor(generatedClasses, true);
try (ClassCreator headerFillerClass = ClassCreator.builder().className(fillerClassName)
.interfaces(ExtendedHeaderFiller.class)
Expand Down Expand Up @@ -654,19 +655,17 @@ public ResultHandle requestContextHandle() {

addHeaders.returnValue(null);

headerFiller = constructor.newInstance(MethodDescriptor.ofConstructor(fillerClassName));
ResultHandle headerFiller = clinit.newInstance(MethodDescriptor.ofConstructor(fillerClassName));
clinit.writeStaticField(headerFillerField, headerFiller);
}
} else {
headerFiller = constructor
.readStaticField(FieldDescriptor.of(NoOpHeaderFiller.class, "INSTANCE", NoOpHeaderFiller.class));
}
constructor.writeInstanceField(headerFillerField, constructor.getThis(), headerFiller);

ResultHandle headerFillerAsObject = methodCreator.checkCast(
methodCreator.readInstanceField(headerFillerField, methodCreator.getThis()), Object.class);
methodCreator.assign(invocationBuilder,
methodCreator.invokeInterfaceMethod(INVOCATION_BUILDER_PROPERTY_METHOD, invocationBuilder,
methodCreator.load(HeaderFiller.class.getName()), headerFillerAsObject));
methodCreator.load(HeaderFiller.class.getName()),
headerFillerField != null ? methodCreator.readStaticField(headerFillerField)
: methodCreator.readStaticField(
FieldDescriptor.of(NoOpHeaderFiller.class, "INSTANCE", NoOpHeaderFiller.class))));

ResultHandle parametersList = null;
if (method.parametersCount() == 0) {
Expand Down
Loading