Merge branch 'main' into HHH-19704-listagg-on-overflow

Author: Mike Mannion

hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java

@@ -14,7 +14,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.StringTokenizer;
 
 import jakarta.validation.NoProviderFoundException;
 import jakarta.validation.constraints.Digits;
@@ -25,7 +24,6 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import org.hibernate.AssertionFailure;
-import org.hibernate.MappingException;
 import org.hibernate.boot.internal.ClassLoaderAccessImpl;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
@@ -60,10 +58,10 @@
 import static java.util.Collections.disjoint;
 import static org.hibernate.boot.beanvalidation.BeanValidationIntegrator.APPLY_CONSTRAINTS;
 import static org.hibernate.boot.beanvalidation.GroupsPerOperation.buildGroupsForOperation;
+import static org.hibernate.boot.model.internal.BinderHelper.findPropertyByName;
 import static org.hibernate.cfg.ValidationSettings.CHECK_NULLABILITY;
 import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_FACTORY;
 import static org.hibernate.cfg.ValidationSettings.JPA_VALIDATION_FACTORY;
-import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 
 /**
@@ -496,72 +494,6 @@ private static boolean isValidatorLengthAnnotation(ConstraintDescriptor<?> descr
 				.equals( descriptor.getAnnotation().annotationType().getName() );
 	}
 
-	/**
-	 * Locate the property by path in a recursive way, including IdentifierProperty in the loop if propertyName is
-	 * {@code null}.  If propertyName is {@code null} or empty, the IdentifierProperty is returned
-	 */
-	private static Property findPropertyByName(PersistentClass associatedClass, String propertyName) {
-		Property property = null;
-		final Property idProperty = associatedClass.getIdentifierProperty();
-		final String idName = idProperty != null ? idProperty.getName() : null;
-		try {
-			if ( isEmpty( propertyName ) || propertyName.equals( idName ) ) {
-				//default to id
-				property = idProperty;
-			}
-			else {
-				if ( propertyName.indexOf( idName + "." ) == 0 ) {
-					property = idProperty;
-					propertyName = propertyName.substring( idName.length() + 1 );
-				}
-				final StringTokenizer tokens = new StringTokenizer( propertyName, ".", false );
-				while ( tokens.hasMoreTokens() ) {
-					final String element = tokens.nextToken();
-					if ( property == null ) {
-						property = associatedClass.getProperty( element );
-					}
-					else {
-						if ( property.isComposite() ) {
-							property = ( (Component) property.getValue() ).getProperty( element );
-						}
-						else {
-							return null;
-						}
-					}
-				}
-			}
-		}
-		catch ( MappingException e ) {
-			try {
-				//if we do not find it, try to check the identifier mapper
-				if ( associatedClass.getIdentifierMapper() == null ) {
-					return null;
-				}
-				else {
-					final StringTokenizer tokens = new StringTokenizer( propertyName, ".", false );
-					while ( tokens.hasMoreTokens() ) {
-						final String element = tokens.nextToken();
-						if ( property == null ) {
-							property = associatedClass.getIdentifierMapper().getProperty( element );
-						}
-						else {
-							if ( property.isComposite() ) {
-								property = ( (Component) property.getValue() ).getProperty( element );
-							}
-							else {
-								return null;
-							}
-						}
-					}
-				}
-			}
-			catch ( MappingException ee ) {
-				return null;
-			}
-		}
-		return property;
-	}
-
 	private static ValidatorFactory getValidatorFactory(ActivationContext context) {
 		// IMPL NOTE: We can either be provided a ValidatorFactory or make one. We can be provided
 		//            a ValidatorFactory in 2 different ways. So here we "get" a ValidatorFactory

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

@@ -266,12 +266,12 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
 
 		// we cannot use context.getConfigurationService() here because it might be missing some settings
 		// (the StandardServiceRegistry passed in here does not need to be the bootstrap service registry)
-		final ConfigurationService configurationService = serviceRegistry.requireService( ConfigurationService.class );
+		final var configurationService = serviceRegistry.requireService( ConfigurationService.class );
 
-		final StrategySelector strategySelector = serviceRegistry.requireService( StrategySelector.class );
-		final JdbcServices jdbcServices = serviceRegistry.requireService( JdbcServices.class );
+		final var strategySelector = serviceRegistry.requireService( StrategySelector.class );
+		final var jdbcServices = serviceRegistry.requireService( JdbcServices.class );
 
-		final Dialect dialect = jdbcServices.getJdbcEnvironment().getDialect();
+		final var dialect = jdbcServices.getJdbcEnvironment().getDialect();
 
 		final Map<String,Object> settings = new HashMap<>();
 		settings.putAll( map( dialect.getDefaultProperties() ) );
@@ -601,6 +601,12 @@ private static boolean disallowBatchUpdates(Dialect dialect, ExtractedDatabaseMe
 		return dialectAnswer != null ? !dialectAnswer : !meta.supportsBatchUpdates();
 	}
 
+	private static boolean hasStrategyConstructorSignature(Class<?>[] parameterTypes) {
+		return parameterTypes.length == 2
+			&& parameterTypes[0] == EntityMappingType.class
+			&& parameterTypes[1] == RuntimeModelCreationContext.class;
+	}
+
 	@SuppressWarnings("unchecked")
 	private SqmMultiTableMutationStrategy resolveSqmMutationStrategy(
 			String strategyName,
@@ -631,7 +637,7 @@ private SqmMultiTableMutationStrategy resolveSqmMutationStrategy(
 						else if ( parameterTypes.length == 0 ) {
 							emptyConstructor = constructor;
 						}
-						else if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
+						else if ( hasStrategyConstructorSignature( parameterTypes ) ) {
 							entityBasedConstructor = (Constructor<SqmMultiTableMutationStrategy>) declaredConstructor;
 						}
 					}
@@ -649,13 +655,12 @@ else if ( emptyConstructor != null ) {
 						}
 						catch (Exception e) {
 							throw new StrategySelectionException(
-									"Could not instantiate named strategy class [" +
-											strategyClass.getName() + "]",
+									"Could not instantiate named strategy class [" + strategyClass.getName() + "]",
 									e
 							);
 						}
-						throw new IllegalArgumentException(
-								"Cannot instantiate the class [" + strategyClass.getName() + "] because it does not have a constructor that accepts a dialect or an empty constructor" );
+						throw new IllegalArgumentException( "Cannot instantiate the class [" + strategyClass.getName()
+								+ "] because it does not have a constructor that accepts a dialect or an empty constructor" );
 					}
 					else {
 						return null;
@@ -668,19 +673,16 @@ else if ( emptyConstructor != null ) {
 	private Constructor<SqmMultiTableMutationStrategy> resolveSqmMutationStrategyConstructor(
 			String strategyName,
 			StrategySelector strategySelector) {
-		if ( strategyName == null ) {
-			return null;
-		}
-
-		Class<? extends SqmMultiTableMutationStrategy> strategyClass =
-				strategySelector.selectStrategyImplementor( SqmMultiTableMutationStrategy.class, strategyName );
-		for ( Constructor<?> declaredConstructor : strategyClass.getDeclaredConstructors() ) {
-			final Class<?>[] parameterTypes = declaredConstructor.getParameterTypes();
-			if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
-				return (Constructor<SqmMultiTableMutationStrategy>) declaredConstructor;
+		if ( strategyName != null ) {
+			final var strategyClass =
+					strategySelector.selectStrategyImplementor( SqmMultiTableMutationStrategy.class, strategyName );
+			for ( var declaredConstructor : strategyClass.getDeclaredConstructors() ) {
+				final var parameterTypes = declaredConstructor.getParameterTypes();
+				if ( hasStrategyConstructorSignature( parameterTypes ) ) {
+					return (Constructor<SqmMultiTableMutationStrategy>) declaredConstructor;
+				}
 			}
 		}
-
 		return null;
 	}
 
@@ -714,7 +716,7 @@ private SqmMultiTableInsertStrategy resolveSqmInsertStrategy(
 						else if ( parameterTypes.length == 0 ) {
 							emptyConstructor = constructor;
 						}
-						else if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
+						else if ( hasStrategyConstructorSignature( parameterTypes ) ) {
 							entityBasedConstructor = (Constructor<SqmMultiTableInsertStrategy>) declaredConstructor;
 						}
 					}
@@ -751,19 +753,16 @@ else if ( emptyConstructor != null ) {
 	private Constructor<SqmMultiTableInsertStrategy> resolveSqmInsertStrategyConstructor(
 			String strategyName,
 			StrategySelector strategySelector) {
-		if ( strategyName == null ) {
-			return null;
-		}
-
-		Class<? extends SqmMultiTableInsertStrategy> strategyClass =
-				strategySelector.selectStrategyImplementor( SqmMultiTableInsertStrategy.class, strategyName );
-		for ( Constructor<?> declaredConstructor : strategyClass.getDeclaredConstructors() ) {
-			final Class<?>[] parameterTypes = declaredConstructor.getParameterTypes();
-			if ( parameterTypes.length == 2 && parameterTypes[0] == EntityMappingType.class && parameterTypes[1] == RuntimeModelCreationContext.class ) {
-				return (Constructor<SqmMultiTableInsertStrategy>) declaredConstructor;
+		if ( strategyName != null ) {
+			final var strategyClass =
+					strategySelector.selectStrategyImplementor( SqmMultiTableInsertStrategy.class, strategyName );
+			for ( var declaredConstructor : strategyClass.getDeclaredConstructors() ) {
+				final var parameterTypes = declaredConstructor.getParameterTypes();
+				if ( hasStrategyConstructorSignature( parameterTypes ) ) {
+					return (Constructor<SqmMultiTableInsertStrategy>) declaredConstructor;
+				}
 			}
 		}
-
 		return null;
 	}
 
@@ -844,7 +843,7 @@ private static Supplier<? extends Interceptor> interceptorSupplier(Class<? exten
 	private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(
 			Map<String,Object> configurationSettings,
 			StandardServiceRegistry serviceRegistry) {
-		final PhysicalConnectionHandlingMode specifiedHandlingMode =
+		final var specifiedHandlingMode =
 				PhysicalConnectionHandlingMode.interpret( configurationSettings.get( CONNECTION_HANDLING ) );
 		return specifiedHandlingMode != null
 				? specifiedHandlingMode
@@ -995,7 +994,8 @@ public SqmMultiTableMutationStrategy resolveCustomSqmMultiTableMutationStrategy(
 			}
 			catch (Exception e) {
 				throw new StrategySelectionException(
-						String.format( "Could not instantiate named strategy class [%s]", sqmMultiTableMutationStrategyConstructor.getDeclaringClass().getName() ),
+						String.format( "Could not instantiate named strategy class [%s]",
+								sqmMultiTableMutationStrategyConstructor.getDeclaringClass().getName() ),
 						e
 				);
 			}
@@ -1011,7 +1011,8 @@ public SqmMultiTableInsertStrategy resolveCustomSqmMultiTableInsertStrategy(Enti
 			}
 			catch (Exception e) {
 				throw new StrategySelectionException(
-						String.format( "Could not instantiate named strategy class [%s]", sqmMultiTableInsertStrategyConstructor.getDeclaringClass().getName() ),
+						String.format( "Could not instantiate named strategy class [%s]",
+								sqmMultiTableInsertStrategyConstructor.getDeclaringClass().getName() ),
 						e
 				);
 			}

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java

@@ -233,14 +233,9 @@ Property resolveMapsId() {
 		final PersistentClass persistentClass = getPropertyHolder().getPersistentClass();
 		final KeyValue identifier = persistentClass.getIdentifier();
 		try {
-			if ( identifier instanceof Component embeddedIdType ) {
-				// an @EmbeddedId
-				return embeddedIdType.getProperty( getMapsId() );
-			}
-			else {
-				// a simple id or an @IdClass
-				return persistentClass.getProperty( getMapsId() );
-			}
+			return identifier instanceof Component embeddedIdType
+					? embeddedIdType.getProperty( getMapsId() )   // an @EmbeddedId
+					: persistentClass.getProperty( getMapsId() );  // a simple id or an @IdClass
 		}
 		catch (MappingException me) {
 			throw new AnnotationException( "Identifier field '" + getMapsId()
@@ -255,10 +250,10 @@ public List<AnnotatedJoinColumn> getJoinColumns() {
 
 	@Override
 	public void addColumn(AnnotatedColumn child) {
-		if ( !( child instanceof AnnotatedJoinColumn ) ) {
+		if ( !( child instanceof AnnotatedJoinColumn joinColumn ) ) {
 			throw new AssertionFailure( "wrong sort of column" );
 		}
-		addColumn( (AnnotatedJoinColumn) child );
+		addColumn( joinColumn );
 	}
 
 	public void addColumn(AnnotatedJoinColumn child) {