Do not recreate the validator on each BeanValidationEventListener#validate call

Author: marko-bekhta

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

@@ -8,7 +8,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.hibernate.boot.internal.ClassLoaderAccessImpl;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
@@ -29,11 +28,9 @@
 
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import jakarta.validation.TraversableResolver;
 import jakarta.validation.Validator;
 import jakarta.validation.ValidatorFactory;
 
-import static jakarta.validation.Validation.buildDefaultValidatorFactory;
 import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
 
 /**
@@ -52,32 +49,17 @@ public class BeanValidationEventListener
 			BeanValidationEventListener.class.getName()
 	);
 
-	private ValidatorFactory factory;
-	private final ConcurrentHashMap<EntityPersister, Set<String>> associationsPerEntityPersister = new ConcurrentHashMap<>();
+	private HibernateTraversableResolver traversableResolver;
+	private Validator validator;
 	private GroupsPerOperation groupsPerOperation;
-	boolean initialized;
-
-	/**
-	 * Constructor used in an environment where validator factory is injected (JPA2).
-	 *
-	 * @param factory The {@code ValidatorFactory} to use to create {@code Validator} instance(s)
-	 * @param settings Configured properties
-	 */
+
 	public BeanValidationEventListener(
 			ValidatorFactory factory, Map<String,Object> settings, ClassLoaderService classLoaderService) {
-		init( factory, settings, classLoaderService );
-	}
-
-	public void initialize(Map<String,Object> settings, ClassLoaderService classLoaderService) {
-		if ( !initialized ) {
-			init( buildDefaultValidatorFactory(), settings, classLoaderService );
-		}
-	}
-
-	private void init(ValidatorFactory factory, Map<String,Object> settings, ClassLoaderService classLoaderService) {
-		this.factory = factory;
+		traversableResolver = new HibernateTraversableResolver();
+		validator = factory.usingContext()
+				.traversableResolver( traversableResolver )
+				.getValidator();
 		groupsPerOperation = GroupsPerOperation.from( settings, new ClassLoaderAccessImpl( classLoaderService ) );
-		initialized = true;
 	}
 
 	public boolean onPreInsert(PreInsertEvent event) {
@@ -129,10 +111,7 @@ private <T> void validate(
 		if ( object == null || persister.getRepresentationStrategy().getMode() != RepresentationMode.POJO ) {
 			return;
 		}
-		TraversableResolver tr = new HibernateTraversableResolver( persister, associationsPerEntityPersister, sessionFactory );
-		Validator validator = factory.usingContext()
-				.traversableResolver( tr )
-				.getValidator();
+		traversableResolver.addPersisterIfNecessary( persister, sessionFactory );
 		final Class<?>[] groups = groupsPerOperation.get( operation );
 		if ( groups.length > 0 ) {
 			final Set<ConstraintViolation<T>> constraintViolations = validator.validate( object, groups );

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

@@ -30,32 +30,29 @@
  * @author Emmanuel Bernard
  */
 public class HibernateTraversableResolver implements TraversableResolver {
-	private Set<String> associations;
+	private final ConcurrentHashMap<Class<?>, Set<String>> associationsPerEntityClass = new ConcurrentHashMap<>();
 
-	public HibernateTraversableResolver(
-			EntityPersister persister,
-			ConcurrentHashMap<EntityPersister, Set<String>> associationsPerEntityPersister,
-			SessionFactoryImplementor factory) {
-		associations = associationsPerEntityPersister.get( persister );
-		if ( associations == null ) {
-			associations = new HashSet<>();
-			addAssociationsToTheSetForAllProperties( persister.getPropertyNames(), persister.getPropertyTypes(), "", factory );
-			associationsPerEntityPersister.put( persister, associations );
+	public void addPersisterIfNecessary(EntityPersister persister, SessionFactoryImplementor factory) {
+		Class<?> javaTypeClass = persister.getEntityMappingType().getMappedJavaType().getJavaTypeClass();
+		if ( !associationsPerEntityClass.containsKey( javaTypeClass ) ) {
+			Set<String> associations = new HashSet<>();
+			addAssociationsToTheSetForAllProperties( persister.getPropertyNames(), persister.getPropertyTypes(), "", factory, associations );
+			associationsPerEntityClass.put( javaTypeClass, associations );
 		}
 	}
 
-	private void addAssociationsToTheSetForAllProperties(
-			String[] names, Type[] types, String prefix, SessionFactoryImplementor factory) {
+	private static void addAssociationsToTheSetForAllProperties(
+			String[] names, Type[] types, String prefix, SessionFactoryImplementor factory, Set<String> associations) {
 		final int length = names.length;
 		for( int index = 0 ; index < length; index++ ) {
-			addAssociationsToTheSetForOneProperty( names[index], types[index], prefix, factory );
+			addAssociationsToTheSetForOneProperty( names[index], types[index], prefix, factory, associations );
 		}
 	}
 
-	private void addAssociationsToTheSetForOneProperty(
-			String name, Type type, String prefix, SessionFactoryImplementor factory) {
+	private static void addAssociationsToTheSetForOneProperty(
+			String name, Type type, String prefix, SessionFactoryImplementor factory, Set<String> associations) {
 		if ( type instanceof CollectionType collectionType ) {
-			addAssociationsToTheSetForOneProperty( name, collectionType.getElementType( factory ), prefix, factory );
+			addAssociationsToTheSetForOneProperty( name, collectionType.getElementType( factory ), prefix, factory, associations );
 		}
 		//ToOne association
 		else if ( type instanceof EntityType || type instanceof AnyType ) {
@@ -66,7 +63,8 @@ else if ( type instanceof ComponentType componentType ) {
 					componentType.getPropertyNames(),
 					componentType.getSubtypes(),
 					( prefix.isEmpty() ? name : prefix + name ) + '.',
-					factory
+					factory,
+					associations
 			);
 		}
 	}
@@ -102,6 +100,6 @@ public boolean isCascadable(Object traversableObject,
 			Class<?> rootBeanType,
 			Path pathToTraversableObject,
 			ElementType elementType) {
-		return !associations.contains( getStringBasedPath( traversableProperty, pathToTraversableObject ) );
+		return !associationsPerEntityClass.getOrDefault( rootBeanType, Set.of() ).contains( getStringBasedPath( traversableProperty, pathToTraversableObject ) );
 	}
 }

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

@@ -152,7 +152,6 @@ private static void setupListener(ValidatorFactory validatorFactory, SessionFact
 		listenerRegistry.appendListeners( EventType.PRE_UPDATE, listener );
 		listenerRegistry.appendListeners( EventType.PRE_DELETE, listener );
 		listenerRegistry.appendListeners( EventType.PRE_UPSERT, listener );
-		listener.initialize( cfgService.getSettings(), classLoaderService );
 	}
 
 	private static boolean isConstraintBasedValidationEnabled(ActivationContext context) {