refactoring and cleanup to the procedure.internal package

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java

@@ -20,7 +20,6 @@
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.procedure.internal.NamedCallableQueryMementoImpl;
-import org.hibernate.procedure.internal.Util;
 import org.hibernate.procedure.spi.NamedCallableQueryMemento;
 import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.query.results.ResultSetMapping;
@@ -29,6 +28,8 @@
 import jakarta.persistence.ParameterMode;
 import jakarta.persistence.StoredProcedureParameter;
 
+import static org.hibernate.procedure.internal.Util.resolveResultSetMappingClasses;
+import static org.hibernate.procedure.internal.Util.resolveResultSetMappingNames;
 import static org.hibernate.procedure.spi.NamedCallableQueryMemento.ParameterMemento;
 
 /**
@@ -96,15 +97,15 @@ public NamedCallableQueryMemento resolve(SessionFactoryImplementor sessionFactor
 		final ResultSetMapping resultSetMapping = buildResultSetMapping( registeredName, sessionFactory );
 
 		if ( specifiesResultClasses ) {
-			Util.resolveResultSetMappingClasses(
+			resolveResultSetMappingClasses(
 					resultClasses,
 					resultSetMapping,
 					collectedQuerySpaces::add,
 					() -> sessionFactory
 			);
 		}
 		else if ( specifiesResultSetMappings ) {
-			Util.resolveResultSetMappingNames(
+			resolveResultSetMappingNames(
 					resultSetMappings,
 					resultSetMapping,
 					collectedQuerySpaces::add,

hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java

@@ -19,13 +19,13 @@
 /**
  * @author Christian Beikov
  */
-public class EntityDomainResultBuilder implements ResultBuilder {
+class EntityDomainResultBuilder implements ResultBuilder {
 
 	private final NavigablePath navigablePath;
 	private final EntityMappingType entityDescriptor;
 	private final FetchBuilderBasicValued discriminatorFetchBuilder;
 
-	public EntityDomainResultBuilder(EntityMappingType entityDescriptor) {
+	EntityDomainResultBuilder(EntityMappingType entityDescriptor) {
 		this.entityDescriptor = entityDescriptor;
 		this.navigablePath = new NavigablePath( entityDescriptor.getEntityName() );
 		final EntityDiscriminatorMapping discriminatorMapping = entityDescriptor.getDiscriminatorMapping();

hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java

@@ -17,23 +17,20 @@
 import org.hibernate.sql.exec.internal.JdbcCallParameterExtractorImpl;
 import org.hibernate.sql.exec.internal.JdbcCallRefCursorExtractorImpl;
 import org.hibernate.sql.exec.spi.JdbcCallFunctionReturn;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import jakarta.persistence.ParameterMode;
 
 /**
  * @author Steve Ebersole
  */
-public class FunctionReturnImpl<T> implements FunctionReturnImplementor<T> {
+class FunctionReturnImpl<T> implements FunctionReturnImplementor<T> {
 
 	private final ProcedureCallImplementor<T> procedureCall;
 	private final int sqlTypeCode;
 
 	private OutputableType<T> ormType;
 
-	public FunctionReturnImpl(ProcedureCallImplementor<T> procedureCall, int sqlTypeCode) {
+	FunctionReturnImpl(ProcedureCallImplementor<T> procedureCall, int sqlTypeCode) {
 		this.procedureCall = procedureCall;
 		this.sqlTypeCode = sqlTypeCode;
 	}
@@ -67,11 +64,11 @@ private OutputableType<T> getOrmType(SharedSessionContractImplementor persistenc
 			return ormType;
 		}
 		else {
-			final TypeConfiguration typeConfiguration = persistenceContext.getFactory().getTypeConfiguration();
-			final JavaType<?> javaType =
+			final var typeConfiguration = persistenceContext.getFactory().getTypeConfiguration();
+			final var javaType =
 					typeConfiguration.getJdbcTypeRegistry().getDescriptor( getJdbcTypeCode() )
 							.getJdbcRecommendedJavaTypeMapping( null, null, typeConfiguration );
-			final BasicType<?> basicType =
+			final var basicType =
 					typeConfiguration.standardBasicTypeForJavaType( javaType.getJavaTypeClass() );
 			//noinspection unchecked
 			return (OutputableType<T>) basicType;