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

Use loadClass rather than loadClassFromTCCL for ArC #24443

Merged
merged 1 commit into from
Mar 21, 2022
Merged

Use loadClass rather than loadClassFromTCCL for ArC #24443

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions ...ects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ private static void generateStaticFieldsWithDefaultValues(ClassCreator annotatio
ResultHandle array = staticConstructor.newArray(returnTypeName, clazzArray.length);
for (int i = 0; i < clazzArray.length; ++i) {
staticConstructor.writeArrayValue(array, staticConstructor.load(i),
staticConstructor.loadClassFromTCCL(clazzArray[i].name().toString()));
staticConstructor.loadClass(clazzArray[i].name().toString()));
}
staticConstructor.writeStaticField(fieldCreator.getFieldDescriptor(), array);
} else {
staticConstructor.writeStaticField(fieldCreator.getFieldDescriptor(),
staticConstructor.loadClassFromTCCL(defaultValue.asClass().name().toString()));
staticConstructor.loadClass(defaultValue.asClass().name().toString()));

}
}
Expand Down Expand Up @@ -241,7 +241,7 @@ static ResultHandle loadValue(String literalClassName,
FieldDescriptor.of(literalClassName, defaultValueStaticFieldName(method),
method.returnType().name().toString()));
} else {
retValue = valueMethod.loadClassFromTCCL(value.asClass().toString());
retValue = valueMethod.loadClass(value.asClass().toString());
}
break;
case ARRAY:
Expand Down Expand Up @@ -273,7 +273,7 @@ static ResultHandle arrayValue(String literalClassName,
Type[] classArray = value.asClassArray();
retValue = valueMethod.newArray(componentType(method), valueMethod.load(classArray.length));
for (int i = 0; i < classArray.length; i++) {
valueMethod.writeArrayValue(retValue, i, valueMethod.loadClassFromTCCL(classArray[i].name()
valueMethod.writeArrayValue(retValue, i, valueMethod.loadClass(classArray[i].name()
.toString()));
}
}
Expand Down
50 changes: 25 additions & 25 deletions independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Collection<Resource> generateSyntheticBean(BeanInfo bean) {
valHandle = constructor.newInstance(MethodDescriptor.ofConstructor(Double.class, double.class),
constructor.load(((Double) entry.getValue()).doubleValue()));
} else if (entry.getValue() instanceof Class) {
valHandle = constructor.loadClassFromTCCL((Class<?>) entry.getValue());
valHandle = constructor.loadClass((Class<?>) entry.getValue());
} else if (entry.getValue() instanceof Boolean) {
valHandle = constructor.load((Boolean) entry.getValue());
}
Expand Down Expand Up @@ -756,7 +756,7 @@ protected MethodCreator initConstructor(ClassOutput classOutput, ClassCreator be
int stereotypesIndex = 0;
for (StereotypeInfo stereotype : bean.getStereotypes()) {
constructor.writeArrayValue(stereotypesArray, constructor.load(stereotypesIndex++),
constructor.loadClassFromTCCL(stereotype.getTarget().name().toString()));
constructor.loadClass(stereotype.getTarget().name().toString()));
}
constructor.writeInstanceField(
FieldDescriptor.of(beanCreator.getClassName(), FIELD_NAME_STEREOTYPES, Set.class.getName()),
Expand Down Expand Up @@ -795,7 +795,7 @@ protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, Provide
callback.declaringClass().name(), callback.name()));
reflectionRegistration.registerMethod(callback);
destroy.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD,
destroy.loadClassFromTCCL(callback.declaringClass().name().toString()),
destroy.loadClass(callback.declaringClass().name().toString()),
destroy.load(callback.name()), destroy.newArray(Class.class, destroy.load(0)),
destroy.getMethodParam(0),
destroy.newArray(Object.class, destroy.load(0)));
Expand Down Expand Up @@ -862,12 +862,12 @@ protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, Provide
ResultHandle argsArray = destroy.newArray(Object.class, destroy.load(referenceHandles.length));
for (int i = 0; i < referenceHandles.length; i++) {
destroy.writeArrayValue(paramTypesArray, i,
destroy.loadClassFromTCCL(disposerMethod.parameters().get(i).name().toString()));
destroy.loadClass(disposerMethod.parameters().get(i).name().toString()));
destroy.writeArrayValue(argsArray, i, referenceHandles[i]);
}
reflectionRegistration.registerMethod(disposerMethod);
destroy.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD,
destroy.loadClassFromTCCL(disposerMethod.declaringClass().name().toString()),
destroy.loadClass(disposerMethod.declaringClass().name().toString()),
destroy.load(disposerMethod.name()), paramTypesArray, declaringProviderInstanceHandle, argsArray);
} else {
destroy.invokeVirtualMethod(MethodDescriptor.of(disposerMethod), declaringProviderInstanceHandle,
Expand Down Expand Up @@ -1039,12 +1039,12 @@ private ResultHandle newInstanceHandle(BeanInfo bean, ClassCreator beanCreator,
ResultHandle argsArray = creator.newArray(Object.class, creator.load(providerHandles.size()));
for (int i = 0; i < injectionPoints.size(); i++) {
creator.writeArrayValue(paramTypesArray, i,
creator.loadClassFromTCCL(injectionPoints.get(i).getType().name().toString()));
creator.loadClass(injectionPoints.get(i).getType().name().toString()));
creator.writeArrayValue(argsArray, i, providerHandles.get(i));
}
registration.registerMethod(constructor);
return creator.invokeStaticMethod(MethodDescriptors.REFLECTIONS_NEW_INSTANCE,
creator.loadClassFromTCCL(constructor.declaringClass().name().toString()),
creator.loadClass(constructor.declaringClass().name().toString()),
paramTypesArray, argsArray);
} else {
// new SimpleBean(foo)
Expand All @@ -1067,7 +1067,7 @@ private ResultHandle newInstanceHandle(BeanInfo bean, ClassCreator beanCreator,

registration.registerMethod(noArgsConstructor);
return creator.invokeStaticMethod(MethodDescriptors.REFLECTIONS_NEW_INSTANCE,
creator.loadClassFromTCCL(noArgsConstructor.declaringClass().name().toString()), paramTypesArray,
creator.loadClass(noArgsConstructor.declaringClass().name().toString()), paramTypesArray,
argsArray);
} else {
// new SimpleBean()
Expand Down Expand Up @@ -1115,7 +1115,7 @@ void implementCreateForProducerField(ClassOutput classOutput, ClassCreator beanC
String.format("Producer field %s#%s", producerField.declaringClass().name(), producerField.name()));
reflectionRegistration.registerField(producerField);
create.assign(instanceHandle, create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_READ_FIELD,
create.loadClassFromTCCL(producerField.declaringClass().name().toString()),
create.loadClass(producerField.declaringClass().name().toString()),
create.load(producerField.name()),
declaringProviderInstanceHandle));
} else {
Expand Down Expand Up @@ -1205,12 +1205,12 @@ void implementCreateForProducerMethod(ClassOutput classOutput, ClassCreator bean
ResultHandle argsArray = create.newArray(Object.class, create.load(referenceHandles.length));
for (int i = 0; i < referenceHandles.length; i++) {
create.writeArrayValue(paramTypesArray, i,
create.loadClassFromTCCL(producerMethod.parameters().get(i).name().toString()));
create.loadClass(producerMethod.parameters().get(i).name().toString()));
create.writeArrayValue(argsArray, i, referenceHandles[i]);
}
reflectionRegistration.registerMethod(producerMethod);
create.assign(instanceHandle, create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD,
create.loadClassFromTCCL(producerMethod.declaringClass().name().toString()),
create.loadClass(producerMethod.declaringClass().name().toString()),
create.load(producerMethod.name()),
paramTypesArray,
declaringProviderInstanceHandle,
Expand Down Expand Up @@ -1357,10 +1357,10 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
paramTypes.add(injectionPoint.getType().name().toString());
}
ResultHandle[] paramsHandles = new ResultHandle[2];
paramsHandles[0] = create.loadClassFromTCCL(providerType.className());
paramsHandles[0] = create.loadClass(providerType.className());
ResultHandle paramsArray = create.newArray(Class.class, create.load(paramTypes.size()));
for (ListIterator<String> iterator = paramTypes.listIterator(); iterator.hasNext();) {
create.writeArrayValue(paramsArray, iterator.nextIndex(), create.loadClassFromTCCL(iterator.next()));
create.writeArrayValue(paramsArray, iterator.nextIndex(), create.loadClass(iterator.next()));
}
paramsHandles[1] = paramsArray;
constructorHandle = create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_CONSTRUCTOR,
Expand All @@ -1369,7 +1369,7 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
} else {
// constructor = Reflections.findConstructor(Foo.class)
ResultHandle[] paramsHandles = new ResultHandle[2];
paramsHandles[0] = create.loadClassFromTCCL(providerType.className());
paramsHandles[0] = create.loadClass(providerType.className());
paramsHandles[1] = create.newArray(Class.class, create.load(0));
constructorHandle = create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_CONSTRUCTOR,
paramsHandles);
Expand Down Expand Up @@ -1456,7 +1456,7 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
}
reflectionRegistration.registerField(injectedField);
tryBlock.invokeStaticMethod(MethodDescriptors.REFLECTIONS_WRITE_FIELD,
tryBlock.loadClassFromTCCL(injectedField.declaringClass().name().toString()),
tryBlock.loadClass(injectedField.declaringClass().name().toString()),
tryBlock.load(injectedField.name()), instanceHandle, referenceHandle);

} else {
Expand Down Expand Up @@ -1503,12 +1503,12 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
ResultHandle argsArray = create.newArray(Object.class, create.load(referenceHandles.length));
for (int i = 0; i < referenceHandles.length; i++) {
create.writeArrayValue(paramTypesArray, i,
create.loadClassFromTCCL(initializerMethod.parameters().get(i).name().toString()));
create.loadClass(initializerMethod.parameters().get(i).name().toString()));
create.writeArrayValue(argsArray, i, referenceHandles[i]);
}
reflectionRegistration.registerMethod(initializerMethod);
create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD,
create.loadClassFromTCCL(initializerMethod.declaringClass().name().toString()),
create.loadClass(initializerMethod.declaringClass().name().toString()),
create.load(methodInjection.target.asMethod().name()),
paramTypesArray, instanceHandle, argsArray);

