HV-2035 Remove deprecated org.hibernate.validator.constraints.Email 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, 64 ),
+				new DiagnosticExpectation( Kind.ERROR, 65 ),
 				new DiagnosticExpectation( Kind.ERROR, 66 ),
 				new DiagnosticExpectation( Kind.ERROR, 67 ),
 				new DiagnosticExpectation( Kind.ERROR, 68 ),
@@ -174,10 +176,7 @@ public void hibernateValidatorProvidedCustomConstraints() {
 				new DiagnosticExpectation( Kind.ERROR, 78 ),
 				new DiagnosticExpectation( Kind.ERROR, 79 ),
 				new DiagnosticExpectation( Kind.ERROR, 80 ),
-				new DiagnosticExpectation( Kind.ERROR, 81 ),
-				new DiagnosticExpectation( Kind.ERROR, 82 ),
-				new DiagnosticExpectation( Kind.ERROR, 83 ),
-				new DiagnosticExpectation( Kind.ERROR, 84 )
+				new DiagnosticExpectation( Kind.ERROR, 81 )
 		);
 	}
 

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

@@ -10,7 +10,6 @@
 import java.util.Date;
 
 import org.hibernate.validator.constraints.CreditCardNumber;
-import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.LuhnCheck;
 import org.hibernate.validator.constraints.Mod10Check;
@@ -38,7 +37,6 @@ public class HibernateValidatorProvidedCustomConstraints {
 	 * Allowed.
 	 */
 	@CreditCardNumber
-	@Email
 	@Length
 	@LuhnCheck
 	@ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2)
@@ -64,7 +62,6 @@ public class HibernateValidatorProvidedCustomConstraints {
 	 * Not allowed.
 	 */
 	@CreditCardNumber
-	@Email
 	@Length
 	@LuhnCheck
 	@ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2)

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

@@ -55,7 +55,6 @@ enum BuiltinConstraint {
 	// Hibernate Validator specific constraints
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_CODE_POINT_LENGTH( "org.hibernate.validator.constraints.CodePointLength" ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_CURRENCY( "org.hibernate.validator.constraints.Currency" ),
-	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_EMAIL( "org.hibernate.validator.constraints.Email", Arrays.asList( JAKARTA_VALIDATION_CONSTRAINTS_PATTERN ) ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_ISBN( "org.hibernate.validator.constraints.ISBN" ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LENGTH( "org.hibernate.validator.constraints.Length" ),
 	ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LUHN_CHECK( "org.hibernate.validator.constraints.LuhnCheck" ),

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

@@ -36,7 +36,6 @@
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_CREDIT_CARD_NUMBER;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_CURRENCY;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_EAN;
-import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_EMAIL;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_ISBN;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_KOR_KORRRN;
 import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LENGTH;
@@ -762,9 +761,6 @@ protected Map<Class<? extends Annotation>, List<? extends ConstraintValidatorDes
 		if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_EAN ) ) {
 			putBuiltinConstraint( tmpConstraints, EAN.class, EANValidator.class );
 		}
-		if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_EMAIL ) ) {
-			putBuiltinConstraint( tmpConstraints, org.hibernate.validator.constraints.Email.class, org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator.class );
-		}
 		if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_ISBN ) ) {
 			putBuiltinConstraint( tmpConstraints, ISBN.class, ISBNValidator.class );
 		}

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

@@ -24,7 +24,6 @@ jakarta.validation.constraints.Size.message            = size must be between {m
 org.hibernate.validator.constraints.CreditCardNumber.message        = invalid credit card number
 org.hibernate.validator.constraints.Currency.message                = invalid currency (must be one of {value})
 org.hibernate.validator.constraints.EAN.message                     = invalid {type} barcode
-org.hibernate.validator.constraints.Email.message                   = not a well-formed email address
 org.hibernate.validator.constraints.ISBN.message                    = invalid ISBN
 org.hibernate.validator.constraints.Length.message                  = length must be between {min} and {max}
 org.hibernate.validator.constraints.CodePointLength.message         = length must be between {min} and {max}

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

@@ -17,7 +17,6 @@ jakarta.validation.constraints.Size.message        = \u064a\u062c\u0628 \u0623\u
 
 org.hibernate.validator.constraints.CreditCardNumber.message        = \u0631\u0642\u0645 \u0628\u0637\u0627\u0642\u0629 \u0627\u0644\u0627\u0626\u062a\u0645\u0627\u0646 \u063a\u064a\u0631 \u0635\u0627\u0644\u062d
 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.Email.message                   = \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u063a\u064a\u0631 \u0645\u0631\u0643\u0628 \u0628\u0634\u0643\u0644 \u062c\u064a\u062f
 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

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

@@ -24,7 +24,6 @@ jakarta.validation.constraints.Size.message            = velikost mus\u00ed le\u
 org.hibernate.validator.constraints.CreditCardNumber.message        = neplatn\u00e9 \u010d\u00edslo kreditn\u00ed karty
 org.hibernate.validator.constraints.Currency.message                = neplatn\u00e1 m\u011bna (mus\u00ed m\u00edt jednu z hodnot {value})
 org.hibernate.validator.constraints.EAN.message                     = neplatn\u00fd \u010d\u00e1rov\u00fd k\u00f3d {type}
-org.hibernate.validator.constraints.Email.message                   = mus\u00ed m\u00edt spr\u00e1vn\u011b utvo\u0159enou e-mailovou adresu
 org.hibernate.validator.constraints.ISBN.message                    = neplatn\u00e9 ISBN
 org.hibernate.validator.constraints.Length.message                  = d\u00e9lka mus\u00ed le\u017eet v rozsahu {min} a\u017e {max}
 org.hibernate.validator.constraints.CodePointLength.message         = d\u00e9lka mus\u00ed le\u017eet v rozsahu {min} a\u017e {max}

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

@@ -24,7 +24,6 @@ jakarta.validation.constraints.Size.message                          = st\u00f8r
 org.hibernate.validator.constraints.CreditCardNumber.message       = ugyldigt kreditkortnummer
 org.hibernate.validator.constraints.Currency.message               = ugyldig valuta (skal v\u00e6re en af {value})
 org.hibernate.validator.constraints.EAN.message                    = ugyldig {type} stregkode
-org.hibernate.validator.constraints.Email.message                  = ikke en velformuleret email adresse
 org.hibernate.validator.constraints.ISBN.message                   = ugyldigt ISBN
 org.hibernate.validator.constraints.Length.message                 = l\u00e6ngden skal v\u00e6re mellem {min} og {max}
 org.hibernate.validator.constraints.CodePointLength.message        = l\u00e6ngden skal v\u00e6re mellem {min} og {max}