HHH-18847 - Organize the org.hibernate.query.results package

hibernate · Nov 19, 2024 · 6707dee · 6707dee
1 parent 2c5e0ff
commit 6707dee
Show file tree

Hide file tree

Showing 106 changed files with 623 additions and 771 deletions.
diff --git a/...e-core/src/main/java/org/hibernate/generator/values/GeneratedValueBasicResultBuilder.java b/...e-core/src/main/java/org/hibernate/generator/values/GeneratedValueBasicResultBuilder.java
@@ -4,13 +4,10 @@
  */
 package org.hibernate.generator.values;
 
-import java.util.function.BiFunction;
-
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
-import org.hibernate.query.results.DomainResultCreationStateImpl;
 import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.ResultsHelper;
-import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
+import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
+import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -20,8 +17,8 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import static org.hibernate.generator.values.internal.GeneratedValuesHelper.getActualGeneratedModelPart;
-import static org.hibernate.query.results.ResultsHelper.impl;
-import static org.hibernate.query.results.ResultsHelper.jdbcPositionToValuesArrayPosition;
+import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.jdbcPositionToValuesArrayPosition;
 
 /**
  * Simple implementation of {@link ResultBuilder} for retrieving generated basic values.
@@ -60,7 +57,6 @@ public ResultBuilder cacheKeyInstance() {
 	public BasicResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState) {
 		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
 

diff --git a/...ate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java b/...ate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java
@@ -31,7 +31,7 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
 import org.hibernate.pretty.MessageHelper;
-import org.hibernate.query.results.TableGroupImpl;
+import org.hibernate.query.results.internal.TableGroupImpl;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;

diff --git a/...src/main/java/org/hibernate/generator/values/internal/GeneratedValuesMappingProducer.java b/...src/main/java/org/hibernate/generator/values/internal/GeneratedValuesMappingProducer.java
@@ -12,8 +12,8 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.generator.values.GeneratedValueBasicResultBuilder;
 import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
-import org.hibernate.query.results.DomainResultCreationStateImpl;
-import org.hibernate.query.results.JdbcValuesMappingImpl;
+import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
+import org.hibernate.query.results.internal.JdbcValuesMappingImpl;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;
@@ -57,7 +57,6 @@ public JdbcValuesMapping resolve(
 			final DomainResult<?> domainResult = resultBuilder.buildResult(
 					jdbcResultsMetadata,
 					domainResults.size(),
-					creationState.getLegacyFetchResolver()::resolve,
 					creationState
 			);
 

diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
@@ -86,7 +86,7 @@
 import org.jboss.logging.Logger;
 
 import static java.util.Collections.singletonList;
-import static org.hibernate.query.results.ResultsHelper.attributeName;
+import static org.hibernate.query.results.internal.ResultsHelper.attributeName;
 
 /**
  * Builder for SQL AST trees used by {@link Loader} implementations.

diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java
@@ -4,17 +4,14 @@
  */
 package org.hibernate.procedure.internal;
 
-import java.util.function.BiFunction;
-
 import org.hibernate.LockMode;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.query.results.BasicValuedFetchBuilder;
+import org.hibernate.query.results.FetchBuilderBasicValued;
 import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.complete.EntityResultImpl;