Expand Down Expand Up @@ -1565,7 +1565,7 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
}
reflectionRegistration.registerMethod(callback);
create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD,
create.loadClassFromTCCL(callback.declaringClass().name().toString()),
create.loadClass(callback.declaringClass().name().toString()),
create.load(callback.name()), create.newArray(Class.class, create.load(0)), instanceHandle,
create.newArray(Object.class, create.load(0)));
} else {
Expand Down Expand Up @@ -1661,7 +1661,7 @@ protected void implementGetTypes(ClassCreator beanCreator, FieldDescriptor types
*/
protected void implementGetScope(BeanInfo bean, ClassCreator beanCreator) {
MethodCreator getScope = beanCreator.getMethodCreator("getScope", Class.class).setModifiers(ACC_PUBLIC);
getScope.returnValue(getScope.loadClassFromTCCL(bean.getScope().getDotName().toString()));
getScope.returnValue(getScope.loadClass(bean.getScope().getDotName().toString()));
}

/**
Expand Down Expand Up @@ -1761,7 +1761,7 @@ protected void implementGetStereotypes(BeanInfo bean, ClassCreator beanCreator,

protected void implementGetBeanClass(BeanInfo bean, ClassCreator beanCreator) {
MethodCreator getBeanClass = beanCreator.getMethodCreator("getBeanClass", Class.class).setModifiers(ACC_PUBLIC);
getBeanClass.returnValue(getBeanClass.loadClassFromTCCL(bean.getBeanClass().toString()));
getBeanClass.returnValue(getBeanClass.loadClass(bean.getBeanClass().toString()));
}

protected void implementGetName(BeanInfo bean, ClassCreator beanCreator) {
Expand Down Expand Up @@ -1851,7 +1851,7 @@ public static ResultHandle getJavaMemberHandle(MethodCreator constructor,
if (Kind.FIELD.equals(injectionPoint.getTarget().kind())) {
FieldInfo field = injectionPoint.getTarget().asField();
javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_FIELD,
constructor.loadClassFromTCCL(field.declaringClass().name().toString()),
constructor.loadClass(field.declaringClass().name().toString()),
constructor.load(field.name()));
reflectionRegistration.registerField(field);
} else {
Expand All @@ -1860,24 +1860,24 @@ public static ResultHandle getJavaMemberHandle(MethodCreator constructor,
if (method.name().equals(Methods.INIT)) {
// Reflections.findConstructor(org.foo.SimpleBean.class,java.lang.String.class)
ResultHandle[] paramsHandles = new ResultHandle[2];
paramsHandles[0] = constructor.loadClassFromTCCL(method.declaringClass().name().toString());
paramsHandles[0] = constructor.loadClass(method.declaringClass().name().toString());
ResultHandle paramsArray = constructor.newArray(Class.class, constructor.load(method.parameters().size()));
for (ListIterator<Type> iterator = method.parameters().listIterator(); iterator.hasNext();) {
constructor.writeArrayValue(paramsArray, iterator.nextIndex(),
constructor.loadClassFromTCCL(iterator.next().name().toString()));
constructor.loadClass(iterator.next().name().toString()));
}
paramsHandles[1] = paramsArray;
javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_CONSTRUCTOR,
paramsHandles);
} else {
// Reflections.findMethod(org.foo.SimpleBean.class,"foo",java.lang.String.class)
ResultHandle[] paramsHandles = new ResultHandle[3];
paramsHandles[0] = constructor.loadClassFromTCCL(method.declaringClass().name().toString());
paramsHandles[0] = constructor.loadClass(method.declaringClass().name().toString());
paramsHandles[1] = constructor.load(method.name());
ResultHandle paramsArray = constructor.newArray(Class.class, constructor.load(method.parameters().size()));
for (ListIterator<Type> iterator = method.parameters().listIterator(); iterator.hasNext();) {
constructor.writeArrayValue(paramsArray, iterator.nextIndex(),
constructor.loadClassFromTCCL(iterator.next().name().toString()));
constructor.loadClass(iterator.next().name().toString()));
}
paramsHandles[2] = paramsArray;
javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_METHOD, paramsHandles);
Expand Down
4 changes: 2 additions & 2 deletions ...t-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
ResultHandle paramTypesArray = forward.newArray(Class.class, forward.load(method.parameters().size()));
int idx = 0;
for (Type param : method.parameters()) {
forward.writeArrayValue(paramTypesArray, idx++, forward.loadClassFromTCCL(param.name().toString()));
forward.writeArrayValue(paramTypesArray, idx++, forward.loadClass(param.name().toString()));
}
ResultHandle argsArray = forward.newArray(Object.class, forward.load(params.length));
idx = 0;
Expand All @@ -219,7 +219,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
}
reflectionRegistration.registerMethod(method);
ret = forward.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD,
forward.loadClassFromTCCL(method.declaringClass().name().toString()),
forward.loadClass(method.declaringClass().name().toString()),
forward.load(method.name()), paramTypesArray, delegate, argsArray);
} else {
// make sure we do not use the original method descriptor as it could point to
Expand Down
2 changes: 1 addition & 1 deletion ...cts/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Collection<Resource> generate(String name, BeanDeployment beanDeployment, Map<Be
SETUP_PACKAGE));
}
getComponents.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, transitiveBindingsHandle,
getComponents.loadClassFromTCCL(entry.getKey().toString()), bindingsHandle);
getComponents.loadClass(entry.getKey().toString()), bindingsHandle);
}

ResultHandle beansHandle = getComponents.invokeInterfaceMethod(
Expand Down
2 changes: 1 addition & 1 deletion ...nt-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public ContextConfigurator creator(Class<? extends ContextCreator> creatorClazz)
valHandle = mc.newInstance(MethodDescriptor.ofConstructor(Double.class, double.class),
mc.load(((Double) entry.getValue()).doubleValue()));
} else if (entry.getValue() instanceof Class) {
valHandle = mc.loadClassFromTCCL((Class<?>) entry.getValue());
valHandle = mc.loadClass((Class<?>) entry.getValue());
} else if (entry.getValue() instanceof Boolean) {
valHandle = mc.load((Boolean) entry.getValue());
}
Expand Down
Loading