eliminate copy/pasted code from TypeSafeActivator

(though we should probably move the shared method off of BinderHelper)

Author: gavinking

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/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) {

hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java

@@ -563,10 +563,8 @@ else if ( value instanceof Component component ) {
 							value = component.getProperty( element ).getValue();
 						}
 						else if ( value instanceof ToOne toOne ) {
-							value = collector
-									.getEntityBinding( toOne.getReferencedEntityName() )
-									.getProperty( element )
-									.getValue();
+							final var entity = collector.getEntityBinding( toOne.getReferencedEntityName() );
+							value = entity.getProperty( element ).getValue();
 						}
 						else if ( value instanceof OneToMany oneToMany ) {
 							value = oneToMany.getAssociatedClass().getProperty( element ).getValue();

hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java

@@ -679,11 +679,9 @@ private Property getMappedSuperclassProperty(String propertyName, MappedSupercla
 		if ( property != null ) {
 			return property;
 		}
-		else if ( mappedSuperclass.getSuperPersistentClass() != null ) {
-			return mappedSuperclass.getSuperPersistentClass().getProperty( propertyName );
-		}
 		else {
-			return null;
+			final var superclass = mappedSuperclass.getSuperPersistentClass();
+			return superclass != null ? superclass.getProperty( propertyName ) : null;
 		}
 	}