Merge pull request #41359 from yrodiere/orm6.6

Upgrade to Hibernate ORM 6.6 / Search 7.2 / Reactive 2.4
quarkusio · Aug 10, 2024 · b6ef7f6 · b6ef7f6
2 parents 5b360d9 + 09706de
commit b6ef7f6
Show file tree

Hide file tree

Showing 17 changed files with 139 additions and 346 deletions.
diff --git a/...ibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ClassNames.java b/...ibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ClassNames.java
@@ -244,6 +244,7 @@ private static DotName createConstant(String fqcn) {
             createConstant("org.hibernate.annotations.CompositeType"),
             createConstant("org.hibernate.annotations.CompositeTypeRegistration"),
             createConstant("org.hibernate.annotations.CompositeTypeRegistrations"),
+            createConstant("org.hibernate.annotations.ConcreteProxy"),
             createConstant("org.hibernate.annotations.ConverterRegistration"),
             createConstant("org.hibernate.annotations.ConverterRegistrations"),
             createConstant("org.hibernate.annotations.CreationTimestamp"),

diff --git a/...oyment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java b/...oyment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java
@@ -31,6 +31,13 @@ void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
         filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.incubating",
                 "HHH90006001"));
 
+        // Silence DB connection info logging because:
+        // 1. We don't implement the retrieval of information in QuarkusConnectionProvider
+        // 2. It's currently being logged even at static init when there is no connection
+        //    See https://hibernate.atlassian.net/browse/HHH-18454
+        filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.connections.pooling",
+                "HHH10001005"));
+
         //This "deprecation" warning isn't practical for the specific Quarkus needs, as it reminds users they don't need
         //to set the 'hibernate.dialect' property, however it's being set by Quarkus buildsteps so they can't avoid it.
         //Ignore for now, perhaps remove it upstream however this may make sense for other Hibernate users.

diff --git a/.../java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerPresentEmbeddableTest.java b/.../java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerPresentEmbeddableTest.java
@@ -229,7 +229,6 @@ public void setEmbeddableMapValueWithAnnotation(
     }
 
     @Embeddable
-    @MappedSuperclass
     public static class EmbeddableWithAnnotation {
         private String text;
 
@@ -283,8 +282,29 @@ public void setEmbedded(EmbeddableWithAnnotation embedded) {
         }
     }
 
