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

Author: sebersole

hibernate-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.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.ResultBuilder;
+import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultsHelper;
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -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 );
 

hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesMappingProducer.java

@@ -57,7 +57,6 @@ public JdbcValuesMapping resolve(
 			final DomainResult<?> domainResult = resultBuilder.buildResult(
 					jdbcResultsMetadata,
 					domainResults.size(),
-					creationState.getLegacyFetchResolver()::resolve,
 					creationState
 			);
 

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.FetchBuilderBasicValued;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.internal.complete.EntityResultImpl;
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 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;
@@ -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
 					);
 				},

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.internal.ResultSetMappingSqlSelection;
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 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();

hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilder.java

@@ -5,11 +5,9 @@
 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.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
@@ -29,7 +27,6 @@ Fetch buildFetch(
 			FetchParent parent,
 			NavigablePath fetchPath,
 			JdbcValuesMetadata jdbcResultsMetadata,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState);
 
 	default void visitFetchBuilders(BiConsumer<String, FetchBuilder> consumer) {

hibernate-core/src/main/java/org/hibernate/query/results/FetchBuilderBasicValued.java

@@ -4,10 +4,7 @@
  */
 package org.hibernate.query.results;
 
-import java.util.function.BiFunction;
-
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.basic.BasicFetch;
@@ -24,6 +21,5 @@ BasicFetch<?> buildFetch(
 			FetchParent parent,
 			NavigablePath fetchPath,
 			JdbcValuesMetadata jdbcResultsMetadata,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState);
 }

hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilder.java

@@ -4,15 +4,13 @@
  */
 package org.hibernate.query.results;
 
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-
 import org.hibernate.Incubating;
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 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.
@@ -26,13 +24,11 @@ public interface ResultBuilder {
 	 *
 	 * @param jdbcResultsMetadata The JDBC values and metadata
 	 * @param resultPosition The position in the domain results for the result to be built
-	 * @param legacyFetchResolver Support for allowing some legacy-style fetch resolution
 	 * @param domainResultCreationState Access to useful stuff
 	 */
 	DomainResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState);
 
 	/**

hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderBasicValued.java

@@ -4,9 +4,6 @@
  */
 package org.hibernate.query.results;
 
-import java.util.function.BiFunction;
-
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -23,6 +20,5 @@ public interface ResultBuilderBasicValued extends ResultBuilder {
 	BasicResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState);
 }

hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEmbeddable.java

@@ -4,9 +4,6 @@
  */
 package org.hibernate.query.results;
 
-import java.util.function.BiFunction;
-
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.embeddable.EmbeddableResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -21,6 +18,5 @@ public interface ResultBuilderEmbeddable extends ResultBuilder {
 	EmbeddableResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState);
 }

hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java

@@ -4,9 +4,6 @@
  */
 package org.hibernate.query.results;
 
-import java.util.function.BiFunction;
-
-import org.hibernate.query.results.internal.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.entity.EntityResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -23,6 +20,5 @@ public interface ResultBuilderEntityValued extends ResultBuilder {
 	EntityResult buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
-			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState);
 }