HV-1831 : Update Cascade tests to use PredefinedScopeHibernateValidator with -p=predefined=true

Author: gbadner

performance/pom.xml

@@ -213,7 +213,7 @@
             <properties>
                 <validation-api.version>2.0.1.Final</validation-api.version>
                 <beanvalidation-impl.name>Hibernate Validator</beanvalidation-impl.name>
-                <beanvalidation-impl.version>6.2.0.Final</beanvalidation-impl.version>
+                <beanvalidation-impl.version>6.2.1-SNAPSHOT</beanvalidation-impl.version>
             </properties>
             <dependencies>
                 <dependency>

performance/src/main/java/org/hibernate/validator/performance/BenchmarkRunner.java

@@ -6,9 +6,21 @@
  */
 package org.hibernate.validator.performance;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Locale;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Stream;
 
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+import javax.validation.constraints.NotNull;
+import javax.validation.spi.ValidationProvider;
+
+import org.hibernate.validator.PredefinedScopeHibernateValidator;
 import org.hibernate.validator.performance.cascaded.CascadedValidation;
 import org.hibernate.validator.performance.cascaded.CascadedWithLotsOfItemsValidation;
 import org.hibernate.validator.performance.simple.SimpleValidation;
@@ -22,6 +34,7 @@
 import org.openjdk.jmh.runner.options.CommandLineOptions;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.util.Optional;
 
 /**
  * Class containing main method to run all performance tests.
@@ -31,6 +44,10 @@
  */
 public final class BenchmarkRunner {
 
+	private static String PREDEFINED_PARAMETER = "predefined";
+	private static boolean IS_PREDEFINED = false;
+	private static ValidationProvider<?> validationProvider;
+
 	private static final Stream<? extends Class<?>> DEFAULT_TEST_CLASSES = Stream.of(
 			SimpleValidation.class.getName(),
 			CascadedValidation.class.getName(),
@@ -58,10 +75,35 @@ public static void main(String[] args) throws RunnerException, CommandLineOption
 			DEFAULT_TEST_CLASSES.forEach( testClass -> builder.include( testClass.getName() ) );
 		}
 
+		IS_PREDEFINED = isPredefined( commandLineOptions );
+
 		Options opt = builder.build();
 		new Runner( opt ).run();
 	}
 
+	public static ValidatorFactory buildValidatorFactory(Set<String> constraintNames, Set<Class<?>> beanClasses) {
+		return IS_PREDEFINED
+				? Validation.byProvider( PredefinedScopeHibernateValidator.class )
+						.configure()
+						.builtinConstraints( constraintNames )
+						.initializeBeanMetaData( beanClasses )
+						.buildValidatorFactory()
+				: Validation.buildDefaultValidatorFactory();
+	}
+
+	private static boolean isPredefined(Options commandLineOptions) throws CommandLineOptionException {
+		Optional<Collection<String>> isPredefinedValues = commandLineOptions.getParameter( PREDEFINED_PARAMETER );
+		if ( isPredefinedValues.hasValue() ) {
+			if ( isPredefinedValues.get().size() == 1 ) {
+				return Boolean.parseBoolean( isPredefinedValues.get().iterator().next() );
+			}
+			else {
+				throw new CommandLineOptionException( "More than one value provided for parameter: " + PREDEFINED_PARAMETER );
+			}
+		}
+		return false;
+	}
+
 	private static Class<?> classForName(String qualifiedName) {
 		try {
 			return Class.forName( qualifiedName );

performance/src/main/java/org/hibernate/validator/performance/cascaded/CascadedValidation.java

@@ -8,6 +8,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -19,6 +20,8 @@
 import jakarta.validation.ValidatorFactory;
 import jakarta.validation.constraints.NotNull;
 
+import org.hibernate.validator.performance.BenchmarkRunner;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -42,7 +45,10 @@ public static class CascadedValidationState {
 		public volatile Person person;
 
 		public CascadedValidationState() {
-			ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+			ValidatorFactory factory = BenchmarkRunner.buildValidatorFactory(
+					Collections.singleton( NotNull.class.getName() ),
+					Collections.singleton( Person.class )
+			);
 			validator = factory.getValidator();
 
 			// TODO graphs needs to be generated and deeper

performance/src/main/java/org/hibernate/validator/performance/cascaded/CascadedWithLotsOfItemsAndMoreConstraintsValidation.java

@@ -9,18 +9,22 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Valid;
-import jakarta.validation.Validation;
 import jakarta.validation.Validator;
+import jakarta.validation.Validation;
 import jakarta.validation.ValidatorFactory;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
+import org.hibernate.validator.performance.BenchmarkRunner;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -47,7 +51,10 @@ public static class CascadedWithLotsOfItemsValidationState {
 		public volatile Shop shop;
 
 		public CascadedWithLotsOfItemsValidationState() {
-			ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+			ValidatorFactory factory = BenchmarkRunner.buildValidatorFactory(
+					new HashSet<>( Arrays.asList( NotNull.class.getName(), Size.class.getName() ) ),
+					new HashSet<>( Arrays.asList( Shop.class, Article.class ) )
+			);
 			validator = factory.getValidator();
 
 			shop = createShop();

performance/src/main/java/org/hibernate/validator/performance/cascaded/CascadedWithLotsOfItemsValidation.java

@@ -9,6 +9,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -20,6 +23,8 @@
 import jakarta.validation.ValidatorFactory;
 import jakarta.validation.constraints.NotNull;
 
+import org.hibernate.validator.performance.BenchmarkRunner;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -46,7 +51,10 @@ public static class CascadedWithLotsOfItemsValidationState {
 		public volatile Shop shop;
 
 		public CascadedWithLotsOfItemsValidationState() {
-			ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+			ValidatorFactory factory = BenchmarkRunner.buildValidatorFactory(
+					Collections.singleton( NotNull.class.getName() ),
+					new HashSet<>( Arrays.asList( Shop.class, Article.class ) )
+			);
 			validator = factory.getValidator();
 
 			shop = createShop();