HV-2135 Do not create unnecessary collections copies at runtime

Signed-off-by: marko-bekhta <[email protected]>

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/engine/MessageInterpolatorContext.java

@@ -4,8 +4,6 @@
  */
 package org.hibernate.validator.internal.engine;
 
-import static org.hibernate.validator.internal.util.CollectionHelper.toImmutableMap;
-
 import java.lang.invoke.MethodHandles;
 import java.util.Map;
 
@@ -47,8 +45,8 @@ public MessageInterpolatorContext(ConstraintDescriptor<?> constraintDescriptor,
 		this.validatedValue = validatedValue;
 		this.rootBeanType = rootBeanType;
 		this.propertyPath = propertyPath;
-		this.messageParameters = toImmutableMap( messageParameters );
-		this.expressionVariables = toImmutableMap( expressionVariables );
+		this.messageParameters = messageParameters;
+		this.expressionVariables = expressionVariables;
 		this.expressionLanguageFeatureLevel = expressionLanguageFeatureLevel;
 		this.customViolation = customViolation;
 	}

engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintValidatorContextImpl.java

@@ -153,7 +153,7 @@ public final List<ConstraintViolationCreationContext> getConstraintViolationCrea
 				throw LOG.getAtLeastOneCustomMessageMustBeCreatedException();
 			}
 
-			return CollectionHelper.toImmutableList( constraintViolationCreationContexts );
+			return constraintViolationCreationContexts;
 		}
 
 		if ( constraintViolationCreationContexts == null || constraintViolationCreationContexts.size() == 0 ) {
@@ -165,7 +165,7 @@ public final List<ConstraintViolationCreationContext> getConstraintViolationCrea
 		returnedConstraintViolationCreationContexts.addAll( constraintViolationCreationContexts );
 		returnedConstraintViolationCreationContexts.add( getDefaultConstraintViolationCreationContext() );
 
-		return CollectionHelper.toImmutableList( returnedConstraintViolationCreationContexts );
+		return returnedConstraintViolationCreationContexts;
 	}
 
 	protected final MutablePath getCopyOfBasePath() {
@@ -178,8 +178,8 @@ private ConstraintViolationCreationContext getDefaultConstraintViolationCreation
 				defaultConstraintExpressionLanguageFeatureLevel,
 				false,
 				basePath,
-				messageParameters != null ? new HashMap<>( messageParameters ) : Collections.emptyMap(),
-				expressionVariables != null ? new HashMap<>( expressionVariables ) : Collections.emptyMap(),
+				messageParameters != null ? Map.copyOf( messageParameters ) : Collections.emptyMap(),
+				expressionVariables != null ? Map.copyOf( expressionVariables ) : Collections.emptyMap(),
 				dynamicPayload
 		);
 	}
@@ -214,8 +214,8 @@ public ConstraintValidatorContext addConstraintViolation() {
 							expressionLanguageFeatureLevel,
 							true,
 							propertyPath,
-							messageParameters != null ? new HashMap<>( messageParameters ) : Collections.emptyMap(),
-							expressionVariables != null ? new HashMap<>( expressionVariables ) : Collections.emptyMap(),
+							messageParameters != null ? Map.copyOf( messageParameters ) : Collections.emptyMap(),
+							expressionVariables != null ? Map.copyOf( expressionVariables ) : Collections.emptyMap(),
 							dynamicPayload
 					)
 			);

engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintViolationCreationContext.java

@@ -4,8 +4,6 @@
  */
 package org.hibernate.validator.internal.engine.constraintvalidation;
 
-import static org.hibernate.validator.internal.util.CollectionHelper.toImmutableMap;
-
 import java.util.Map;
 
 import jakarta.validation.Path;
@@ -44,8 +42,8 @@ public ConstraintViolationCreationContext(String message,
 		this.customViolation = customViolation;
 		// at this point we make a copy of the path to avoid side effects
 		this.propertyPath = property.materialize();
-		this.messageParameters = toImmutableMap( messageParameters );
-		this.expressionVariables = toImmutableMap( expressionVariables );
+		this.messageParameters = messageParameters;
+		this.expressionVariables = expressionVariables;
 		this.dynamicPayload = dynamicPayload;
 	}
 

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/ValueExtractorResolver.java

@@ -304,10 +304,12 @@ private Set<ValueExtractorDescriptor> getRuntimeCompliantValueExtractors(Class<?
 			return valueExtractorDescriptors;
 		}
 
-		Set<ValueExtractorDescriptor> possibleValueExtractors = potentialValueExtractorDescriptors
-				.stream()
-				.filter( e -> TypeHelper.isAssignable( e.getContainerType(), runtimeType ) )
-				.collect( Collectors.toSet() );
+		Set<ValueExtractorDescriptor> possibleValueExtractors = CollectionHelper.newHashSet( potentialValueExtractorDescriptors.size() );
+		for ( ValueExtractorDescriptor descriptor : potentialValueExtractorDescriptors ) {
+			if ( TypeHelper.isAssignable( descriptor.getContainerType(), runtimeType ) ) {
+				possibleValueExtractors.add( descriptor );
+			}
+		}
 
 		valueExtractorDescriptors = getMaximallySpecificValueExtractors( possibleValueExtractors );
 

engine/src/main/java/org/hibernate/validator/internal/util/CollectionHelper.java

@@ -98,6 +98,8 @@ public static <T> Set<T> asSet(T... ts) {
 	 * <p>
 	 * <b>NOTE:</b> the resulting list does not allow {@code null} values.
 	 * Attempt to convert a list with {@code null}s will result in an exception!
+	 * <b>NOTE:</b> do <b>NOT</b> use this util method at "runtime" as results
+	 * in creating unnecessary copies of arrays!
 	 *
 	 * @param list the list to convert.
 	 * @return the converted list.
@@ -112,6 +114,8 @@ public static <T> List<T> toImmutableList(List<? extends T> list) {
 	 * <p>
 	 * <b>NOTE:</b> the resulting set does not allow {@code null} values.
 	 * Attempt to convert a set with {@code null}s will result in an exception!
+	 * <b>NOTE:</b> do <b>NOT</b> use this util method at "runtime" as results
+	 * in creating unnecessary copies of arrays!
 	 *
 	 * @param set the set to convert.
 	 * @return the converted set.
@@ -126,6 +130,8 @@ public static <T> Set<T> toImmutableSet(Set<? extends T> set) {
 	 * <p>
 	 * <b>NOTE:</b> the resulting map does not allow {@code null} keys and values .
 	 * Attempt to convert a map with {@code null}s (either as key or a value) will result in an exception!
+	 * <b>NOTE:</b> do <b>NOT</b> use this util method at "runtime" as results
+	 * in creating unnecessary copies of arrays!
 	 *
 	 * @param map the map to convert.
 	 * @param <K> the type of the map keys.