HV-1831 experiments (6.2)

README.md

@@ -1,6 +1,6 @@
 # Hibernate Validator
 
-*Version: 6.1.2.Final - 31-01-2020*
+*Version: 6.2.0.Final - 23-12-2020*
 
 
 ## What is it?
@@ -35,7 +35,7 @@ Logging will delegate any log requests to that provider.
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.1.2.Final</version>
+            <version>6.2.0.Final</version>
         </dependency>
 
   You also need an API and implementation of the Unified Expression Language. These dependencies must be explicitly added in an SE environment.
@@ -54,7 +54,7 @@ extension by adding the following dependency:
         <dependency>
            <groupId>org.hibernate.validator</groupId>
            <artifactId>hibernate-validator-cdi</artifactId>
-           <version>6.1.2.Final</version>
+           <version>6.2.0.Final</version>
         </dependency>
 
 * _hibernate-validator-annotation-processor-&lt;version&gt;.jar_ is an optional jar which can be integrated with your build

annotation-processor/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-parent</artifactId>
-        <version>6.1.3-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

annotation-processor/src/main/java/org/hibernate/validator/ap/internal/util/ConstraintHelper.java

@@ -302,9 +302,10 @@ public ConstraintHelper(Types typeUtils, AnnotationApiHelper annotationApiHelper
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.REGON_CHECK, CharSequence.class );
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.NIP_CHECK, CharSequence.class );
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.PESEL_CHECK, CharSequence.class );
+		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.INN_CHECK, CharSequence.class );
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.NOT_BLANK, CharSequence.class );
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.NOT_EMPTY, TYPES_SUPPORTED_BY_SIZE_AND_NOT_EMPTY_ANNOTATIONS );
-		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.SAFE_HTML, CharSequence.class );
+		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.NORMALIZED, CharSequence.class );
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.SCRIPT_ASSERT, Object.class );
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.UNIQUE_ELEMENTS, Collection.class );
 		registerAllowedTypesForBuiltInConstraint( HibernateValidatorTypes.URL, CharSequence.class );

annotation-processor/src/main/java/org/hibernate/validator/ap/internal/util/TypeNames.java

@@ -78,9 +78,10 @@ public static class HibernateValidatorTypes {
 		public static final String REGON_CHECK = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".pl.REGON";
 		public static final String NIP_CHECK = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".pl.NIP";
 		public static final String PESEL_CHECK = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".pl.PESEL";
+		public static final String INN_CHECK = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".ru.INN";
+		public static final String NORMALIZED = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".Normalized";
 		public static final String NOT_BLANK = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".NotBlank";
 		public static final String NOT_EMPTY = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".NotEmpty";
-		public static final String SAFE_HTML = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".SafeHtml";
 		public static final String SCRIPT_ASSERT = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".ScriptAssert";
 		public static final String UNIQUE_ELEMENTS = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".UniqueElements";
 		public static final String URL = ORG_HIBERNATE_VALIDATOR_CONSTRAINTS + ".URL";

annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java

@@ -26,6 +26,7 @@
 import org.hibernate.validator.ap.testmodel.ModelWithJava8DateTime;
 import org.hibernate.validator.ap.testmodel.ModelWithJavaMoneyTypes;
 import org.hibernate.validator.ap.testmodel.ModelWithJodaTypes;
+import org.hibernate.validator.ap.testmodel.ModelWithNormalizedConstraints;
 import org.hibernate.validator.ap.testmodel.ModelWithUniqueElementsConstraints;
 import org.hibernate.validator.ap.testmodel.ModelWithoutConstraints;
 import org.hibernate.validator.ap.testmodel.MultipleConstraintsOfSameType;
@@ -154,6 +155,8 @@ public void hibernateValidatorProvidedCustomConstraints() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
+				new DiagnosticExpectation( Kind.ERROR, 66 ),
+				new DiagnosticExpectation( Kind.ERROR, 67 ),
 				new DiagnosticExpectation( Kind.ERROR, 68 ),
 				new DiagnosticExpectation( Kind.ERROR, 69 ),
 				new DiagnosticExpectation( Kind.ERROR, 70 ),
@@ -170,10 +173,7 @@ public void hibernateValidatorProvidedCustomConstraints() {
 				new DiagnosticExpectation( Kind.ERROR, 81 ),
 				new DiagnosticExpectation( Kind.ERROR, 82 ),
 				new DiagnosticExpectation( Kind.ERROR, 83 ),
-				new DiagnosticExpectation( Kind.ERROR, 84 ),
-				new DiagnosticExpectation( Kind.ERROR, 85 ),
-				new DiagnosticExpectation( Kind.ERROR, 86 ),
-				new DiagnosticExpectation( Kind.ERROR, 87 )
+				new DiagnosticExpectation( Kind.ERROR, 84 )
 		);
 	}
 
