[#2640] Fix ReactiveEntityInitializerImpl

Fixes

* return the right lock (different than ORM)
* Fix postLoad issue

Author: DavideD

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

@@ -216,7 +216,7 @@ else if ( lazyInitializer.isUninitialized() ) {
 					if ( data.getState() == State.INITIALIZED ) {
 						registerReloadedEntity( data );
 						resolveInstanceSubInitializers( data );
-						if ( rowProcessingState.needsResolveState() ) {
+						if ( data.getState() == State.INITIALIZED && rowProcessingState.needsResolveState() ) {
 							// We need to read result set values to correctly populate the query cache
 							resolveState( data );
 						}
@@ -336,6 +336,19 @@ public CompletionStage<Void> reactiveInitializeInstance(EntityInitializerData da
 			assert consistentInstance( data );
 			return reactiveInitializeEntityInstance( (ReactiveEntityInitializerData) data );
 		}
+		else {
+			if ( data.getRowProcessingState().needsResolveState() ) {
+				// A sub-initializer might have taken responsibility for this entity,
+				// but we still need to resolve the state to correctly populate a query cache
+				resolveState( data );
+			}
+			final ReactiveEntityInitializerData reactiveData = (ReactiveEntityInitializerData) data;
+			if ( getEntityDescriptor().getBytecodeEnhancementMetadata().isEnhancedForLazyLoading()
+					&& reactiveData.getEntityHolder().getEntityInitializer() != this
+					&& reactiveData.getEntityHolder().isInitialized() ) {
+				updateInitializedEntityInstance( data );
+			}
+		}
 		data.setState( State.INITIALIZED );
 		return voidFuture();
 	}
@@ -348,7 +361,7 @@ protected CompletionStage<Void> reactiveInitializeEntityInstance(ReactiveEntityI
 
 		return reactiveExtractConcreteTypeStateValues( data )
 				.thenAccept( resolvedEntityState -> {
-
+					rowProcessingState.getJdbcValuesSourceProcessingState().registerLoadingEntityHolder( data.getEntityHolder() );
 					preLoad( data, resolvedEntityState );
 
 					if ( isPersistentAttributeInterceptable( data.getEntityInstanceForNotify() ) ) {
@@ -372,18 +385,14 @@ protected CompletionStage<Void> reactiveInitializeEntityInstance(ReactiveEntityI
 					final Object version = getVersionAssembler() != null ? getVersionAssembler().assemble( rowProcessingState ) : null;
 					final Object rowId = getRowIdAssembler() != null ? getRowIdAssembler().assemble( rowProcessingState ) : null;
 
-					// from the perspective of Hibernate, an entity is read locked as soon as it is read
-					// so regardless of the requested lock mode, we upgrade to at least the read level
-					final LockMode lockModeToAcquire = data.getLockMode() == LockMode.NONE ? LockMode.READ : data.getLockMode();
-
 					final EntityEntry entityEntry = persistenceContext.addEntry(
 							data.getEntityInstanceForNotify(),
 							Status.LOADING,
 							resolvedEntityState,
 							rowId,
 							data.getEntityKey().getIdentifier(),
 							version,
-							lockModeToAcquire,
+							lockModeToAcquire( data ),
 							true,
 							data.getConcreteDescriptor(),
 							false
@@ -404,16 +413,15 @@ protected CompletionStage<Void> reactiveInitializeEntityInstance(ReactiveEntityI
 							statistics.loadEntity( data.getConcreteDescriptor().getEntityName() );
 						}
 					}
-					updateCaches(
-							data,
-							session,
-							session.getPersistenceContextInternal(),
-							resolvedEntityState,
-							version
-					);
+					updateCaches( data, session, session.getPersistenceContextInternal(), resolvedEntityState, version );
 				} );
 	}
 
+	// Hibernate ORM has a similar method, but it checks if we are in a transaction first
+	private static LockMode lockModeToAcquire(ReactiveEntityInitializerData data) {
+		return data.getLockMode() == LockMode.NONE ? LockMode.READ : data.getLockMode();
+	}
+
 	protected CompletionStage<Object[]> reactiveExtractConcreteTypeStateValues(ReactiveEntityInitializerData data) {
 		final RowProcessingState rowProcessingState = data.getRowProcessingState();
 		final Object[] values = new Object[data.getConcreteDescriptor().getNumberOfAttributeMappings()];
@@ -447,7 +455,9 @@ protected CompletionStage<Void> reactiveResolveEntityInstance1(ReactiveEntityIni
 			else {
 				data.setInstance( proxy );
 				if ( Hibernate.isInitialized( data.getInstance() ) ) {
-					data.setState( State.INITIALIZED );
+					if ( data.getEntityHolder().isInitialized() ) {
+						data.setState( State.INITIALIZED );
+					}
 					data.setEntityInstanceForNotify( Hibernate.unproxy( data.getInstance() ) );
 				}
 				else {