Merge pull request #45654 from zakkak/2025-01-16-fix-more-reflection-warnings

Fix unregistered element accesses when using Hibernate ORM in native mode

Author: zakkak

extensions/caffeine/runtime/src/main/java/io/quarkus/caffeine/runtime/graal/CacheConstructorsFeature.java

@@ -66,6 +66,8 @@ private void registerForReflection(
         final Constructor<?>[] z = aClass.getDeclaredConstructors();
         RuntimeReflection.register(aClass);
         RuntimeReflection.register(z);
+        // Accessed by com.github.benmanes.caffeine.cache.LocalCacheFactory.newFactory
+        RuntimeReflection.registerFieldLookup(aClass, "FACTORY");
     }
 
     /**

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ClassNames.java

@@ -465,4 +465,18 @@ private static DotName createConstant(String fqcn) {
             "io.quarkus.hibernate.orm.deployment.HibernateUserTypeProcessor");
 
     public static final DotName GRAAL_VM_FEATURES = createConstant("io.quarkus.hibernate.orm.deployment.GraalVMFeatures");
+
+    public static final List<DotName> SERVICE_PROVIDERS = List.of(
+            // Accessed in org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder.<init>
+            createConstant("org.hibernate.query.criteria.spi.CriteriaBuilderExtension"),
+            // Accessed in io.quarkus.hibernate.orm.runtime.customized.QuarkusStrategySelectorBuilder.buildSelector
+            createConstant("org.hibernate.boot.registry.selector.StrategyRegistrationProvider"),
+            // Accessed in org.hibernate.internal.FastSessionServices.<init>
+            createConstant("org.hibernate.event.spi.EventManager"),
+            // Accessed in org.hibernate.query.internal.QueryEngineImpl.sortedFunctionContributors
+            createConstant("org.hibernate.boot.model.FunctionContributor"),
+            // Accessed in org.hibernate.event.spi.EventEngine.<init>
+            createConstant("org.hibernate.event.spi.EventEngineContributor"),
+            // Accessed in org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryImpl.buildServiceRegistry
+            createConstant("org.hibernate.service.spi.SessionFactoryServiceContributor"));
 }

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java

@@ -104,6 +104,7 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.deployment.index.IndexingUtil;
 import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 import io.quarkus.deployment.recording.RecorderContext;
@@ -163,7 +164,11 @@ public final class HibernateOrmProcessor {
     private static final String INTEGRATOR_SERVICE_FILE = "META-INF/services/org.hibernate.integrator.spi.Integrator";
 
     @BuildStep
-    NativeImageFeatureBuildItem registerServicesForReflection() {
+    NativeImageFeatureBuildItem registerServicesForReflection(BuildProducer<ServiceProviderBuildItem> services) {
+        for (DotName serviceProvider : ClassNames.SERVICE_PROVIDERS) {
+            services.produce(ServiceProviderBuildItem.allProvidersFromClassPath(serviceProvider.toString()));
+        }
+
         return new NativeImageFeatureBuildItem(RegisterServicesForReflectionFeature.class);
     }
 
@@ -237,8 +242,12 @@ AdditionalIndexedClassesBuildItem addPersistenceUnitAnnotationToIndex() {
     public void enrollBeanValidationTypeSafeActivatorForReflection(Capabilities capabilities,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
         if (capabilities.isPresent(Capability.HIBERNATE_VALIDATOR)) {
+            // BeanValidationIntegrator is only added if this capability is present, see FastBootMetadataBuilder
+
+            // Accessed in org.hibernate.boot.beanvalidation.BeanValidationIntegrator.loadTypeSafeActivatorClass
             reflectiveClasses.produce(ReflectiveClassBuildItem.builder("org.hibernate.boot.beanvalidation.TypeSafeActivator")
                     .methods().fields().build());
+            // Accessed in org.hibernate.boot.beanvalidation.BeanValidationIntegrator.isBeanValidationApiAvailable
             reflectiveClasses.produce(ReflectiveClassBuildItem.builder(BeanValidationIntegrator.JAKARTA_BV_CHECK_CLASS)
                     .constructors(false).build());
         }

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceUnitDescriptorBuildItem.java

@@ -29,6 +29,7 @@ public final class PersistenceUnitDescriptorBuildItem extends MultiBuildItem {
     private final List<RecordableXmlMapping> xmlMappings;
     private final boolean isReactive;
     private final boolean fromPersistenceXml;
+    private final boolean isHibernateValidatorPresent;
     private final Optional<FormatMapperKind> jsonMapper;
     private final Optional<FormatMapperKind> xmlMapper;
 
@@ -43,6 +44,7 @@ public PersistenceUnitDescriptorBuildItem(QuarkusPersistenceUnitDescriptor descr
         this.xmlMappings = xmlMappings;
         this.isReactive = isReactive;
         this.fromPersistenceXml = fromPersistenceXml;
+        this.isHibernateValidatorPresent = capabilities.isPresent(Capability.HIBERNATE_VALIDATOR);
         this.jsonMapper = json(capabilities);
         this.xmlMapper = xml(capabilities);
     }
@@ -79,10 +81,15 @@ public boolean isFromPersistenceXml() {
         return fromPersistenceXml;
     }
 
+    public boolean isHibernateValidatorPresent() {
+        return isHibernateValidatorPresent;
+    }
+
     public QuarkusPersistenceUnitDefinition asOutputPersistenceUnitDefinition(
             List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors) {
         return new QuarkusPersistenceUnitDefinition(descriptor, config,
-                xmlMappings, isReactive, fromPersistenceXml, jsonMapper, xmlMapper, integrationStaticDescriptors);
+                xmlMappings, isReactive, fromPersistenceXml, isHibernateValidatorPresent,
+                jsonMapper, xmlMapper, integrationStaticDescriptors);
     }
 
     private Optional<FormatMapperKind> json(Capabilities capabilities) {

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java

@@ -111,6 +111,7 @@ public class FastBootMetadataBuilder {
     private final MultiTenancyStrategy multiTenancyStrategy;
     private final boolean isReactive;
     private final boolean fromPersistenceXml;
+    private final boolean isHibernateValidatorPresent;
     private final List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors;
 
     @SuppressWarnings("unchecked")
@@ -119,6 +120,7 @@ public FastBootMetadataBuilder(final QuarkusPersistenceUnitDefinition puDefiniti
         this.persistenceUnit = puDefinition.getPersistenceUnitDescriptor();
         this.isReactive = puDefinition.isReactive();
         this.fromPersistenceXml = puDefinition.isFromPersistenceXml();
+        this.isHibernateValidatorPresent = puDefinition.isHibernateValidatorPresent();
         this.additionalIntegrators = additionalIntegrators;
         this.preGeneratedProxies = preGeneratedProxies;
         this.integrationStaticDescriptors = puDefinition.getIntegrationStaticDescriptors();
@@ -476,7 +478,9 @@ private Dialect extractDialect() {
 
     private Collection<Integrator> getIntegrators() {
         LinkedHashSet<Integrator> integrators = new LinkedHashSet<>();
-        integrators.add(new BeanValidationIntegrator());
+        if (isHibernateValidatorPresent) {
+            integrators.add(new BeanValidationIntegrator());
+        }
         integrators.add(new CollectionCacheInvalidator());
 
         for (Class<? extends Integrator> integratorClass : additionalIntegrators) {

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/QuarkusPersistenceUnitDefinition.java

@@ -21,6 +21,7 @@ public final class QuarkusPersistenceUnitDefinition {
     private final List<RecordableXmlMapping> xmlMappings;
     private final boolean isReactive;
     private final boolean fromPersistenceXml;
+    private final boolean isHibernateValidatorPresent;
     private final Optional<FormatMapperKind> jsonMapperCreator;
     private final Optional<FormatMapperKind> xmlMapperCreator;
     private final List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors;
@@ -31,6 +32,7 @@ public QuarkusPersistenceUnitDefinition(QuarkusPersistenceUnitDescriptor persist
             List<RecordableXmlMapping> xmlMappings,
             boolean reactive,
             boolean fromPersistenceXml,
+            boolean hibernateValidatorPresent,
             Optional<FormatMapperKind> jsonMapperCreator,
             Optional<FormatMapperKind> xmlMapperCreator,
             List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors) {
@@ -41,6 +43,7 @@ public QuarkusPersistenceUnitDefinition(QuarkusPersistenceUnitDescriptor persist
         this.xmlMappings = xmlMappings;
         this.isReactive = reactive;
         this.fromPersistenceXml = fromPersistenceXml;
+        this.isHibernateValidatorPresent = hibernateValidatorPresent;
         this.jsonMapperCreator = jsonMapperCreator;
         this.xmlMapperCreator = xmlMapperCreator;
         this.integrationStaticDescriptors = integrationStaticDescriptors;
@@ -71,6 +74,10 @@ public boolean isFromPersistenceXml() {
         return fromPersistenceXml;
     }
 
+    public boolean isHibernateValidatorPresent() {
+        return isHibernateValidatorPresent;
+    }
+
     public Optional<FormatMapperKind> getJsonMapperCreator() {
         return jsonMapperCreator;
     }

extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java

@@ -54,7 +54,6 @@
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.hibernate.orm.deployment.HibernateConfigUtil;
@@ -117,13 +116,6 @@ void reflections(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, REFLECTIVE_CONSTRUCTORS_NEEDED));
     }
 
-    @BuildStep
-    void services(BuildProducer<ServiceProviderBuildItem> producer) {
-        producer.produce(
-                new ServiceProviderBuildItem(org.hibernate.service.spi.SessionFactoryServiceContributor.class.getName(),
-                        org.hibernate.reactive.service.internal.ReactiveSessionFactoryServiceContributor.class.getName()));
-    }
-
     @BuildStep
     @Record(STATIC_INIT)
     public void build(RecorderContext recorderContext,