@@ -724,6 +724,25 @@ public void codePointLengthConstraints() {
 		);
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HV-1780")
+	public void normalizedConstraints() {
+		File[] sourceFiles = new File[] {
+				compilerHelper.getSourceFile( ModelWithNormalizedConstraints.class )
+		};
+
+		boolean compilationResult =
+				compilerHelper.compile( new ConstraintValidationProcessor(), diagnostics, false, true, sourceFiles );
+
+		assertFalse( compilationResult );
+		assertThatDiagnosticsMatch(
+				diagnostics,
+				new DiagnosticExpectation( Kind.ERROR, 17 ),
+				new DiagnosticExpectation( Kind.ERROR, 20 ),
+				new DiagnosticExpectation( Kind.ERROR, 23 )
+		);
+	}
+
 	@Test
 	public void isbnConstraints() {
 		File[] sourceFiles = new File[] {

annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/ModelWithNormalizedConstraints.java

@@ -0,0 +1,28 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.ap.testmodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.hibernate.validator.constraints.Normalized;
+
+public class ModelWithNormalizedConstraints {
+
+	@Normalized
+	public Collection<String> collection;
+
+	@Normalized
+	public List<String> list;
+
+	@Normalized
+	public Set<String> set;
+
+	@Normalized
+	public String string;
+}

annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/customconstraints/HibernateValidatorProvidedCustomConstraints.java

@@ -19,7 +19,6 @@
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.constraints.Range;
-import org.hibernate.validator.constraints.SafeHtml;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.constraints.URL;
 import org.hibernate.validator.constraints.br.CNPJ;
@@ -48,7 +47,6 @@ public class HibernateValidatorProvidedCustomConstraints {
 	@NotBlank
 	@NotEmpty
 	@Range
-	@SafeHtml
 	@URL
 	@CNPJ
 	@CPF
@@ -75,7 +73,6 @@ public class HibernateValidatorProvidedCustomConstraints {
 	@NotBlank
 	@NotEmpty
 	@Range
-	@SafeHtml
 	@URL
 	@CNPJ
 	@CPF

build-config/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-parent</artifactId>
-        <version>6.1.3-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

cdi/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-parent</artifactId>
-        <version>6.1.3-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -67,8 +67,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

changelog.txt

@@ -1,6 +1,89 @@
 Hibernate Validator Changelog
 =============================
 
+6.2.0.Final (23-12-2020)
+-------------------------
+
+** Bug
+    * HV-1821 - engine     - HV-1755 introduces NPE in org.hibernate.validator.internal.engine.ValidatorFactoryImpl constructor
+
+** New Feature
+    * HV-1822 - validators - Add Russian specific validator for russian taxpayer identification number
+
+6.2.0.CR1 (07-12-2020)
+-------------------------
+
+** Improvement
+    * HV-1812 - engine             - Avoid reflection-based metadata extraction for built-in value extractors
+
+** New Feature
+    * HV-1816 - engine             - Disable Expression Language by default for custom constraint violations
+
+** Remove Feature
+    * HV-1790 - engine, validators - Remove the SafeHtml constraint
+
+** Task
+    * HV-1820 - engine             - Upgrade JBoss Logging to 3.4.1.Final
+    * HV-1819 - engine             - Upgrade Classmate to 1.5.1
+    * HV-1817 - build              - Upgrade to checkstyle 8.38
+
+6.1.6.Final (30-09-2020)
+-------------------------
+
+** Bug
+    * HV-1804 - translations - Fix Dutch translation for @Size constraint
+    * HV-1797 - validators   - Validation on classes with a bidirectional relationship cause stack overflow on 6.1.x
+    * HV-1761 - engine       - Interpolation of primitive arrays causes a ClassCastException
+
+** Improvement
+    * HV-1782 - translations - Remove trailing dot from @Max constraint German translation
+
+** New Feature
+    * HV-1780 - validators   - Add @Normalized contraint that validates if text is normalized in a given form
+
+** Task
+    * HV-1803 - tests        - Move the tests to log4j2
+    * HV-1802 - tests        - Update ByteBuddy test dependency to 1.10.16
+    * HV-1795 - build        - Remove link to JavaMoney javadoc
+
+6.1.5.Final (06-05-2020)
+-------------------------
+
+** Bug
+    * HV-1774 - engine        - Invalid parsing of EL expression can lead to invalid EL expressions considered valid
+    * HV-1772 - engine        - Building multiple ValidatorFactory instances from a single Configuration violates specification for MessageInterpolator
+    * HV-1771 - translations  - Fix DecimalMin message German translation
+
+** Improvement
+    * HV-1773 - documentation - Be more explicit about issues with EL injection and how to avoid them
+
+6.1.4.Final (17-04-2020)
+-------------------------
+
+** Bug
+    * HV-1760 - validators - @Negative*/@Positive* do not support CharSequence as documented
+
+** Improvement
+    * HV-1770 - engine     - Relax constraint consistency checking for built-in constraints
+    * HV-1769 - engine     - Only create the default TraversableResolver if none has been specified
+    * HV-1767 - engine     - Reduce the overhead of ConstraintHelper initialization in the predefined scope case
+
+6.1.3.Final (10-04-2020)
+-------------------------
+
+** Bug
+    * HV-1758 - translations - Extra dollar sign in validation messages for ModCheck
+
+** Improvement
+    * HV-1763 - engine       - Improve performances of ExecutableHelper#getSignature
+
+** New Feature
+    * HV-1755 - engine       - Introduce the notion of BeanMetaDataClassNormalizer in the standard ValidatorFactory
+
+** Task
+    * HV-1765 - integration  - Upgrade WildFly versions to 18.0.1.Final and 19.0.0.Final
+    * HV-1764 - tests        - Upgrade Jackson test dependencies to 2.10.3
+
 6.1.2.Final (31-01-2020)
 -------------------------
 

distribution/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-parent</artifactId>
-        <version>6.1.3-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -50,8 +50,8 @@
 
         <!-- Need to list out optional dependencies here again in order to include them via assembly dependency set -->
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
@@ -65,10 +65,6 @@
             <groupId>javax.money</groupId>
             <artifactId>money-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.thoughtworks.paranamer</groupId>
             <artifactId>paranamer</artifactId>
@@ -119,7 +115,7 @@
                         <link>${java.api-docs.base-url}</link>
                         <link>${javaee.api-docs.base-url}</link>
                         <link>${bv.api-docs.base-url}</link>
-                        <link>${javamoney.api-docs.base-url}</link>
+                        <!--<link>${javamoney.api-docs.base-url}</link>-->
                     </links>
                     <tags>
                         <tag>

distribution/src/main/assembly/dist.xml

@@ -42,10 +42,9 @@
         <dependencySet>
             <outputDirectory>dist/lib/optional</outputDirectory>
             <includes>
-                <include>log4j:log4j</include>
+                <include>org.apache.logging.log4j:log4j-core</include>
                 <include>joda-time:joda-time</include>
                 <include>jakarta.persistence:jakarta.persistence-api</include>
-                <include>org.jsoup:jsoup</include>
                 <include>com.thoughtworks.paranamer:paranamer</include>
             </includes>
         </dependencySet>

documentation/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-parent</artifactId>
-        <version>6.1.3-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

documentation/src/main/asciidoc/ch02.asciidoc

@@ -707,15 +707,14 @@ With one exception also these constraints apply to the field/property level, onl
 	Supported data types::: `CharSequence`
 	Hibernate metadata impact::: None
 
+`@Normalized(form=)`:: Validates that the annotated character sequence is normalized according to the given `form`.
+        Supported data types::: `CharSequence`
+        Hibernate metadata impact::: None
+
 `@Range(min=, max=)`:: Checks whether the annotated value lies between (inclusive) the specified minimum and maximum
 	Supported data types::: `BigDecimal`, `BigInteger`, `CharSequence`, `byte`, `short`, `int`, `long` and the respective wrappers of the primitive types
 	Hibernate metadata impact::: None
 
-`@SafeHtml(whitelistType= , additionalTags=, additionalTagsWithAttributes=, baseURI=)`:: Checks whether the annotated value contains potentially malicious fragments such as `<script/>`. In order to use this constraint, the http://jsoup.org/[jsoup] library must be part of the class path. With the `whitelistType` attribute a predefined whitelist type can be chosen which can be refined via `additionalTags` or `additionalTagsWithAttributes`. The former allows to add tags without any attributes, whereas the latter allows to specify tags and optionally allowed attributes as well as accepted protocols for the attributes using the annotation `@SafeHtml.Tag`.
-In addition, `baseURI` allows to specify the base URI used to resolve relative URIs.
-	Supported data types::: `CharSequence`
-	Hibernate metadata impact::: None
-
 `@ScriptAssert(lang=, script=, alias=, reportOn=)`:: Checks whether the given script can successfully be evaluated against the annotated element. In order to use this constraint, an implementation of the Java Scripting API as defined by JSR 223 ("Scripting for the Java^TM^ Platform") must be a part of the class path. The expressions to be evaluated can be written in any scripting or expression language, for which a JSR 223 compatible engine can be found in the class path. Even though this is a class-level constraint, one can use the `reportOn` attribute to report a constraint violation on a specific property rather than the whole object.
 	Supported data types::: Any type
 	Hibernate metadata impact::: None
@@ -769,6 +768,11 @@ Hibernate Validator!
 	Hibernate metadata impact::: None
 	Country::: Poland
 
+`@INN`:: Checks that the annotated character sequence represents a Russian taxpayer identification number (https://ru.wikipedia.org/wiki/%D0%98%D0%B4%D0%B5%D0%BD%D1%82%D0%B8%D1%84%D0%B8%D0%BA%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BD%D0%BE%D0%BC%D0%B5%D1%80_%D0%BD%D0%B0%D0%BB%D0%BE%D0%B3%D0%BE%D0%BF%D0%BB%D0%B0%D1%82%D0%B5%D0%BB%D1%8C%D1%89%D0%B8%D0%BA%D0%B0[INN]). Can be applied to both individual and juridical versions of INN
+	Supported data types::: `CharSequence`
+	Hibernate metadata impact::: None
+	Country::: Russia
+
 [TIP]
 ====
 In some cases neither the Jakarta Bean Validation constraints nor the custom constraints provided by

documentation/src/main/asciidoc/ch04.asciidoc

@@ -91,6 +91,19 @@ context:
 `format(String format, Object... args)` which behaves like
 `java.util.Formatter.format(String format, Object... args)`.
 
+Expression Language is very flexible and Hibernate Validator offers several feature levels
+that you can use to enable Expression Language features through the `ExpressionLanguageFeatureLevel` enum:
+
+* `NONE`: Expression Language interpolation is fully disabled.
+* `VARIABLES`: Allow interpolation of the variables injected via `addExpressionVariable()`, resources bundles and usage of the `formatter` object.
+* `BEAN_PROPERTIES`: Allow everything `VARIABLES` allows plus the interpolation of bean properties.
+* `BEAN_METHODS`: Also allow execution of bean methods. Can be considered safe for hardcoded constraint messages but not for <<section-hibernateconstraintvalidatorcontext, custom violations>>
+  where extra care is required.
+
+The default feature level for constraint messages is `BEAN_PROPERTIES`.
+
+You can define the Expression Language feature level when <<el-features, bootstrapping the `ValidatorFactory`>>.
+
 The following section provides several examples for using EL expressions in error messages.
 
 ==== Examples