Skip to content

Commit ae534ed

Browse files
marko-bekhtamarko-bekhta
committed
HV-2042 Remove deprecated org.hibernate.validator.constraints.ModCheck constraint
1 parent 4c7b767 commit ae534ed

31 files changed

+4
-416
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ public void hibernateValidatorProvidedCustomConstraints() {
159159
assertFalse( compilationResult );
160160
assertThatDiagnosticsMatch(
161161
diagnostics,
162+
new DiagnosticExpectation( Kind.ERROR, 57 ),
163+
new DiagnosticExpectation( Kind.ERROR, 58 ),
164+
new DiagnosticExpectation( Kind.ERROR, 59 ),
162165
new DiagnosticExpectation( Kind.ERROR, 60 ),
163166
new DiagnosticExpectation( Kind.ERROR, 61 ),
164167
new DiagnosticExpectation( Kind.ERROR, 62 ),
@@ -170,11 +173,7 @@ public void hibernateValidatorProvidedCustomConstraints() {
170173
new DiagnosticExpectation( Kind.ERROR, 68 ),
171174
new DiagnosticExpectation( Kind.ERROR, 69 ),
172175
new DiagnosticExpectation( Kind.ERROR, 70 ),
173-
new DiagnosticExpectation( Kind.ERROR, 71 ),
174-
new DiagnosticExpectation( Kind.ERROR, 72 ),
175-
new DiagnosticExpectation( Kind.ERROR, 73 ),
176-
new DiagnosticExpectation( Kind.ERROR, 74 ),
177-
new DiagnosticExpectation( Kind.ERROR, 75 )
176+
new DiagnosticExpectation( Kind.ERROR, 71 )
178177
);
179178
}
180179

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.hibernate.validator.constraints.LuhnCheck;
1515
import org.hibernate.validator.constraints.Mod10Check;
1616
import org.hibernate.validator.constraints.Mod11Check;
17-
import org.hibernate.validator.constraints.ModCheck;
1817
import org.hibernate.validator.constraints.Range;
1918
import org.hibernate.validator.constraints.ScriptAssert;
2019
import org.hibernate.validator.constraints.URL;
@@ -28,7 +27,6 @@
2827
import org.hibernate.validator.constraints.time.DurationMin;
2928

3029
@ScriptAssert(script = "some script", lang = "javascript")
31-
@SuppressWarnings("deprecation")
3230
public class HibernateValidatorProvidedCustomConstraints {
3331

3432
/**
@@ -37,7 +35,6 @@ public class HibernateValidatorProvidedCustomConstraints {
3735
@CreditCardNumber
3836
@Length
3937
@LuhnCheck
40-
@ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2)
4138
@Mod10Check
4239
@Mod11Check
4340
@Range
@@ -60,7 +57,6 @@ public class HibernateValidatorProvidedCustomConstraints {
6057
@CreditCardNumber
6158
@Length
6259
@LuhnCheck
63-
@ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2)
6460
@Mod10Check
6561
@Mod11Check
6662
@Range

‎engine/src/main/java/org/hibernate/validator/constraints/ModCheck.java‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

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

Lines changed: 0 additions & 77 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ enum BuiltinConstraint {
6262
Arrays.asList( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LUHN_CHECK ) ),
6363
ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD10_CHECK( "org.hibernate.validator.constraints.Mod10Check" ),
6464
ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD11_CHECK( "org.hibernate.validator.constraints.Mod11Check" ),
65-
ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD_CHECK( "org.hibernate.validator.constraints.ModCheck" ),
6665
ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NORMALIZED( "org.hibernate.validator.constraints.Normalized" ),
6766
ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_EAN( "org.hibernate.validator.constraints.EAN", Arrays.asList( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD10_CHECK ) ),
6867
ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PARAMETER_SCRIPT_ASSERT( "org.hibernate.validator.constraints.ParameterScriptAssert" ),

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LUHN_CHECK;
4343
import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD10_CHECK;
4444
import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD11_CHECK;
45-
import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD_CHECK;
4645
import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_NORMALIZED;
4746
import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PARAMETER_SCRIPT_ASSERT;
4847
import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PL_NIP;
@@ -113,7 +112,6 @@
113112
import org.hibernate.validator.constraints.LuhnCheck;
114113
import org.hibernate.validator.constraints.Mod10Check;
115114
import org.hibernate.validator.constraints.Mod11Check;
116-
import org.hibernate.validator.constraints.ModCheck;
117115
import org.hibernate.validator.constraints.Normalized;
118116
import org.hibernate.validator.constraints.ParameterScriptAssert;
119117
import org.hibernate.validator.constraints.Range;
@@ -334,7 +332,6 @@
334332
import org.hibernate.validator.internal.constraintvalidators.hv.LuhnCheckValidator;
335333
import org.hibernate.validator.internal.constraintvalidators.hv.Mod10CheckValidator;
336334
import org.hibernate.validator.internal.constraintvalidators.hv.Mod11CheckValidator;
337-
import org.hibernate.validator.internal.constraintvalidators.hv.ModCheckValidator;
338335
import org.hibernate.validator.internal.constraintvalidators.hv.NormalizedValidator;
339336
import org.hibernate.validator.internal.constraintvalidators.hv.ParameterScriptAssertValidator;
340337
import org.hibernate.validator.internal.constraintvalidators.hv.ScriptAssertValidator;
@@ -768,9 +765,6 @@ private ConstraintHelper(Set<BuiltinConstraint> enabledBuiltinConstraints) {
768765
if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LUHN_CHECK ) ) {
769766
putBuiltinConstraint( tmpConstraints, LuhnCheck.class, LuhnCheckValidator.class );
770767
}
771-
if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD_CHECK ) ) {
772-
putBuiltinConstraint( tmpConstraints, ModCheck.class, ModCheckValidator.class );
773-
}
774768
if ( enabledBuiltinConstraints.contains( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD10_CHECK ) ) {
775769
putBuiltinConstraint( tmpConstraints, Mod10Check.class, Mod10CheckValidator.class );
776770
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ org.hibernate.validator.constraints.CodePointLength.message = length mus
3030
org.hibernate.validator.constraints.LuhnCheck.message = the check digit for ${validatedValue} is invalid, Luhn Modulo 10 checksum failed
3131
org.hibernate.validator.constraints.Mod10Check.message = the check digit for ${validatedValue} is invalid, Modulo 10 checksum failed
3232
org.hibernate.validator.constraints.Mod11Check.message = the check digit for ${validatedValue} is invalid, Modulo 11 checksum failed
33-
org.hibernate.validator.constraints.ModCheck.message = the check digit for ${validatedValue} is invalid, {modType} checksum failed
3433
org.hibernate.validator.constraints.Normalized.message = must be normalized
3534
org.hibernate.validator.constraints.ParametersScriptAssert.message = script expression "{script}" didn't evaluate to true
3635
org.hibernate.validator.constraints.Range.message = must be between {min} and {max}

‎engine/src/main/resources/org/hibernate/validator/ValidationMessages_cs.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ org.hibernate.validator.constraints.CodePointLength.message = d\u00e9lka
3030
org.hibernate.validator.constraints.LuhnCheck.message = kontroln\u00ed \u010d\u00edslice pro ${validatedValue} je neplatn\u00e1, kontroln\u00ed sou\u010det Luhn Modulo 10 se nezda\u0159il
3131
org.hibernate.validator.constraints.Mod10Check.message = kontroln\u00ed \u010d\u00edslice pro ${validatedValue} je neplatn\u00e1, kontroln\u00ed sou\u010det Modulo 10 se nezda\u0159il
3232
org.hibernate.validator.constraints.Mod11Check.message = kontroln\u00ed \u010d\u00edslice pro ${validatedValue} je neplatn\u00e1, kontroln\u00ed sou\u010det Modulo 11 se nezda\u0159il
33-
org.hibernate.validator.constraints.ModCheck.message = kontroln\u00ed \u010d\u00edslice pro ${validatedValue} je neplatn\u00e1, kontroln\u00ed sou\u010det {modType} se nezda\u0159il
3433
org.hibernate.validator.constraints.ParametersScriptAssert.message = v\u00fdraz skriptu "{script}" se nevyhodnotil na true
3534
org.hibernate.validator.constraints.Range.message = mus\u00ed le\u017eet v rozsahu {min} a\u017e {max}
3635
org.hibernate.validator.constraints.ScriptAssert.message = v\u00fdraz skriptu "{script}" se nevyhodnotil na true

‎engine/src/main/resources/org/hibernate/validator/ValidationMessages_da.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ org.hibernate.validator.constraints.CodePointLength.message = l\u00e6ngde
3030
org.hibernate.validator.constraints.LuhnCheck.message = kontrolcifferet for ${validatedValue} er ugyldigt, Luhn Modulo 10 checksum mislykkedes
3131
org.hibernate.validator.constraints.Mod10Check.message = kontrolcifferet for ${validatedValue} er ugyldigt, Modulo 10 checksum mislykkedes
3232
org.hibernate.validator.constraints.Mod11Check.message = kontrolcifferet for ${validatedValue} er ugyldigt, Modulo 11 checksum mislykkedes
33-
org.hibernate.validator.constraints.ModCheck.message = kontrolcifferet for ${validatedValue} er ugyldigt, {modType} checksummet mislykkedes
3433
org.hibernate.validator.constraints.ParametersScriptAssert.message = script udtryk "{script}" evaluerede ikke til true
3534
org.hibernate.validator.constraints.Range.message = skal v\u00e6re mellem {min} og {max}
3635
org.hibernate.validator.constraints.ScriptAssert.message = script udtryk "{script}" evaluerede ikke til true

‎engine/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ org.hibernate.validator.constraints.CodePointLength.message = L\u00e4nge
3030
org.hibernate.validator.constraints.LuhnCheck.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, Luhn Modulo 10-Kontrollsumme ist fehlgeschlagen
3131
org.hibernate.validator.constraints.Mod10Check.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, Modulo 10-Kontrollsumme ist fehlgeschlagen
3232
org.hibernate.validator.constraints.Mod11Check.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, Modulo 11-Kontrollsumme ist fehlgeschlagen
33-
org.hibernate.validator.constraints.ModCheck.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, {modType}-Kontrollsumme ist fehlgeschlagen
3433
org.hibernate.validator.constraints.ParametersScriptAssert.message = die Evaluierung des Scriptausdrucks "{script}" ergab nicht true
3534
org.hibernate.validator.constraints.Range.message = muss zwischen {min} und {max} sein
3635
org.hibernate.validator.constraints.ScriptAssert.message = die Evaluierung des Scriptausdrucks "{script}" ergab nicht true

0 commit comments

Comments
 (0)