+    @MappedSuperclass
+    public static abstract class MappedSuperclassForEmbeddable {
+        private String text;
+
+        protected MappedSuperclassForEmbeddable() {
+            // For Hibernate ORM only - it will change the property value through reflection
+        }
+
+        public MappedSuperclassForEmbeddable(String text) {
+            this.text = text;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+    }
+
     @Embeddable
-    public static class ExtendedEmbeddableWithAnnotation extends EmbeddableWithAnnotation {
+    public static class ExtendedEmbeddableWithAnnotation extends MappedSuperclassForEmbeddable {
         private Integer integer;
 
         protected ExtendedEmbeddableWithAnnotation() {

diff --git a/...runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java b/...runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StatelessSessionLazyDelegator.java
@@ -138,6 +138,11 @@ public void fetch(Object association) {
         delegate.get().fetch(association);
     }
 
+    @Override
+    public Object getIdentifier(Object entity) {
+        return delegate.get().getIdentifier(entity);
+    }
+
     @Override
     public String getTenantIdentifier() {
         return delegate.get().getTenantIdentifier();

diff --git a/.../runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java b/.../runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java
@@ -43,14 +43,12 @@
 import org.hibernate.boot.model.process.spi.MetadataBuildingProcess;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.boot.spi.MetadataBuilderContributor;
 import org.hibernate.boot.spi.MetadataBuilderImplementor;
 import org.hibernate.cache.internal.CollectionCacheInvalidator;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
-import org.hibernate.id.factory.IdentifierGeneratorFactory;
 import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.internal.EntityManagerMessageLogger;
 import org.hibernate.internal.util.StringHelper;
@@ -60,7 +58,6 @@
 import org.hibernate.jpa.boot.spi.TypeContributorList;
 import org.hibernate.jpa.internal.util.LogHelper;
 import org.hibernate.jpa.internal.util.PersistenceUnitTransactionTypeHelper;
-import org.hibernate.jpa.spi.IdentifierGeneratorStrategyProvider;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl;
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
@@ -80,7 +77,6 @@
 import io.quarkus.hibernate.orm.runtime.recording.PrevalidatedQuarkusMetadata;
 import io.quarkus.hibernate.orm.runtime.recording.RecordableBootstrap;
 import io.quarkus.hibernate.orm.runtime.recording.RecordedState;
-import io.quarkus.hibernate.orm.runtime.service.QuarkusMutableIdentifierGeneratorFactory;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusStaticInitDialectFactory;
 import io.quarkus.hibernate.orm.runtime.tenant.HibernateMultiTenantConnectionProvider;
 
@@ -144,7 +140,6 @@ public FastBootMetadataBuilder(final QuarkusPersistenceUnitDefinition puDefiniti
         ssrBuilder.applySettings(buildTimeSettings.getAllSettings());
 
         this.standardServiceRegistry = ssrBuilder.build();
-        registerIdentifierGenerators(standardServiceRegistry);
 
         this.providedServices = ssrBuilder.getProvidedServices();
 
@@ -452,6 +447,7 @@ private PrevalidatedQuarkusMetadata trimBootstrapMetadata(MetadataImpl fullMeta)
                 fullMeta.getEntityBindingMap(),
                 fullMeta.getComposites(),
                 fullMeta.getGenericComponentsMap(),
+                fullMeta.getEmbeddableDiscriminatorTypesMap(),
                 fullMeta.getMappedSuperclassMap(),
                 fullMeta.getCollectionBindingMap(),
                 fullMeta.getTypeDefinitionMap(),
@@ -614,32 +610,6 @@ private static void applyTransactionProperties(PersistenceUnitDescriptor persist
         }
     }
 
-    private void registerIdentifierGenerators(StandardServiceRegistry ssr) {
-        final StrategySelector strategySelector = ssr.getService(StrategySelector.class);
-
-        // apply id generators
-        final Object idGeneratorStrategyProviderSetting = buildTimeSettings
-                .get(AvailableSettings.IDENTIFIER_GENERATOR_STRATEGY_PROVIDER);
-        if (idGeneratorStrategyProviderSetting != null) {
-            final IdentifierGeneratorStrategyProvider idGeneratorStrategyProvider = strategySelector
-                    .resolveStrategy(IdentifierGeneratorStrategyProvider.class, idGeneratorStrategyProviderSetting);
-            final IdentifierGeneratorFactory identifierGeneratorFactory = ssr
-                    .getService(IdentifierGeneratorFactory.class);
-            if (identifierGeneratorFactory == null) {
-                throw persistenceException("Application requested custom identifier generator strategies, "
-                        + "but the MutableIdentifierGeneratorFactory could not be found");
-            }
-            if (!(identifierGeneratorFactory instanceof QuarkusMutableIdentifierGeneratorFactory)) {
-                throw persistenceException(
-                        "Unexpected implementation of IdentifierGeneratorFactory: do not override core components");
-            }
-            final QuarkusMutableIdentifierGeneratorFactory qIdGenerator = (QuarkusMutableIdentifierGeneratorFactory) identifierGeneratorFactory;
-            for (Map.Entry<String, Class<?>> entry : idGeneratorStrategyProvider.getStrategies().entrySet()) {
-                qIdGenerator.register(entry.getKey(), entry.getValue());
-            }
-        }
-    }
-
     /**
      * Greatly simplified copy of
      * org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl#populate(org.hibernate.boot.MetadataBuilder,

diff --git a/...a/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java b/...a/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java
@@ -33,14 +33,14 @@
 import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator;
 
 import io.quarkus.hibernate.orm.runtime.cdi.QuarkusManagedBeanRegistryInitiator;
-import io.quarkus.hibernate.orm.runtime.customized.QuarkusConnectionProviderInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusJndiServiceInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusJtaPlatformInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusRuntimeProxyFactoryFactory;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusRuntimeProxyFactoryFactoryInitiator;
 import io.quarkus.hibernate.orm.runtime.recording.RecordedState;
 import io.quarkus.hibernate.orm.runtime.service.CfgXmlAccessServiceInitiatorQuarkus;
 import io.quarkus.hibernate.orm.runtime.service.FlatClassLoaderService;
+import io.quarkus.hibernate.orm.runtime.service.QuarkusConnectionProviderInitiator;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusImportSqlCommandExtractorInitiator;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusMutationExecutorServiceInitiator;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusRegionFactoryInitiator;

diff --git a/...src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java b/...src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java
@@ -6,6 +6,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
@@ -30,6 +31,7 @@
 import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
+import org.hibernate.metamodel.mapping.DiscriminatorType;
 import org.hibernate.query.named.NamedObjectRepository;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
@@ -295,6 +297,12 @@ public Component getGenericComponent(Class<?> componentClass) {
         return metadata.getGenericComponent(componentClass);
     }
 
+    @Override
+    public DiscriminatorType<?> resolveEmbeddableDiscriminatorType(Class<?> embeddableClass,
+            Supplier<DiscriminatorType<?>> supplier) {
+        return metadata.resolveEmbeddableDiscriminatorType(embeddableClass, supplier);
+    }
+
     public Map<String, PersistentClass> getEntityBindingMap() {
         return metadata.getEntityBindingMap();
     }

diff --git a/...d/QuarkusConnectionProviderInitiator.java → ...e/QuarkusConnectionProviderInitiator.java b/...d/QuarkusConnectionProviderInitiator.java → ...e/QuarkusConnectionProviderInitiator.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.runtime.customized;
+package io.quarkus.hibernate.orm.runtime.service;
 
 import java.util.Map;
 
@@ -10,6 +10,7 @@
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 import io.agroal.api.AgroalDataSource;
+import io.quarkus.hibernate.orm.runtime.customized.QuarkusConnectionProvider;
 import io.quarkus.hibernate.orm.runtime.migration.MultiTenancyStrategy;
 
 public final class QuarkusConnectionProviderInitiator implements StandardServiceInitiator<ConnectionProvider> {

diff --git a/...eIdentifierGeneratorFactoryInitiator.java → ...sIdentifierGeneratorFactoryInitiator.java b/...eIdentifierGeneratorFactoryInitiator.java → ...sIdentifierGeneratorFactoryInitiator.java
@@ -4,22 +4,21 @@
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.id.factory.IdentifierGeneratorFactory;
+import org.hibernate.id.factory.internal.StandardIdentifierGeneratorFactory;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**
- * We need to mimic the standard IdentifierGeneratorFactory but allowing
- * to capture which Identifier strategies are being used, so that we can keep a reference to the classed
- * needed at runtime.
+ * Uses a StandardIdentifierGeneratorFactory, but one that doesn't retrieve generators from CDI.
  *
  * @see IdentifierGeneratorFactory
  */
-public final class QuarkusMutableIdentifierGeneratorFactoryInitiator
+public final class QuarkusIdentifierGeneratorFactoryInitiator
         implements StandardServiceInitiator<IdentifierGeneratorFactory> {
 
     @Override
     public IdentifierGeneratorFactory initiateService(final Map configurationValues,
             final ServiceRegistryImplementor registry) {
-        return new QuarkusMutableIdentifierGeneratorFactory(registry);
+        return new StandardIdentifierGeneratorFactory(registry, true /* ignore bean container */);
     }
 
     @Override

diff --git a/...va/io/quarkus/hibernate/orm/runtime/service/QuarkusMutableIdentifierGeneratorFactory.java b/...va/io/quarkus/hibernate/orm/runtime/service/QuarkusMutableIdentifierGeneratorFactory.java