Merge pull request #38534 from humcqc/main

Change default behavior of RegisterForReflection ignoreNested attribute to false

core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java

@@ -50,7 +50,7 @@ public void build(CombinedIndexBuildItem combinedIndexBuildItem, Capabilities ca
 
             boolean methods = getBooleanValue(i, "methods");
             boolean fields = getBooleanValue(i, "fields");
-            boolean ignoreNested = getBooleanValue(i, "ignoreNested");
+            boolean ignoreNested = i.value("ignoreNested") != null && i.value("ignoreNested").asBoolean();
             boolean serialization = i.value("serialization") != null && i.value("serialization").asBoolean();
             boolean unsafeAllocated = i.value("unsafeAllocated") != null && i.value("unsafeAllocated").asBoolean();
 

core/runtime/src/main/java/io/quarkus/runtime/annotations/RegisterForReflection.java

@@ -7,9 +7,12 @@
 
 /**
  * Annotation that can be used to force a class to be registered for reflection in native image mode.
- * Note that by default nested classes and interfaces are not registered, unless {@link #ignoreNested()} is set to false.
- * Similarly, by default only the class itself is registered, not the full class hierarchy. This can be changed by setting
- * {@link #registerFullHierarchy()} to true.
+ * Note that by default the class itself is registered including nested classes and interfaces,
+ * but not the full class hierarchy. This can be changed by setting:
+ * <ul>
+ * <li>{@link #ignoreNested()} to true, to ignore nested classes.</li>
+ * <li>{@link #registerFullHierarchy()} to true, to register the full hierarchy.</li>
+ * </ul>
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
@@ -26,11 +29,10 @@
     boolean fields() default true;
 
     /**
-     * If nested classes/interfaces should be ignored/registered
-     *
-     * This is useful when it's necessary to register inner (especially private) classes for Reflection.
+     * If nested classes/interfaces should be ignored.
+     * By default, nested classes are registered. To ignore them set it to true.
      */
-    boolean ignoreNested() default true;
+    boolean ignoreNested() default false;
 
     /**
      * Alternative classes that should actually be registered for reflection instead of the current class.

devtools/cli/src/main/java/io/quarkus/cli/core/Reflections.java

@@ -39,6 +39,6 @@
         org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory.class,
         org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector.class,
         org.eclipse.aether.transport.wagon.WagonTransporterFactory.class
-})
+}, ignoreNested = true)
 public class Reflections {
 }

integration-tests/devtools-registry-client/src/main/java/io/quarkus/registry/Reflections.java

@@ -28,6 +28,6 @@
         io.quarkus.registry.json.JsonArtifactCoordsSerializer.class,
         io.quarkus.registry.json.JsonBooleanTrueFilter.class,
         io.quarkus.registry.json.JsonEntityWithAnySupport.class,
-})
+}, ignoreNested = true)
 public class Reflections {
 }

integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto2.java

@@ -3,7 +3,7 @@
 import io.quarkus.hibernate.orm.panache.common.NestedProjectedClass;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
-@RegisterForReflection(ignoreNested = false)
+@RegisterForReflection
 public class DogDto2 {
     public String name;
     public PersonDto2 owner;

integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDTO.java

@@ -4,7 +4,7 @@
 import io.quarkus.hibernate.orm.panache.common.ProjectedFieldName;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
-@RegisterForReflection(ignoreNested = false)
+@RegisterForReflection
 public class PersonDTO extends PersonName {
 
     public final AddressDTO address;

integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDto.java

@@ -3,7 +3,7 @@
 import io.quarkus.hibernate.reactive.panache.common.NestedProjectedClass;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
-@RegisterForReflection(ignoreNested = false)
+@RegisterForReflection
 public class DogDto {
     public String name;
     public PersonDto owner;

integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonDTO.java

@@ -4,7 +4,7 @@
 import io.quarkus.hibernate.reactive.panache.common.ProjectedFieldName;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
-@RegisterForReflection(ignoreNested = false)
+@RegisterForReflection
 public class PersonDTO extends PersonName {
     public final AddressDTO address;
 

integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/ModelWithSerializerAndDeserializerOnField.java

@@ -15,7 +15,7 @@
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
-@RegisterForReflection
+@RegisterForReflection(ignoreNested = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ModelWithSerializerAndDeserializerOnField {
 

integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnField.java

@@ -13,7 +13,7 @@
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
-@RegisterForReflection
+@RegisterForReflection(ignoreNested = true)
 public class ModelWithSerializerAndDeserializerOnField {
 
     private String name;

integration-tests/main/src/main/java/io/quarkus/it/rest/ResourceA.java

@@ -5,7 +5,7 @@
 /**
  * Only Parent Class will be registered and none of the inner classes will be registered for reflection.
  */
-@RegisterForReflection
+@RegisterForReflection(ignoreNested = true)
 class ResourceA {
 
     private class InnerClassOfA {

integration-tests/main/src/main/java/io/quarkus/it/rest/ResourceB.java

@@ -5,7 +5,7 @@
 /**
  * Both Parent Class and all nested classed will be registered for reflection
  */
-@RegisterForReflection(ignoreNested = false)
+@RegisterForReflection
 public class ResourceB {
 
     private class InnerClassOfB {

integration-tests/main/src/main/java/io/quarkus/it/rest/ResourceC.java

@@ -6,7 +6,7 @@
  * This class is registering targets = ResourceD.StaticClassOfD
  * The class itself won't be registered by this, only target will be registered without registering nested classes
  */
-@RegisterForReflection(targets = ResourceD.StaticClassOfD.class)
+@RegisterForReflection(targets = ResourceD.StaticClassOfD.class, ignoreNested = true)
 public class ResourceC {
 
     private class InaccessibleClassOfC {

integration-tests/main/src/main/java/io/quarkus/it/rest/ResourceD.java

@@ -6,7 +6,7 @@
  * This class is registering targets = ResourceC$InaccessibleClassOfC
  * The class itself won't be registered by this, only target will be registered including target's nested classes
  */
-@RegisterForReflection(classNames = "io.quarkus.it.rest.ResourceC$InaccessibleClassOfC", ignoreNested = false)
+@RegisterForReflection(classNames = "io.quarkus.it.rest.ResourceC$InaccessibleClassOfC")
 public class ResourceD {
 
     // Parent class won't be registered, only the below private class will be registered without nested classes