fix general deprecations

Author: blafond

hibernate-reactive-core/src/main/java/org/hibernate/reactive/common/AffectedEntities.java

@@ -50,12 +50,9 @@ public Class<?>[] getAffectedEntities() {
 	}
 
 	public String[] getAffectedSpaces(SessionFactoryImplementor factory) {
-		List<String> spaces = new ArrayList<>();
-		for ( String table : getAffectedTables() ) {
-			spaces.add( table );
-		}
+		List<String> spaces = new ArrayList<>( Arrays.asList( getAffectedTables() ) );
 		for ( Class<?> entity : getAffectedEntities() ) {
-			Serializable[] querySpaces = factory.getMetamodel().entityPersister( entity ).getQuerySpaces();
+			Serializable[] querySpaces = factory.getMappingMetamodel().getEntityDescriptor( entity.getName() ).getQuerySpaces();
 			spaces.addAll( Arrays.asList( (String[]) querySpaces ) );
 		}
 		return spaces.toArray( ArrayHelper.EMPTY_STRING_ARRAY );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/ReactiveActionQueue.java

@@ -1046,8 +1046,8 @@ public void sort(List<ReactiveEntityInsertActionHolder> insertions) {
 						actionDelegate.getEntityName(),
 						actionDelegate.getSession()
 								.getFactory()
-								.getMetamodel()
-								.entityPersister( actionDelegate.getEntityName() )
+								.getMappingMetamodel()
+								.getEntityDescriptor( actionDelegate.getEntityName() )
 								.getRootEntityName()
 				);
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/Cascade.java

@@ -26,6 +26,7 @@
 import org.hibernate.engine.spi.Status;
 import org.hibernate.event.spi.DeleteContext;
 import org.hibernate.event.spi.EventSource;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
@@ -314,7 +315,7 @@ private void cascadeLogicalOneToOneOrphanRemoval(
 						// Since the loadedState in the EntityEntry is a flat domain type array
 						// We first have to extract the component object and then ask the component type
 						// recursively to give us the value of the sub-property of that object
-						final Type propertyType = entry.getPersister().getPropertyType( componentPath.get(0) );
+						final AttributeMapping propertyType = entry.getPersister().findAttributeMapping( componentPath.get( 0) );
 						if ( propertyType instanceof ComponentType) {
 							loadedValue = entry.getLoadedValue( componentPath.get( 0 ) );
 							ComponentType componentType = (ComponentType) propertyType;

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/EntityTypes.java

@@ -18,6 +18,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
@@ -394,8 +395,8 @@ else if ( isPersistentAttributeInterceptable( value ) ) {
 		// We now have the value of the property-ref we reference. However,
 		// we need to dig a little deeper, as that property might also be
 		// an entity type, in which case we need to resolve its identifier
-		final Type type = entityPersister.getPropertyType( uniqueKeyPropertyName );
-		if ( type.isEntityType() ) {
+		final AttributeMapping type = entityPersister.findAttributeMapping( uniqueKeyPropertyName );
+		if ( type.isEntityIdentifierMapping() ) {
 			propertyValue = getIdentifier( (EntityType) type, propertyValue, session );
 		}
 		return completedFuture( propertyValue );
@@ -421,8 +422,8 @@ private static CompletionStage<Object> getIdentifierFromHibernateProxy(
 						// We now have the value of the property-ref we reference. However,
 						// we need to dig a little deeper, as that property might also be
 						// an entity type, in which case we need to resolve its identifier
-						final Type type = entityPersister.getPropertyType( uniqueKeyPropertyName );
-						if ( type.isEntityType() ) {
+						final AttributeMapping type = entityPersister.findAttributeMapping( uniqueKeyPropertyName );
+						if ( type.isEntityIdentifierMapping() ) {
 							propertyValue = getIdentifier( (EntityType) type, propertyValue, (SessionImplementor) session );
 						}
 						return completedFuture( propertyValue );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityUpdateAction.java

@@ -95,7 +95,7 @@ public CompletionStage<Void> reactiveExecute() throws HibernateException {
 				} )
 				.thenCompose( this::handleGeneratedProperties )
 				.thenAccept( entry -> {
-					handleDeleted( entry );
+					handleDeleted( entry, persister, instance );
 					updateCacheItem( persister, ck, entry );
 					handleNaturalIdResolutions( persister, session, id );
 					postUpdate();
@@ -135,8 +135,7 @@ private CompletionStage<EntityEntry> handleGeneratedProperties(EntityEntry entry
 		}
 	}
 
-	// TODO: copy/paste from superclass (make it protected)
-	private void handleDeleted(EntityEntry entry) {
+	private void handleDeleted(EntityEntry entry, EntityPersister persister, Object instance) {
 		if ( entry.getStatus() == Status.DELETED ) {
 			final EntityMetamodel entityMetamodel = getPersister().getEntityMetamodel();
 			final boolean isImpliedOptimisticLocking = !entityMetamodel.isVersioned()
@@ -145,7 +144,7 @@ private void handleDeleted(EntityEntry entry) {
 				// The entity will be deleted and because we are going to create a delete statement
 				// that uses all the state values in the where clause, the entry state needs to be
 				// updated otherwise the statement execution will not delete any row (see HHH-15218).
-				entry.postUpdate( getInstance(), getState(), getNextVersion() );
+				entry.postUpdate( instance, getState(), getNextVersion() );
 			}
 		}
 	}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveFlushEntityEventListener.java

@@ -158,7 +158,7 @@ public void onFlushEntity(FlushEntityEvent event) throws HibernateException {
 			// now update the object
 			// has to be outside the main if block above (because of collections)
 			if ( substitute ) {
-				persister.setPropertyValues( entity, values );
+				persister.setValues( entity, values );
 			}
 
 			// Search for collections by reachability, updating their role.
@@ -266,7 +266,7 @@ private boolean scheduleUpdate(final FlushEntityEvent event) {
 						dirtyProperties,
 						event.hasDirtyCollection(),
 						status == Status.DELETED && !entry.isModifiableEntity()
-								? persister.getPropertyValues( entity )
+								? persister.getValues( entity )
 								: entry.getLoadedState(),
 						entry.getVersion(),
 						nextVersion,

hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveMergeEventListener.java

@@ -5,7 +5,6 @@
  */
 package org.hibernate.reactive.event.impl;
 
-import java.io.Serializable;
 import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import java.util.concurrent.CompletionStage;
@@ -126,7 +125,7 @@ public CompletionStage<Void> reactiveOnMerge(MergeEvent event, MergeContext copi
 			if ( lazyInitializer != null ) {
 				if ( lazyInitializer.isUninitialized() ) {
 					LOG.trace( "Ignoring uninitialized proxy" );
-					event.setResult( source.load( lazyInitializer.getEntityName(), lazyInitializer.getInternalIdentifier() ) );
+					event.setResult( source.getReference( lazyInitializer.getEntityName(), lazyInitializer.getInternalIdentifier() ) );
 					return voidFuture();
 				}
 				else {
@@ -140,7 +139,7 @@ else if ( isPersistentAttributeInterceptable( original ) ) {
 					final EnhancementAsProxyLazinessInterceptor proxyInterceptor = (EnhancementAsProxyLazinessInterceptor) interceptor;
 					LOG.trace( "Ignoring uninitialized enhanced-proxy" );
 					//no need to go async, AFAICT ?
-					event.setResult( source.load( proxyInterceptor.getEntityName(), (Serializable) proxyInterceptor.getIdentifier() ) );
+					event.setResult( source.getReference( proxyInterceptor.getEntityName(), proxyInterceptor.getIdentifier() ) );
 					//EARLY EXIT!
 					return voidFuture();
 				}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdLoadPlan.java

@@ -17,7 +17,6 @@
 import org.hibernate.loader.ast.internal.SingleIdLoadPlan;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.persister.entity.Loadable;
 import org.hibernate.query.internal.SimpleQueryOptions;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.spi.QueryParameterBindings;
@@ -36,13 +35,13 @@
 public class ReactiveSingleIdLoadPlan<T> extends SingleIdLoadPlan<CompletionStage<T>> {
 
 	public ReactiveSingleIdLoadPlan(
-			EntityMappingType persister,
+			EntityMappingType entityMappingType,
 			ModelPart restrictivePart,
 			SelectStatement sqlAst,
 			JdbcParametersList jdbcParameters,
 			LockOptions lockOptions,
 			SessionFactoryImplementor sessionFactory) {
-		super( persister, restrictivePart, sqlAst, jdbcParameters, lockOptions, sessionFactory );
+		super( entityMappingType, restrictivePart, sqlAst, jdbcParameters, lockOptions, sessionFactory );
 	}
 
 	@Override
@@ -77,7 +76,7 @@ public CompletionStage<T> load(Object restrictedValue, Object entityInstance, Bo
 
 	private <T> void invokeAfterLoadActions(Callback callback, SharedSessionContractImplementor session, T entity) {
 		if ( entity != null && getLoadable() != null) {
-			callback.invokeAfterLoadActions( session, entity, (Loadable) getLoadable() );
+			callback.invokeAfterLoadActions( entity, (EntityMappingType) getLoadable(), session );
 		}
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinator.java

@@ -70,7 +70,7 @@ private CompletionStage<Void> reactivePreInsertInMemoryValueGeneration(Object[]
 					stage = stage.thenCompose( v -> generateValue( session, entity, currentValue, beforeGenerator, INSERT )
 							.thenAccept( generatedValue -> {
 								currentValues[index] = generatedValue;
-								entityPersister().setPropertyValue( entity, index, generatedValue );
+								entityPersister().setValue( entity, index, generatedValue );
 							} ) );
 				}
 			}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveUpdateCoordinatorStandard.java

@@ -193,7 +193,7 @@ private CompletionStage<int[]> reactivePreUpdateInMemoryValueGeneration(
 					result = result.thenCompose( v -> generateValue( session, entity, currentValue, beforeGenerator, INSERT )
 							.thenAccept( generatedValue -> {
 								currentValues[index] = generatedValue;
-								entityPersister().setPropertyValue( entity, index, generatedValue );
+								entityPersister().setValue( entity, index, generatedValue );
 								fieldsPreUpdateNeeded[count.getAndIncrement()] = index;
 							} ) );
 				}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/impl/ReactiveEntityManagerFactoryBuilder.java

@@ -55,7 +55,13 @@ public EntityManagerFactory build() {
         int batchSize = ConfigurationHelper.getInt( Settings.STATEMENT_BATCH_SIZE, getConfigurationValues(), 0 );
         optionsBuilder.applyJdbcBatchSize(batchSize);
 
-        final SessionFactoryBuilderImpl defaultBuilder = new SessionFactoryBuilderImpl( metadata, optionsBuilder );
+        final SessionFactoryBuilderImpl defaultBuilder = new SessionFactoryBuilderImpl(
+                metadata,
+                optionsBuilder,
+                metadata.getTypeConfiguration()
+                        .getMetadataBuildingContext()
+                        .getBootstrapContext()
+        );
         final SessionFactoryBuilderImplementor reactiveSessionFactoryBuilder = new ReactiveSessionFactoryBuilder( metadata, defaultBuilder );
         populateSfBuilder( reactiveSessionFactoryBuilder, getStandardServiceRegistry() );
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -1167,7 +1167,7 @@ public <T> CompletionStage<List<T>> reactiveFind(Class<T> entityClass, Object...
 
 	@Override
 	public <T> CompletionStage<T> reactiveFind(Class<T> entityClass, Map<String, Object> ids) {
-		final EntityPersister persister = getFactory().getMetamodel().locateEntityPersister( entityClass );
+		final EntityPersister persister = getFactory().getMappingMetamodel().getEntityDescriptor( entityClass );
 		return new NaturalIdLoadAccessImpl<T>( persister ).resolveNaturalId( ids )
 				.thenCompose( id -> reactiveFind( entityClass, id, null, null ) );
 	}
@@ -1232,11 +1232,11 @@ public ReactiveIdentifierLoadAccessImpl(EntityPersister entityPersister) {
 		}
 
 		public ReactiveIdentifierLoadAccessImpl(String entityName) {
-			this( getFactory().getMetamodel().locateEntityPersister( entityName ) );
+			this( getFactory().getMappingMetamodel().getEntityDescriptor( entityName ) );
 		}
 
 		public ReactiveIdentifierLoadAccessImpl(Class<T> entityClass) {
-			this( getFactory().getMetamodel().locateEntityPersister( entityClass ) );
+			this( getFactory().getMappingMetamodel().getEntityDescriptor( entityClass ) );
 		}
 
 		public final ReactiveIdentifierLoadAccessImpl<T> with(LockOptions lockOptions) {
@@ -1380,7 +1380,7 @@ public ReactiveMultiIdentifierLoadAccessImpl(EntityPersister entityPersister) {
 		}
 
 		public ReactiveMultiIdentifierLoadAccessImpl(Class<T> entityClass) {
-			this( getFactory().getMetamodel().locateEntityPersister( entityClass ) );
+			this( getFactory().getMappingMetamodel().getEntityDescriptor( entityClass ) );
 		}
 
 		@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

@@ -76,7 +76,6 @@
 import org.hibernate.reactive.query.sqm.internal.ReactiveSqmSelectionQueryImpl;
 import org.hibernate.reactive.session.ReactiveSqmQueryImplementor;
 import org.hibernate.reactive.session.ReactiveStatelessSession;
-import org.hibernate.tuple.entity.EntityMetamodel;
 
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.Tuple;
@@ -509,8 +508,7 @@ public CompletionStage<Object> reactiveInternalLoad(
 
 			// first, check to see if we can use "bytecode proxies"
 
-			final EntityMetamodel entityMetamodel = persister.getEntityMetamodel();
-			final BytecodeEnhancementMetadata enhancementMetadata = entityMetamodel.getBytecodeEnhancementMetadata();
+			final BytecodeEnhancementMetadata enhancementMetadata = persister.getBytecodeEnhancementMetadata();
 			if ( enhancementMetadata.isEnhancedForLazyLoading() ) {
 
 				// if the entity defines a HibernateProxy factory, see if there is an
@@ -530,15 +528,15 @@ public CompletionStage<Object> reactiveInternalLoad(
 					}
 
 					// specialized handling for entities with subclasses with a HibernateProxy factory
-					if ( entityMetamodel.hasSubclasses() ) {
+					if ( persister.hasSubclasses() ) {
 						// entities with subclasses that define a ProxyFactory can create
 						// a HibernateProxy.
 //                        LOG.debugf( "Creating a HibernateProxy for to-one association with subclasses to honor laziness" );
 						return completedFuture( createProxy( entityKey ) );
 					}
 					return completedFuture( enhancementMetadata.createEnhancedProxy( entityKey, false, this ) );
 				}
-				else if ( !entityMetamodel.hasSubclasses() ) {
+				else if ( !persister.hasSubclasses() ) {
 					return completedFuture( enhancementMetadata.createEnhancedProxy( entityKey, false, this ) );
 				}
 				// If we get here, then the entity class has subclasses and there is no HibernateProxy factory.

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/ReactiveAbstractEntityInitializer.java

@@ -219,7 +219,7 @@ private CompletionStage<Void> initializeEntityInstance(Object toInitialize, RowP
 									.injectInterceptor( toInitialize, entityIdentifier, session );
 						}
 					}
-					getConcreteDescriptor().setPropertyValues( toInitialize, getResolvedEntityState() );
+					getConcreteDescriptor().setValues( toInitialize, getResolvedEntityState() );
 					persistenceContext.addEntity( getEntityKey(), toInitialize );
 
 					// Also register possible unique key entries