[#2495] Adapt to changes to AbstractEntityPersister in 7.2

dreab8 · DavideD · commit af08d78450cc · 2025-10-22T16:26:43.000+02:00
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityUpdateAction.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityUpdateAction.java
@@ -95,7 +95,7 @@ public CompletionStage<Void> reactiveExecute() throws HibernateException {
 							.thenAccept( v -> {
 								handleDeleted( entry );
 								updateCacheItem( persister, ck, entry );
-								handleNaturalIdResolutions( persister, session, id );
+								handleNaturalIdSharedResolutions( id, persister, session.getPersistenceContext() );
 								postUpdate();
 
 								final StatisticsImplementor statistics = session.getFactory().getStatistics();
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/generator/values/internal/ReactiveGeneratedValuesHelper.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/generator/values/internal/ReactiveGeneratedValuesHelper.java
@@ -5,6 +5,13 @@
  */
 package org.hibernate.reactive.generator.values.internal;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
 import org.hibernate.dialect.CockroachDialect;
@@ -14,23 +21,39 @@
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
+import org.hibernate.generator.Generator;
+import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.generator.values.GeneratedValueBasicResultBuilder;
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
 import org.hibernate.generator.values.internal.GeneratedValuesHelper;
 import org.hibernate.generator.values.internal.GeneratedValuesImpl;
 import org.hibernate.generator.values.internal.GeneratedValuesMappingProducer;
-import org.hibernate.id.IdentifierGeneratorHelper;
-import org.hibernate.internal.CoreLogging;
-import org.hibernate.internal.CoreMessageLogger;
+import org.hibernate.id.CompositeNestedGeneratedValueGenerator;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.id.SelectGenerator;
+import org.hibernate.id.enhanced.DatabaseStructure;
+import org.hibernate.id.enhanced.SequenceStructure;
+import org.hibernate.id.enhanced.SequenceStyleGenerator;
+import org.hibernate.id.enhanced.TableGenerator;
+import org.hibernate.id.enhanced.TableStructure;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
+import org.hibernate.reactive.id.impl.EmulatedSequenceReactiveIdentifierGenerator;
+import org.hibernate.reactive.id.impl.ReactiveCompositeNestedGeneratedValueGenerator;
+import org.hibernate.reactive.id.impl.ReactiveGeneratorWrapper;
+import org.hibernate.reactive.id.impl.ReactiveSequenceIdentifierGenerator;
+import org.hibernate.reactive.id.impl.TableReactiveIdentifierGenerator;
 import org.hibernate.reactive.id.insert.ReactiveGetGeneratedKeysDelegate;
 import org.hibernate.reactive.id.insert.ReactiveInsertReturningDelegate;
 import org.hibernate.reactive.id.insert.ReactiveUniqueKeySelectingDelegate;
+import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
 import org.hibernate.reactive.sql.exec.spi.ReactiveValuesResultSet;
 import org.hibernate.reactive.sql.results.internal.ReactiveDirectResultSetAccess;
@@ -45,15 +68,10 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
 import org.hibernate.type.descriptor.WrapperOptions;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-
+import static java.lang.invoke.MethodHandles.lookup;
 import static org.hibernate.generator.values.internal.GeneratedValuesHelper.noCustomSql;
 import static org.hibernate.internal.NaturalIdHelper.getNaturalIdPropertyNames;
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
 import static org.hibernate.reactive.sql.results.spi.ReactiveListResultsConsumer.UniqueSemantic.NONE;
 import static org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions.NO_OPTIONS;
 
@@ -62,7 +80,7 @@
  */
 @Internal
 public class ReactiveGeneratedValuesHelper {
-	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IdentifierGeneratorHelper.class );
+	private static final Log LOG = make( Log.class, lookup() );
 
 	/**
 	 * @see GeneratedValuesHelper#getGeneratedValuesDelegate(EntityPersister, EventType)
@@ -232,4 +250,53 @@ private static CompletionStage<Object[]> readGeneratedValues(
 					return results.get( 0 );
 				} );
 	}
+
+	public static Generator augmentWithReactiveGenerator(
+			Generator generator,
+			GeneratorCreationContext creationContext,
+			RuntimeModelCreationContext runtimeModelCreationContext) {
+		if ( generator instanceof SequenceStyleGenerator sequenceStyleGenerator) {
+			final DatabaseStructure structure = sequenceStyleGenerator.getDatabaseStructure();
+			if ( structure instanceof TableStructure ) {
+				return initialize( (IdentifierGenerator) generator, new EmulatedSequenceReactiveIdentifierGenerator( (TableStructure) structure, runtimeModelCreationContext ), creationContext );
+			}
+			if ( structure instanceof SequenceStructure ) {
+				return initialize( (IdentifierGenerator) generator, new ReactiveSequenceIdentifierGenerator( structure, runtimeModelCreationContext ), creationContext );
+			}
+			throw LOG.unknownStructureType();
+		}
+		if ( generator instanceof TableGenerator tableGenerator ) {
+			return initialize(
+					(IdentifierGenerator) generator,
+					new TableReactiveIdentifierGenerator( tableGenerator, runtimeModelCreationContext ),
+					creationContext
+			);
+		}
+		if ( generator instanceof SelectGenerator ) {
+			throw LOG.selectGeneratorIsNotSupportedInHibernateReactive();
+		}
+		if ( generator instanceof CompositeNestedGeneratedValueGenerator compositeNestedGeneratedValueGenerator ) {
+			final ReactiveCompositeNestedGeneratedValueGenerator reactiveCompositeNestedGeneratedValueGenerator = new ReactiveCompositeNestedGeneratedValueGenerator(
+					compositeNestedGeneratedValueGenerator,
+					creationContext,
+					runtimeModelCreationContext
+			);
+			return initialize(
+					(IdentifierGenerator) generator,
+					reactiveCompositeNestedGeneratedValueGenerator,
+					creationContext
+			);
+		}
+		//nothing to do
+		return generator;
+	}
+
+	private static Generator initialize(
+			IdentifierGenerator idGenerator,
+			ReactiveIdentifierGenerator<?> reactiveIdGenerator,
+			GeneratorCreationContext creationContext) {
+		( (Configurable) reactiveIdGenerator ).initialize( creationContext.getSqlStringGenerationContext() );
+		return new ReactiveGeneratorWrapper( reactiveIdGenerator, idGenerator );
+	}
+
 }
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/ReactiveCompositeNestedGeneratedValueGenerator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/ReactiveCompositeNestedGeneratedValueGenerator.java
@@ -13,9 +13,9 @@
 import org.hibernate.id.IdentifierGenerationException;
 import org.hibernate.mapping.Component;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.reactive.generator.values.internal.ReactiveGeneratedValuesHelper;
 import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
 import org.hibernate.reactive.session.ReactiveConnectionSupplier;
-import org.hibernate.reactive.tuple.entity.ReactiveEntityMetamodel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +46,7 @@ private static List<GenerationPlan> reactivePlans(
 		final List<GenerationPlan> plans = new ArrayList<>();
 		for ( GenerationPlan plan : generator.getGenerationPlans() ) {
 			final GenerationPlan reactivePlane = new Component.ValueGenerationPlan(
-					(BeforeExecutionGenerator) ReactiveEntityMetamodel.augmentWithReactiveGenerator(
+					(BeforeExecutionGenerator) ReactiveGeneratedValuesHelper.augmentWithReactiveGenerator(
 							plan.getGenerator(),
 							creationContext,
 							runtimeModelCreationContext
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/metamodel/mapping/internal/ReactiveRuntimeModelCreationContext.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/metamodel/mapping/internal/ReactiveRuntimeModelCreationContext.java
@@ -7,6 +7,7 @@
 
 import java.util.Map;
 
+import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataImplementor;
@@ -16,21 +17,30 @@
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.generator.Generator;
+import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.mapping.GeneratorSettings;
 import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.SimpleValue;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.reactive.boot.spi.ReactiveBootstrapContextAdapter;
-import org.hibernate.reactive.tuple.entity.ReactiveEntityMetamodel;
+import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.tuple.entity.EntityMetamodel;
+import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static java.lang.invoke.MethodHandles.lookup;
+import static org.hibernate.reactive.generator.values.internal.ReactiveGeneratedValuesHelper.augmentWithReactiveGenerator;
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
+
 public class ReactiveRuntimeModelCreationContext implements RuntimeModelCreationContext {
 
+	private static final Log LOG = make( Log.class, lookup() );
+
 	private final RuntimeModelCreationContext delegate;
 	private final BootstrapContext bootstrapContext;
 
@@ -39,11 +49,6 @@ public ReactiveRuntimeModelCreationContext(RuntimeModelCreationContext delegate)
 		bootstrapContext = new ReactiveBootstrapContextAdapter( delegate.getBootstrapContext() );
 	}
 
-	@Override
-	public EntityMetamodel createEntityMetamodel(PersistentClass persistentClass, EntityPersister persister) {
-		return new ReactiveEntityMetamodel( persistentClass, persister, delegate );
-	}
-
 	@Override
 	public SessionFactoryImplementor getSessionFactory() {
 		return delegate.getSessionFactory();
@@ -128,4 +133,86 @@ public Map<String, Generator> getGenerators() {
 	public GeneratorSettings getGeneratorSettings() {
 		return delegate.getGeneratorSettings();
 	}
+
+	@Override
+	public Generator getOrCreateIdGenerator(String rootName, PersistentClass persistentClass){
+		final Generator existing = getGenerators().get( rootName );
+		if ( existing != null ) {
+			return existing;
+		}
+		else {
+			final SimpleValue identifier = (SimpleValue) persistentClass.getIdentifier();
+			final Generator idgenerator = augmentWithReactiveGenerator(
+					identifier.createGenerator(
+							getDialect(),
+							persistentClass.getRootClass(),
+							persistentClass.getIdentifierProperty(),
+							getGeneratorSettings()
+					),
+					new IdGeneratorCreationContext(
+							persistentClass.getRootClass(),
+							persistentClass.getIdentifierProperty(),
+							getGeneratorSettings(),
+							identifier,
+							this
+					),
+					this );
+			getGenerators().put( rootName, idgenerator );
+			return idgenerator;
+		}
+	}
+
+	private record IdGeneratorCreationContext(
+			RootClass rootClass,
+			Property property,
+			GeneratorSettings defaults,
+			SimpleValue identifier,
+			RuntimeModelCreationContext buildingContext) implements GeneratorCreationContext {
+
+		@Override
+		public Database getDatabase() {
+			return buildingContext.getBootModel().getDatabase();
+		}
+
+		@Override
+		public ServiceRegistry getServiceRegistry() {
+			return buildingContext.getBootstrapContext().getServiceRegistry();
+		}
+
+		@Override
+		public SqlStringGenerationContext getSqlStringGenerationContext() {
+			return defaults.getSqlStringGenerationContext();
+		}
+
+		@Override
+		public String getDefaultCatalog() {
+			return defaults.getDefaultCatalog();
+		}
+
+		@Override
+		public String getDefaultSchema() {
+			return defaults.getDefaultSchema();
+		}
+
+		@Override
+		public RootClass getRootClass() {
+			return rootClass;
+		}
+
+		@Override
+		public PersistentClass getPersistentClass() {
+			return rootClass;
+		}
+
+		@Override
+		public Property getProperty() {
+			return property;
+		}
+
+		@Override
+		public Type getType() {
+			return identifier.getType();
+		}
+	}
+
 }
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcConnectionProviderInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcConnectionProviderInitiator.java
@@ -7,7 +7,7 @@
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
-import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
@@ -28,7 +28,7 @@ public class NoJdbcConnectionProviderInitiator implements StandardServiceInitiat
 	@Override
 	public ConnectionProvider initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
 		ConnectionProvider provider = ConnectionProviderInitiator.INSTANCE.initiateService(configurationValues, registry);
-		if (provider instanceof DriverManagerConnectionProviderImpl) {
+		if ( provider instanceof DriverManagerConnectionProvider ) {
 			return NoJdbcConnectionProvider.INSTANCE;
 		}
 		return provider;
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java
@@ -196,8 +196,8 @@ private void threadCheck() {
 	}
 
 	@Override
-	protected PersistenceContext createPersistenceContext() {
-		return new ReactivePersistenceContextAdapter( super.createPersistenceContext() );
+	protected PersistenceContext createPersistenceContext(SessionCreationOptions options) {
+		return new ReactivePersistenceContextAdapter( super.createPersistenceContext( options ) );
 	}
 
 	@Override
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveListResultsConsumer.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveListResultsConsumer.java
@@ -271,7 +271,7 @@ private JavaType<R> resolveDomainResultJavaType(
 			return (JavaType<R>) resultJavaTypes.get( 0 );
 		}
 
-		return javaTypeRegistry.resolveDescriptor( Object[].class );
+		return javaTypeRegistry.getDescriptor( Object[].class );
 	}
 
 	@Override
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/tuple/entity/ReactiveEntityMetamodel.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/tuple/entity/ReactiveEntityMetamodel.java
@@ -8,7 +8,6 @@
 import java.util.Set;
 import java.util.function.Function;
 
-
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
@@ -29,7 +28,6 @@
 import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.reactive.bythecode.spi.ReactiveBytecodeEnhancementMetadataPojoImplAdapter;
 import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
 import org.hibernate.reactive.id.impl.EmulatedSequenceReactiveIdentifierGenerator;
@@ -46,28 +44,29 @@
 import static java.lang.invoke.MethodHandles.lookup;
 import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
 
+/**
+ * @deprecated No Longer used
+ */
+@Deprecated(since = "4.2", forRemoval = true)
 public class ReactiveEntityMetamodel extends EntityMetamodel {
 
 	private static final Log LOG = make( Log.class, lookup() );
 
 	public ReactiveEntityMetamodel(
 			PersistentClass persistentClass,
-			EntityPersister persister,
 			RuntimeModelCreationContext creationContext) {
 		this(
 				persistentClass,
-				persister,
 				creationContext,
 				s -> buildIdGenerator( s, persistentClass, creationContext )
 		);
 	}
 
 	public ReactiveEntityMetamodel(
 			PersistentClass persistentClass,
-			EntityPersister persister,
 			RuntimeModelCreationContext creationContext,
 			Function<String, Generator> generatorSupplier) {
-		super( persistentClass, persister, creationContext, generatorSupplier );
+		super( persistentClass, creationContext, generatorSupplier );
 	}
 
 	private static Generator buildIdGenerator(
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/type/descriptor/jdbc/ReactiveArrayJdbcType.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/type/descriptor/jdbc/ReactiveArrayJdbcType.java

Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,8 @@ private void threadCheck() {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`@Override`
`199`		`- protected PersistenceContext createPersistenceContext() {`
`200`		`- return new ReactivePersistenceContextAdapter( super.createPersistenceContext() );`
	`199`	`+ protected PersistenceContext createPersistenceContext(SessionCreationOptions options) {`
	`200`	`+ return new ReactivePersistenceContextAdapter( super.createPersistenceContext( options ) );`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ private JavaType<R> resolveDomainResultJavaType(`
`271`	`271`	`return (JavaType<R>) resultJavaTypes.get( 0 );`
`272`	`272`	`}`
`273`	`273`
`274`		`- return javaTypeRegistry.resolveDescriptor( Object[].class );`
	`274`	`+ return javaTypeRegistry.getDescriptor( Object[].class );`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`@Override`