-import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
-import org.hibernate.query.results.implicit.ImplicitFetchBuilderBasic;
+import org.hibernate.query.results.internal.complete.EntityResultImpl;
+import org.hibernate.query.results.internal.implicit.ImplicitFetchBuilderBasic;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.entity.EntityResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -26,7 +23,7 @@ public class EntityDomainResultBuilder implements ResultBuilder {
 
 	private final NavigablePath navigablePath;
 	private final EntityMappingType entityDescriptor;
-	private final BasicValuedFetchBuilder discriminatorFetchBuilder;
+	private final FetchBuilderBasicValued discriminatorFetchBuilder;
 
 	public EntityDomainResultBuilder(EntityMappingType entityDescriptor) {
 		this.entityDescriptor = entityDescriptor;
@@ -57,7 +54,6 @@ public ResultBuilder cacheKeyInstance() {
 	public EntityResult buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState) {
 
 		return new EntityResultImpl(
@@ -73,7 +69,6 @@ public EntityResult buildResult(
 							entityResult,
 							navigablePath.append( EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME ),
 							jdbcResultsMetadata,
-							legacyFetchResolver,
 							domainResultCreationState
 					);
 				},

diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java
@@ -4,12 +4,9 @@
  */
 package org.hibernate.procedure.internal;
 
-import java.util.function.BiFunction;
-
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.ResultSetMappingSqlSelection;
-import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
+import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;
@@ -38,7 +35,6 @@ public Class<?> getJavaType() {
 	public DomainResult<T> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState) {
 		final SqlExpressionResolver sqlExpressionResolver = domainResultCreationState.getSqlAstCreationState()
 				.getSqlExpressionResolver();

diff --git a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
@@ -4,12 +4,6 @@
  */
 package org.hibernate.query;
 
-import java.time.Instant;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Map;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.CacheRetrieveMode;
 import jakarta.persistence.CacheStoreMode;
@@ -18,7 +12,6 @@
 import jakarta.persistence.Parameter;
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.metamodel.SingularAttribute;
-
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.LockMode;
@@ -31,6 +24,12 @@
 import org.hibernate.transform.ResultTransformer;
 import org.hibernate.type.BasicTypeReference;
 
+import java.time.Instant;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Map;
+
 /**
  * Within the context of an active {@linkplain org.hibernate.Session session},
  * an instance of this type represents an executable query written in the

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoBasicStandard.java
@@ -10,7 +10,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.named.FetchMementoBasic;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.complete.CompleteFetchBuilderBasicPart;
+import org.hibernate.query.results.internal.complete.CompleteFetchBuilderBasicPart;
 
 /**
  * Memento describing a basic-valued fetch.  A basic-value cannot be

diff --git a/...rnate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java b/...rnate-core/src/main/java/org/hibernate/query/internal/FetchMementoEmbeddableStandard.java
@@ -10,7 +10,7 @@
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.query.named.FetchMemento;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.complete.CompleteFetchBuilderEmbeddableValuedModelPart;
+import org.hibernate.query.results.internal.complete.CompleteFetchBuilderEmbeddableValuedModelPart;
 import org.hibernate.spi.NavigablePath;
 
 /**

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoEntityStandard.java
@@ -10,7 +10,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.named.FetchMemento;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.complete.CompleteFetchBuilderEntityValuedModelPart;
+import org.hibernate.query.results.internal.complete.CompleteFetchBuilderEntityValuedModelPart;
 import org.hibernate.sql.results.graph.entity.EntityValuedFetchable;
 
 /**

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/FetchMementoHbmStandard.java
@@ -14,13 +14,13 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
-import org.hibernate.query.results.complete.CompleteFetchBuilderEntityValuedModelPart;
-import org.hibernate.query.results.dynamic.DynamicFetchBuilder;
-import org.hibernate.query.results.dynamic.DynamicResultBuilderEntityStandard;
+import org.hibernate.query.results.internal.complete.CompleteFetchBuilderEntityValuedModelPart;
+import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilder;
+import org.hibernate.query.results.internal.dynamic.DynamicResultBuilderEntityStandard;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.named.FetchMemento;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
+import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.Fetchable;
 import org.hibernate.sql.results.graph.FetchableContainer;
 

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitAttributeFetchMemento.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ImplicitAttributeFetchMemento.java
@@ -10,7 +10,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.named.FetchMemento;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.ImplicitAttributeFetchBuilder;
+import org.hibernate.query.results.internal.implicit.ImplicitAttributeFetchBuilder;
 
 /**
  * @author Steve Ebersole

diff --git a/...rnate-core/src/main/java/org/hibernate/query/internal/ImplicitModelPartResultMemento.java b/...rnate-core/src/main/java/org/hibernate/query/internal/ImplicitModelPartResultMemento.java
@@ -12,9 +12,9 @@
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.named.ModelPartResultMemento;
-import org.hibernate.query.results.implicit.ImplicitModelPartResultBuilderBasic;
-import org.hibernate.query.results.implicit.ImplicitModelPartResultBuilderEmbeddable;
-import org.hibernate.query.results.implicit.ImplicitModelPartResultBuilderEntity;
+import org.hibernate.query.results.internal.implicit.ImplicitModelPartResultBuilderBasic;
+import org.hibernate.query.results.internal.implicit.ImplicitModelPartResultBuilderEmbeddable;
+import org.hibernate.query.results.internal.implicit.ImplicitModelPartResultBuilderEntity;
 import org.hibernate.query.results.ResultBuilder;
 
 /**

diff --git a/...nate-core/src/main/java/org/hibernate/query/internal/ModelPartResultMementoBasicImpl.java b/...nate-core/src/main/java/org/hibernate/query/internal/ModelPartResultMementoBasicImpl.java
@@ -10,7 +10,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.named.ModelPartResultMementoBasic;
 import org.hibernate.query.results.ResultBuilderBasicValued;
-import org.hibernate.query.results.complete.CompleteResultBuilderBasicModelPart;
+import org.hibernate.query.results.internal.complete.CompleteResultBuilderBasicModelPart;
 
 /**
  * @author Steve Ebersole

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java
@@ -12,8 +12,8 @@
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.named.ResultMementoBasic;
 import org.hibernate.query.results.ResultBuilderBasicValued;
-import org.hibernate.query.results.complete.CompleteResultBuilderBasicValuedConverted;
-import org.hibernate.query.results.complete.CompleteResultBuilderBasicValuedStandard;
+import org.hibernate.query.results.internal.complete.CompleteResultBuilderBasicValuedConverted;
+import org.hibernate.query.results.internal.complete.CompleteResultBuilderBasicValuedStandard;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.type.BasicType;

diff --git a/...nate-core/src/main/java/org/hibernate/query/internal/ResultMementoCollectionStandard.java b/...nate-core/src/main/java/org/hibernate/query/internal/ResultMementoCollectionStandard.java
@@ -10,7 +10,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.named.ModelPartResultMementoCollection;
 import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.complete.CompleteResultBuilderCollectionStandard;
+import org.hibernate.query.results.internal.complete.CompleteResultBuilderCollectionStandard;
 
 /**
  * @author Steve Ebersole

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityJpa.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityJpa.java
@@ -16,12 +16,12 @@
 import org.hibernate.query.named.FetchMemento;
 import org.hibernate.query.named.FetchMementoBasic;
 import org.hibernate.query.named.ResultMementoEntity;
-import org.hibernate.query.results.BasicValuedFetchBuilder;
+import org.hibernate.query.results.FetchBuilderBasicValued;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.ResultBuilderEntityValued;
-import org.hibernate.query.results.complete.CompleteResultBuilderEntityJpa;
-import org.hibernate.query.results.complete.DelayedFetchBuilderBasicPart;
-import org.hibernate.query.results.implicit.ImplicitFetchBuilderBasic;
+import org.hibernate.query.results.internal.complete.CompleteResultBuilderEntityJpa;
+import org.hibernate.query.results.internal.complete.DelayedFetchBuilderBasicPart;
+import org.hibernate.query.results.internal.implicit.ImplicitFetchBuilderBasic;
 import org.hibernate.spi.NavigablePath;
 
 /**
@@ -56,14 +56,14 @@ public ResultBuilderEntityValued resolve(
 			Consumer<String> querySpaceConsumer,
 			ResultSetMappingResolutionContext context) {
 		final EntityDiscriminatorMapping discriminatorMapping = entityDescriptor.getDiscriminatorMapping();
-		final BasicValuedFetchBuilder discriminatorFetchBuilder;
+		final FetchBuilderBasicValued discriminatorFetchBuilder;
 		if ( discriminatorMapping == null || !entityDescriptor.hasSubclasses() ) {
 			assert discriminatorMemento == null;
 			discriminatorFetchBuilder = null;
 		}
 		else {
 			if ( discriminatorMemento != null ) {
-				discriminatorFetchBuilder = (BasicValuedFetchBuilder) discriminatorMemento.resolve( this, querySpaceConsumer, context );
+				discriminatorFetchBuilder = (FetchBuilderBasicValued) discriminatorMemento.resolve( this, querySpaceConsumer, context );
 			}
 			else {
 				discriminatorFetchBuilder = new ImplicitFetchBuilderBasic( navigablePath, discriminatorMapping );

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityStandard.java
@@ -15,10 +15,10 @@
 import org.hibernate.query.named.FetchMemento;
 import org.hibernate.query.named.FetchMementoBasic;
 import org.hibernate.query.named.ResultMementoEntity;
-import org.hibernate.query.results.BasicValuedFetchBuilder;
+import org.hibernate.query.results.FetchBuilderBasicValued;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.ResultBuilderEntityValued;
-import org.hibernate.query.results.complete.CompleteResultBuilderEntityStandard;
+import org.hibernate.query.results.internal.complete.CompleteResultBuilderEntityStandard;
 
 /**
  * @author Steve Ebersole
@@ -60,8 +60,8 @@ public ResultBuilderEntityValued resolve(
 			Consumer<String> querySpaceConsumer,
 			ResultSetMappingResolutionContext context) {
 
-		final BasicValuedFetchBuilder discriminatorResultBuilder = discriminatorMemento != null
-				? (BasicValuedFetchBuilder) discriminatorMemento.resolve( this, querySpaceConsumer, context )
+		final FetchBuilderBasicValued discriminatorResultBuilder = discriminatorMemento != null
+				? (FetchBuilderBasicValued) discriminatorMemento.resolve( this, querySpaceConsumer, context )
 				: null;
 
 		final HashMap<String, FetchBuilder> fetchBuilderMap = new HashMap<>();

diff --git a/...e-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java b/...e-core/src/main/java/org/hibernate/query/internal/ResultMementoInstantiationStandard.java
@@ -11,7 +11,7 @@
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.query.named.ResultMementoInstantiation;
 import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.complete.CompleteResultBuilderInstantiation;
+import org.hibernate.query.results.internal.complete.CompleteResultBuilderInstantiation;
 import org.hibernate.type.descriptor.java.JavaType;
 
 /**

diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilder.java
@@ -4,32 +4,33 @@
  */
 package org.hibernate.query.results;
 
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-
 import org.hibernate.Incubating;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
-import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
+import java.util.function.BiConsumer;
+
 /**
- * Responsible for building a single {@link DomainResult} instance as part of
- * the overall mapping of native / procedure query results.
+ * Responsible for building a single {@link Fetch} instance.
+ * Given the following HQL for illustration,
+ * <pre>
+ *     select b from Book b join fetch b.authors
+ * </pre>
+ * we have a single fetch : `Book(b).authors`
+ *
+ * @see ResultBuilder
  *
- * @apiNote By definition a fetch is a reference to the fetched ModelPart
  * @author Steve Ebersole
  */
 @Incubating
-public interface FetchBuilder {
+public interface FetchBuilder extends GraphNodeBuilder {
 	Fetch buildFetch(
 			FetchParent parent,
 			NavigablePath fetchPath,
 			JdbcValuesMetadata jdbcResultsMetadata,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState);
 
 	default void visitFetchBuilders(BiConsumer<String, FetchBuilder> consumer) {