Skip to content

Unconditionally enable complete reflection type changes in quarkus #51432

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

Open
jerboaa wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −18
Open

Unconditionally enable complete reflection type changes in quarkus #51432

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
5 changes: 1 addition & 4 deletions core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
import io.quarkus.deployment.pkg.NativeConfig;
import io.quarkus.deployment.pkg.steps.NativeImageFutureDefault;
import io.quarkus.deployment.util.ReflectUtil;
import io.quarkus.hibernate.validator.spi.AdditionalConstrainedClassBuildItem;
import io.smallrye.config.ConfigMapping;
Expand Down Expand Up @@ -140,9 +139,7 @@ private static void processConfigClass(
additionalConstrainedClasses.produce(AdditionalConstrainedClassBuildItem.of(mappingMetadata.getClassName(),
classBytes));
ReflectiveClassBuildItem.Builder reflection = ReflectiveClassBuildItem.builder(mappingMetadata.getClassName());
if (NativeImageFutureDefault.COMPLETE_REFLECTION_TYPES.isEnabled(nativeConfig)) {
reflection.methods();
}
reflection.methods();
reflectiveClasses.produce(reflection
.reason(ConfigMappingUtils.class.getName())
.build());
Expand Down
13 changes: 5 additions & 8 deletions core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
import io.quarkus.deployment.pkg.NativeConfig;
import io.quarkus.deployment.pkg.steps.NativeImageFutureDefault;
import io.quarkus.deployment.util.JandexUtil;

public class ReflectiveHierarchyStep {
Expand Down Expand Up @@ -238,13 +237,11 @@ private void addClassTypeHierarchy(NativeConfig nativeConfig, CombinedIndexBuild
info.superName(), initialName,
processedReflectiveHierarchies,
unindexedClasses, reflectiveClass, visits));
if (NativeImageFutureDefault.COMPLETE_REFLECTION_TYPES.isEnabled(nativeConfig)) {
for (Type interfaceType : info.interfaceTypes()) {
visits.addLast(() -> addReflectiveHierarchy(nativeConfig, combinedIndexBuildItem, capabilities,
reflectiveHierarchyBuildItem,
source, interfaceType, processedReflectiveHierarchies, unindexedClasses,
reflectiveClass, visits));
}
for (Type interfaceType : info.interfaceTypes()) {
visits.addLast(() -> addReflectiveHierarchy(nativeConfig, combinedIndexBuildItem, capabilities,
reflectiveHierarchyBuildItem,
source, interfaceType, processedReflectiveHierarchies, unindexedClasses,
reflectiveClass, visits));
}
for (FieldInfo field : info.fields()) {
if (reflectiveHierarchyBuildItem.getIgnoreFieldPredicate().test(field) ||
Expand Down
7 changes: 1 addition & 6 deletions extensions/awt/deployment/src/main/java/io/quarkus/awt/deployment/AwtProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import io.quarkus.deployment.pkg.builditem.NativeImageRunnerBuildItem;
import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabled;
import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabledBuildItem;
import io.quarkus.deployment.pkg.steps.NativeImageFutureDefault;
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
import io.quarkus.deployment.pkg.steps.NoopNativeImageBuildRunner;
import io.quarkus.runtime.graal.GraalVM;
Expand Down Expand Up @@ -302,15 +301,11 @@ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedPackageBuildItem>
"java.awt",
"javax.imageio",
"sun.awt",
"sun.datatransfer",
"sun.font",
"sun.java2d")
.map(RuntimeInitializedPackageBuildItem::new)
.forEach(runtimeInitilizedPackages::produce);
//@formatter:on
}

@BuildStep(onlyIf = NativeImageFutureDefault.CompleteReflectionTypes.class)
RuntimeInitializedPackageBuildItem runtimeInitializedClassesForCompleteReflectionTypes() {
return new RuntimeInitializedPackageBuildItem("sun.datatransfer");
}
}
Loading