Removed use of JdbcValuesSourceProcessingState#findInitializer()

Author: dreab8

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

@@ -385,10 +385,6 @@ protected void resolveEntityKey(RowProcessingState rowProcessingState) {
 		//		2) build the EntityKey
 		this.entityKey = new EntityKey( id, concreteDescriptor );
 
-		if ( jdbcValuesSourceProcessingState.findInitializer( entityKey ) == null ) {
-			jdbcValuesSourceProcessingState.registerInitializer( entityKey, this );
-		}
-
 		//		3) schedule the EntityKey for batch loading, if possible
 		if ( concreteDescriptor.isBatchLoadable() ) {
 			if ( !session.getPersistenceContext().containsEntity( entityKey ) ) {

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

@@ -26,7 +26,6 @@
 import org.hibernate.sql.results.graph.AbstractFetchParentAccess;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.FetchParentAccess;
-import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.graph.entity.EntityLoadingLogging;
 import org.hibernate.sql.results.graph.entity.LoadingEntityEntry;
@@ -89,6 +88,7 @@ public void resolveInstance(RowProcessingState rowProcessingState) {
 			if ( np instanceof EntityIdentifierNavigablePath
 					|| ForeignKeyDescriptor.PART_NAME.equals( np.getLocalName() )
 					|| ForeignKeyDescriptor.TARGET_PART_NAME.equals( np.getLocalName() )) {
+
 				initializeInstance( rowProcessingState );
 				return;
 			}
@@ -133,24 +133,6 @@ public void initializeInstance(RowProcessingState rowProcessingState) {
 			return;
 		}
 
-		Initializer initializer = rowProcessingState.getJdbcValuesSourceProcessingState()
-				.findInitializer( entityKey );
-
-		if ( initializer != null ) {
-			if ( EntityLoadingLogging.DEBUG_ENABLED ) {
-				EntityLoadingLogging.ENTITY_LOADING_LOGGER.debugf(
-						"(%s) Found an initializer for entity (%s) : %s",
-						CONCRETE_NAME,
-						toLoggableString( getNavigablePath(), entityIdentifier ),
-						entityIdentifier
-				);
-			}
-			initializer.resolveInstance( rowProcessingState );
-			entityInstance = initializer.getInitializedInstance();
-			isInitialized = true;
-			return;
-		}
-
 		final LoadingEntityEntry existingLoadingEntry = session
 				.getPersistenceContext()
 				.getLoadContexts()

hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java

@@ -16,6 +16,7 @@
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchInitializer;
+import org.hibernate.sql.results.graph.entity.internal.EntitySelectFetchInitializer;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
@@ -136,14 +137,14 @@ private void coordinateInitializers(RowProcessingState rowProcessingState) {
 
 		for ( int i = 0; i < numberOfInitializers; i++ ) {
 			Initializer initializer = initializers.get( i );
-			if ( !( initializer instanceof EntityDelayedFetchInitializer ) ) {
+			if ( !( initializer instanceof EntityDelayedFetchInitializer ) && ! (initializer instanceof EntitySelectFetchInitializer ) ) {
 				initializer.resolveInstance( rowProcessingState );
 			}
 		}
 
 		for ( int i = 0; i < numberOfInitializers; i++ ) {
 			Initializer initializer = initializers.get( i );
-			if ( initializer instanceof EntityDelayedFetchInitializer ) {
+			if ( initializer instanceof EntityDelayedFetchInitializer || initializer instanceof EntitySelectFetchInitializer ) {
 				initializer.resolveInstance( rowProcessingState );
 			}
 		}

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java

@@ -47,7 +47,6 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
 	private final BiConsumer<EntityKey,LoadingEntityEntry> loadingEntityEntryConsumer;
 
 	private Map<EntityKey, LoadingEntityEntry> loadingEntityMap;
-	private Map<EntityKey, Initializer> initializerMap;
 	private Map<EntityUniqueKey, Initializer> initializerByUniquKeyMap;
 	private Map<CollectionKey, LoadingCollectionEntry> loadingCollectionMap;
 	private List<CollectionInitializer> arrayInitializers;
@@ -114,17 +113,6 @@ public void registerLoadingEntity(
 		loadingEntityMap.put( entityKey, loadingEntry );
 	}
 
-	@Override
-	public void registerInitializer(
-			EntityKey entityKey,
-			Initializer initializer) {
-		if ( initializerMap == null ) {
-			initializerMap = new HashMap<>();
-		}
-		initializerMap.put( entityKey, initializer );
-
-	}
-
 	@Override
 	public void registerInitializer(EntityUniqueKey entityKey, Initializer initializer) {
 		if ( initializerByUniquKeyMap == null ) {
@@ -138,11 +126,6 @@ public Initializer findInitializer(EntityUniqueKey entityKey) {
 		return initializerByUniquKeyMap == null ? null : initializerByUniquKeyMap.get( entityKey );
 	}
 
-	@Override
-	public Initializer findInitializer(EntityKey entityKey) {
-		return initializerMap == null ? null : initializerMap.get( entityKey );
-	}
-
 	@Override
 	public LoadingEntityEntry findLoadingEntityLocally(EntityKey entityKey) {
 		return loadingEntityMap == null ? null : loadingEntityMap.get( entityKey );

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesSourceProcessingState.java

@@ -55,16 +55,10 @@ void registerLoadingEntity(
 			EntityKey entityKey,
 			LoadingEntityEntry loadingEntry);
 
-	void registerInitializer(
-			EntityKey entityKey,
-			Initializer initializer);
-
 	void registerInitializer(
 			EntityUniqueKey entityKey,
 			Initializer initializer);
 
-	Initializer findInitializer(EntityKey entityKey);
-
 	Initializer findInitializer(EntityUniqueKey entityKey);
 
 

hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java

@@ -60,12 +60,6 @@ public LoadingCollectionEntry findLoadingCollectionEntry(CollectionKey collectio
 		);
 	}
 
-	public Initializer findInitializer(EntityKey key){
-		return jdbcValuesSourceProcessingStateStack.findCurrentFirst(
-				state -> state.findInitializer( key )
-		);
-	}
-
 	public Initializer findInitializer(EntityUniqueKey key){
 		return jdbcValuesSourceProcessingStateStack.findCurrentFirst(
 				state -> state.findInitializer( key )