HV-2036 Remove deprecated org.hibernate.validator.constraints.NotBlank constraint

Author: marko-bekhta

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

@@ -159,6 +159,8 @@ public void hibernateValidatorProvidedCustomConstraints() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
+				new DiagnosticExpectation( Kind.ERROR, 62 ),
+				new DiagnosticExpectation( Kind.ERROR, 63 ),
 				new DiagnosticExpectation( Kind.ERROR, 64 ),
 				new DiagnosticExpectation( Kind.ERROR, 65 ),
 				new DiagnosticExpectation( Kind.ERROR, 66 ),
@@ -173,10 +175,7 @@ public void hibernateValidatorProvidedCustomConstraints() {
 				new DiagnosticExpectation( Kind.ERROR, 75 ),
 				new DiagnosticExpectation( Kind.ERROR, 76 ),
 				new DiagnosticExpectation( Kind.ERROR, 77 ),
-				new DiagnosticExpectation( Kind.ERROR, 78 ),
-				new DiagnosticExpectation( Kind.ERROR, 79 ),
-				new DiagnosticExpectation( Kind.ERROR, 80 ),
-				new DiagnosticExpectation( Kind.ERROR, 81 )
+				new DiagnosticExpectation( Kind.ERROR, 78 )
 		);
 	}
 

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

@@ -15,7 +15,6 @@
 import org.hibernate.validator.constraints.Mod10Check;
 import org.hibernate.validator.constraints.Mod11Check;
 import org.hibernate.validator.constraints.ModCheck;
-import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.constraints.Range;
 import org.hibernate.validator.constraints.ScriptAssert;
@@ -42,7 +41,6 @@ public class HibernateValidatorProvidedCustomConstraints {
 	@ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2)
 	@Mod10Check
 	@Mod11Check
-	@NotBlank
 	@NotEmpty
 	@Range
 	@URL
@@ -67,7 +65,6 @@ public class HibernateValidatorProvidedCustomConstraints {
 	@ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2)
 	@Mod10Check
 	@Mod11Check
-	@NotBlank
 	@NotEmpty
 	@Range
 	@URL

engine/src/main/java/org/hibernate/validator/constraints/NotBlank.java

@@ -65,8 +65,6 @@ enum BuiltinConstraint {
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD_CHECK( "org.hibernate.validator.constraints.ModCheck" ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NORMALIZED( "org.hibernate.validator.constraints.Normalized" ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_EAN( "org.hibernate.validator.constraints.EAN", Arrays.asList( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD10_CHECK ) ),
-	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NOT_BLANK( "org.hibernate.validator.constraints.NotBlank",
-			Arrays.asList( JAKARTA_VALIDATION_CONSTRAINTS_NOT_NULL ) ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NOT_EMPTY( "org.hibernate.validator.constraints.NotEmpty",
 			Arrays.asList( JAKARTA_VALIDATION_CONSTRAINTS_NOT_NULL, JAKARTA_VALIDATION_CONSTRAINTS_SIZE ) ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PARAMETER_SCRIPT_ASSERT( "org.hibernate.validator.constraints.ParameterScriptAssert" ),

engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/NotBlankValidator.java

@@ -44,7 +44,6 @@
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD11_CHECK;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD_CHECK;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NORMALIZED;
-import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NOT_BLANK;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NOT_EMPTY;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PARAMETER_SCRIPT_ASSERT;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PL_NIP;
@@ -788,9 +787,6 @@ protected Map<Class<? extends Annotation>, List<? extends ConstraintValidatorDes
 		if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PL_NIP ) ) {
 			putBuiltinConstraint( tmpConstraints, NIP.class, NIPValidator.class );
 		}
-		if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NOT_BLANK ) ) {
-			putBuiltinConstraint( tmpConstraints, org.hibernate.validator.constraints.NotBlank.class, org.hibernate.validator.internal.constraintvalidators.hv.NotBlankValidator.class );
-		}
 		if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NOT_EMPTY ) ) {
 			putBuiltinConstraint( tmpConstraints, org.hibernate.validator.constraints.NotEmpty.class );
 		}

engine/src/main/java/org/hibernate/validator/internal/metadata/core/BuiltinConstraint.java

@@ -32,7 +32,6 @@ org.hibernate.validator.constraints.Mod10Check.message              = the check
 org.hibernate.validator.constraints.Mod11Check.message              = the check digit for ${validatedValue} is invalid, Modulo 11 checksum failed
 org.hibernate.validator.constraints.ModCheck.message                = the check digit for ${validatedValue} is invalid, {modType} checksum failed
 org.hibernate.validator.constraints.Normalized.message              = must be normalized
-org.hibernate.validator.constraints.NotBlank.message                = may not be empty
 org.hibernate.validator.constraints.NotEmpty.message                = may not be empty
 org.hibernate.validator.constraints.ParametersScriptAssert.message  = script expression "{script}" didn't evaluate to true
 org.hibernate.validator.constraints.Range.message                   = must be between {min} and {max}

engine/src/main/java/org/hibernate/validator/internal/metadata/core/ConstraintHelper.java

@@ -19,7 +19,6 @@ org.hibernate.validator.constraints.CreditCardNumber.message        = \u0631\u06
 org.hibernate.validator.constraints.EAN.message                     = \u0627\u0644\u0634\u0641\u0631\u0629 {type} \u063a\u064a\u0631 \u0635\u0627\u0644\u062d\u0629
 org.hibernate.validator.constraints.Length.message                  = \u0627\u0644\u0637\u0648\u0644 \u064a\u062c\u0628 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0628\u064a\u0646 {min} \u0648{max}
 org.hibernate.validator.constraints.CodePointLength.message         = \u0627\u0644\u0637\u0648\u0644 \u064a\u062c\u0628 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0628\u064a\u0646 {min} \u0648{max}
-org.hibernate.validator.constraints.NotBlank.message                = \u0644\u0627 \u064a\u0645\u0643\u0646 \u0623\u0646 \u062a\u0643\u0648\u0646 \u0641\u0627\u0631\u063a\u0629
 org.hibernate.validator.constraints.NotEmpty.message                = \u0644\u0627 \u064a\u0645\u0643\u0646 \u0623\u0646 \u062a\u0643\u0648\u0646 \u0641\u0627\u0631\u063a\u0629
 org.hibernate.validator.constraints.ParametersScriptAssert.message  = \u0627\u0644\u062a\u0639\u0628\u064a\u0631 \u0627\u0644\u0646\u0635\u064a "{script}" \u0644\u0645 \u064a\u062a\u0645 \u062a\u0642\u064a\u064a\u0645\u0647 \u0635\u062d\u064a\u062d\u0627
 org.hibernate.validator.constraints.Range.message                   = \u064a\u062c\u0628 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0628\u064a\u0646 {min} \u0648{max}

engine/src/main/resources/org/hibernate/validator/ValidationMessages.properties

@@ -31,7 +31,6 @@ org.hibernate.validator.constraints.LuhnCheck.message               = kontroln\u
 org.hibernate.validator.constraints.Mod10Check.message              = kontroln\u00ed \u010d\u00edslice pro ${validatedValue} je neplatn\u00e1, kontroln\u00ed sou\u010det Modulo 10 se nezda\u0159il
 org.hibernate.validator.constraints.Mod11Check.message              = kontroln\u00ed \u010d\u00edslice pro ${validatedValue} je neplatn\u00e1, kontroln\u00ed sou\u010det Modulo 11 se nezda\u0159il
 org.hibernate.validator.constraints.ModCheck.message                = kontroln\u00ed \u010d\u00edslice pro ${validatedValue} je neplatn\u00e1, kontroln\u00ed sou\u010det {modType} se nezda\u0159il
-org.hibernate.validator.constraints.NotBlank.message                = nesm\u00ed b\u00fdt pr\u00e1zdn\u00e1
 org.hibernate.validator.constraints.NotEmpty.message                = nesm\u00ed b\u00fdt pr\u00e1zdn\u00e1
 org.hibernate.validator.constraints.ParametersScriptAssert.message  = v\u00fdraz skriptu "{script}" se nevyhodnotil na true
 org.hibernate.validator.constraints.Range.message                   = mus\u00ed le\u017eet v rozsahu {min} a\u017e {max}

engine/src/main/resources/org/hibernate/validator/ValidationMessages_ar.properties

@@ -31,7 +31,6 @@ org.hibernate.validator.constraints.LuhnCheck.message              = kontrolciff
 org.hibernate.validator.constraints.Mod10Check.message             = kontrolcifferet for ${validatedValue} er ugyldigt, Modulo 10 checksum mislykkedes
 org.hibernate.validator.constraints.Mod11Check.message             = kontrolcifferet for ${validatedValue} er ugyldigt, Modulo 11 checksum mislykkedes
 org.hibernate.validator.constraints.ModCheck.message               = kontrolcifferet for ${validatedValue} er ugyldigt, {modType} checksummet mislykkedes
-org.hibernate.validator.constraints.NotBlank.message               = m\u00e5 ikke v\u00e6re tomt
 org.hibernate.validator.constraints.NotEmpty.message               = m\u00e5 ikke v\u00e6re tomt
 org.hibernate.validator.constraints.ParametersScriptAssert.message = script udtryk "{script}" evaluerede ikke til true
 org.hibernate.validator.constraints.Range.message                  = skal v\u00e6re mellem {min} og {max}