diff --git a/annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorIT.java b/annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorIT.java index 0062a418ee..195558cd9b 100644 --- a/annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorIT.java +++ b/annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorIT.java @@ -159,25 +159,21 @@ public void hibernateValidatorProvidedCustomConstraints() { assertFalse( compilationResult ); assertThatDiagnosticsMatch( diagnostics, + new DiagnosticExpectation( Kind.ERROR, 57 ), + new DiagnosticExpectation( Kind.ERROR, 58 ), + new DiagnosticExpectation( Kind.ERROR, 59 ), + new DiagnosticExpectation( Kind.ERROR, 60 ), + new DiagnosticExpectation( Kind.ERROR, 61 ), + 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 ), new DiagnosticExpectation( Kind.ERROR, 67 ), new DiagnosticExpectation( Kind.ERROR, 68 ), new DiagnosticExpectation( Kind.ERROR, 69 ), new DiagnosticExpectation( Kind.ERROR, 70 ), - new DiagnosticExpectation( Kind.ERROR, 71 ), - new DiagnosticExpectation( Kind.ERROR, 72 ), - new DiagnosticExpectation( Kind.ERROR, 73 ), - new DiagnosticExpectation( Kind.ERROR, 74 ), - 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, 82 ), - new DiagnosticExpectation( Kind.ERROR, 83 ), - new DiagnosticExpectation( Kind.ERROR, 84 ) + new DiagnosticExpectation( Kind.ERROR, 71 ) ); } diff --git a/annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/customconstraints/HibernateValidatorProvidedCustomConstraints.java b/annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/customconstraints/HibernateValidatorProvidedCustomConstraints.java index 75d3706624..fe07c595ac 100644 --- a/annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/customconstraints/HibernateValidatorProvidedCustomConstraints.java +++ b/annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/customconstraints/HibernateValidatorProvidedCustomConstraints.java @@ -10,14 +10,10 @@ 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; 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; import org.hibernate.validator.constraints.URL; @@ -31,21 +27,16 @@ import org.hibernate.validator.constraints.time.DurationMin; @ScriptAssert(script = "some script", lang = "javascript") -@SuppressWarnings("deprecation") public class HibernateValidatorProvidedCustomConstraints { /** * Allowed. */ @CreditCardNumber - @Email @Length @LuhnCheck - @ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2) @Mod10Check @Mod11Check - @NotBlank - @NotEmpty @Range @URL @CNPJ @@ -64,14 +55,10 @@ public class HibernateValidatorProvidedCustomConstraints { * Not allowed. */ @CreditCardNumber - @Email @Length @LuhnCheck - @ModCheck(modType = ModCheck.ModType.MOD10, multiplier = 2) @Mod10Check @Mod11Check - @NotBlank - @NotEmpty @Range @URL @CNPJ diff --git a/engine/src/main/java/org/hibernate/validator/BaseHibernateValidatorConfiguration.java b/engine/src/main/java/org/hibernate/validator/BaseHibernateValidatorConfiguration.java index afb19d7b25..a31400cbf0 100644 --- a/engine/src/main/java/org/hibernate/validator/BaseHibernateValidatorConfiguration.java +++ b/engine/src/main/java/org/hibernate/validator/BaseHibernateValidatorConfiguration.java @@ -76,13 +76,6 @@ public interface BaseHibernateValidatorConfiguration> beanClassesToInitialize); - /** - * @deprecated Planned for removal, use {@link BaseHibernateValidatorConfiguration#locales(Set)} instead. - */ - @Incubating - @Deprecated - PredefinedScopeHibernateValidatorConfiguration initializeLocales(Set locales); - /** * Specify whether to append the {@link #builtinConstraints(Set) built-in constraints} and {@link #initializeBeanMetaData(Set) beans to initialize} * with constraints and beans provided only through XML mapping. diff --git a/engine/src/main/java/org/hibernate/validator/cfg/context/AnnotationProcessingOptions.java b/engine/src/main/java/org/hibernate/validator/cfg/context/AnnotationProcessingOptions.java deleted file mode 100644 index 8e7b64173c..0000000000 --- a/engine/src/main/java/org/hibernate/validator/cfg/context/AnnotationProcessingOptions.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.cfg.context; - -/** - * @author Hardy Ferentschik - * @deprecated Since 6.0. Planned for removal. Use {@link AnnotationIgnoreOptions#ignoreAnnotations(boolean)} instead. - */ -@Deprecated -public interface AnnotationProcessingOptions> { - - /** - * @deprecated Since 5.2. Planned for removal. Use {@link AnnotationIgnoreOptions#ignoreAnnotations(boolean)} instead. - */ - @Deprecated - C ignoreAnnotations(); -} diff --git a/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyConstraintMappingContext.java b/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyConstraintMappingContext.java index 3def41940d..72cead508d 100644 --- a/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyConstraintMappingContext.java +++ b/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyConstraintMappingContext.java @@ -14,7 +14,6 @@ * @author Gunnar Morling * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI */ -@SuppressWarnings("deprecation") public interface PropertyConstraintMappingContext extends Constrainable, ConstraintMappingTarget, @@ -23,6 +22,5 @@ public interface PropertyConstraintMappingContext MethodTarget, ContainerElementTarget, Cascadable, - AnnotationProcessingOptions, AnnotationIgnoreOptions { } diff --git a/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyTarget.java b/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyTarget.java index 3546ce6dd0..c031dec171 100644 --- a/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyTarget.java +++ b/engine/src/main/java/org/hibernate/validator/cfg/context/PropertyTarget.java @@ -6,8 +6,6 @@ */ package org.hibernate.validator.cfg.context; -import java.lang.annotation.ElementType; - /** * Facet of a constraint mapping creational context which allows to select the bean * property to which the next operations shall apply. @@ -16,24 +14,6 @@ * @author Gunnar Morling */ public interface PropertyTarget { - /** - * Selects a property to which the next operations shall apply. - *

- * Until this method is called constraints apply on class level. After calling this method constraints - * apply on the specified property with the given access type. - *

- * A given property may only be configured once. - * - * @param property The property on which to apply the following constraints (Java Bean notation). - * @param type The access type (field/property). - * - * @return A creational context representing the selected property. - * - * @deprecated Since 6.1. Planned for removal. Use either {@link PropertyTarget#field(String)} or - * {@link PropertyTarget#getter(String)} instead. - */ - @Deprecated - PropertyConstraintMappingContext property(String property, ElementType type); /** * Selects a field to which the next operations shall apply. diff --git a/engine/src/main/java/org/hibernate/validator/cfg/context/TypeConstraintMappingContext.java b/engine/src/main/java/org/hibernate/validator/cfg/context/TypeConstraintMappingContext.java index 15f84da4c2..bb0ce4e02e 100644 --- a/engine/src/main/java/org/hibernate/validator/cfg/context/TypeConstraintMappingContext.java +++ b/engine/src/main/java/org/hibernate/validator/cfg/context/TypeConstraintMappingContext.java @@ -18,14 +18,12 @@ * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2011 SERLI * @author Gunnar Morling */ -@SuppressWarnings("deprecation") public interface TypeConstraintMappingContext extends Constrainable>, ConstraintMappingTarget, PropertyTarget, MethodTarget, ConstructorTarget, - AnnotationProcessingOptions>, AnnotationIgnoreOptions> { /** diff --git a/engine/src/main/java/org/hibernate/validator/constraints/Email.java b/engine/src/main/java/org/hibernate/validator/constraints/Email.java deleted file mode 100644 index 4062645c33..0000000000 --- a/engine/src/main/java/org/hibernate/validator/constraints/Email.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.constraints; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE_USE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.validation.Constraint; -import jakarta.validation.OverridesAttribute; -import jakarta.validation.Payload; -import jakarta.validation.ReportAsSingleViolation; -import jakarta.validation.constraints.Pattern; - -/** - * The string has to be a well-formed email address. - * - * @author Emmanuel Bernard - * @author Hardy Ferentschik - * - * @deprecated use the standard {@link jakarta.validation.constraints.Email} constraint instead - */ -@Documented -@Constraint(validatedBy = { }) -@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) -@Retention(RUNTIME) -@Repeatable(Email.List.class) -@ReportAsSingleViolation -@Pattern(regexp = "") -@Deprecated -public @interface Email { - String message() default "{org.hibernate.validator.constraints.Email.message}"; - - Class[] groups() default { }; - - Class[] payload() default { }; - - /** - * @return an additional regular expression the annotated string must match. The default is any string ('.*') - */ - @OverridesAttribute(constraint = Pattern.class, name = "regexp") - String regexp() default ".*"; - - /** - * @return used in combination with {@link #regexp()} in order to specify a regular expression option - */ - @OverridesAttribute(constraint = Pattern.class, name = "flags") - Pattern.Flag[] flags() default { }; - - /** - * Defines several {@code @Email} annotations on the same element. - */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) - @Retention(RUNTIME) - @Documented - public @interface List { - Email[] value(); - } -} diff --git a/engine/src/main/java/org/hibernate/validator/constraints/ModCheck.java b/engine/src/main/java/org/hibernate/validator/constraints/ModCheck.java deleted file mode 100644 index 530bab1546..0000000000 --- a/engine/src/main/java/org/hibernate/validator/constraints/ModCheck.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.constraints; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE_USE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.validation.Constraint; -import jakarta.validation.Payload; - -/** - * Modulo check constraint. - *

- * Allows to validate that a series of digits pass the mod 10 or mod 11 checksum algorithm. - *

- *

- * The supported type is {@code CharSequence}. {@code null} is considered valid. - *

- * - * @author George Gastaldi - * @author Hardy Ferentschik - * @deprecated As of release 5.1.0, replaced by {@link Mod10Check} and {@link Mod11Check} - */ -@Documented -@Deprecated -@Constraint(validatedBy = { }) -@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) -@Retention(RUNTIME) -@Repeatable(ModCheck.List.class) -public @interface ModCheck { - String message() default "{org.hibernate.validator.constraints.ModCheck.message}"; - - Class[] groups() default { }; - - Class[] payload() default { }; - - /** - * @return The modulus algorithm to be used - */ - ModType modType(); - - /** - * @return The multiplier to be used by the chosen mod algorithm - */ - int multiplier(); - - /** - * @return the start index (inclusive) for calculating the checksum. If not specified 0 is assumed. - */ - int startIndex() default 0; - - /** - * @return the end index (exclusive) for calculating the checksum. If not specified the whole value is considered - */ - int endIndex() default Integer.MAX_VALUE; - - /** - * @return The position of the check digit in input. Per default it is assumes that the check digit is part of the - * specified range. If set, the digit at the specified position is used as check digit. If set it the following holds - * true: {@code checkDigitPosition > 0 && (checkDigitPosition < startIndex || checkDigitPosition >= endIndex}. - */ - int checkDigitPosition() default -1; - - /** - * @return Returns {@code true} if non digit characters should be ignored, {@code false} if a non digit character - * results in a validation error. {@code startIndex} and {@code endIndex} are always only referring to digit - * characters. - */ - boolean ignoreNonDigitCharacters() default true; - - /** - * Defines several {@code @ModCheck} annotations on the same element. - */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) - @Retention(RUNTIME) - @Documented - public @interface List { - ModCheck[] value(); - } - - enum ModType { - /** - * Represents a MOD10 algorithm (Also known as Luhn algorithm) - */ - MOD10, - /** - * Represents a MOD11 algorithm. A remainder of 10 or 11 in the algorithm is mapped to the check digit 0. - */ - MOD11 - } -} diff --git a/engine/src/main/java/org/hibernate/validator/constraints/NotBlank.java b/engine/src/main/java/org/hibernate/validator/constraints/NotBlank.java deleted file mode 100644 index 251625244a..0000000000 --- a/engine/src/main/java/org/hibernate/validator/constraints/NotBlank.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.constraints; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE_USE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.validation.Constraint; -import jakarta.validation.Payload; -import jakarta.validation.ReportAsSingleViolation; -import jakarta.validation.constraints.NotNull; - -/** - * Validate that the annotated string is not {@code null} or empty. - * The difference to {@code NotEmpty} is that trailing whitespaces are getting ignored. - * - * @author Hardy Ferentschik - * - * @deprecated use the standard {@link jakarta.validation.constraints.NotBlank} constraint instead - */ -@Documented -@Constraint(validatedBy = { }) -@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) -@Retention(RUNTIME) -@ReportAsSingleViolation -@NotNull -@Repeatable(NotBlank.List.class) -@Deprecated -public @interface NotBlank { - String message() default "{org.hibernate.validator.constraints.NotBlank.message}"; - - Class[] groups() default { }; - - Class[] payload() default { }; - - /** - * Defines several {@code @NotBlank} annotations on the same element. - */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) - @Retention(RUNTIME) - @Documented - public @interface List { - NotBlank[] value(); - } -} diff --git a/engine/src/main/java/org/hibernate/validator/constraints/NotEmpty.java b/engine/src/main/java/org/hibernate/validator/constraints/NotEmpty.java deleted file mode 100644 index a8984a7910..0000000000 --- a/engine/src/main/java/org/hibernate/validator/constraints/NotEmpty.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.constraints; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE_USE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.validation.Constraint; -import jakarta.validation.Payload; -import jakarta.validation.ReportAsSingleViolation; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import jakarta.validation.constraintvalidation.SupportedValidationTarget; -import jakarta.validation.constraintvalidation.ValidationTarget; - -/** - * Asserts that the annotated string, collection, map or array is not {@code null} or empty. - * - * @author Emmanuel Bernard - * @author Hardy Ferentschik - * - * @deprecated use the standard {@link jakarta.validation.constraints.NotEmpty} constraint instead - */ -@Documented -@Constraint(validatedBy = { }) -@SupportedValidationTarget(ValidationTarget.ANNOTATED_ELEMENT) -@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) -@Retention(RUNTIME) -@Repeatable(NotEmpty.List.class) -@ReportAsSingleViolation -@NotNull -@Size(min = 1) -@Deprecated -public @interface NotEmpty { - String message() default "{org.hibernate.validator.constraints.NotEmpty.message}"; - - Class[] groups() default { }; - - Class[] payload() default { }; - - /** - * Defines several {@code @NotEmpty} annotations on the same element. - */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE }) - @Retention(RUNTIME) - @Documented - public @interface List { - NotEmpty[] value(); - } -} diff --git a/engine/src/main/java/org/hibernate/validator/internal/cfg/context/AbstractPropertyConstraintMappingContextImpl.java b/engine/src/main/java/org/hibernate/validator/internal/cfg/context/AbstractPropertyConstraintMappingContextImpl.java index 056470024c..1b4e5cc006 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/cfg/context/AbstractPropertyConstraintMappingContextImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/cfg/context/AbstractPropertyConstraintMappingContextImpl.java @@ -6,8 +6,6 @@ */ package org.hibernate.validator.internal.cfg.context; -import java.lang.annotation.ElementType; - import org.hibernate.validator.cfg.context.ConstructorConstraintMappingContext; import org.hibernate.validator.cfg.context.ContainerElementConstraintMappingContext; import org.hibernate.validator.cfg.context.MethodConstraintMappingContext; @@ -48,24 +46,12 @@ protected AbstractPropertyConstraintMappingContextImpl getThis() { return this; } - @Override - @SuppressWarnings("deprecation") - public PropertyConstraintMappingContext ignoreAnnotations() { - return ignoreAnnotations( true ); - } - @Override public PropertyConstraintMappingContext ignoreAnnotations(boolean ignoreAnnotations) { mapping.getAnnotationProcessingOptions().ignoreConstraintAnnotationsOnMember( property, ignoreAnnotations ); return this; } - @Override - @SuppressWarnings("deprecation") - public PropertyConstraintMappingContext property(String property, ElementType elementType) { - return typeContext.property( property, elementType ); - } - @Override public PropertyConstraintMappingContext field(String property) { return typeContext.field( property ); diff --git a/engine/src/main/java/org/hibernate/validator/internal/cfg/context/ContainerElementConstraintMappingContextImpl.java b/engine/src/main/java/org/hibernate/validator/internal/cfg/context/ContainerElementConstraintMappingContextImpl.java index 435ca701b0..e0d9c9e6a4 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/cfg/context/ContainerElementConstraintMappingContextImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/cfg/context/ContainerElementConstraintMappingContextImpl.java @@ -7,7 +7,6 @@ package org.hibernate.validator.internal.cfg.context; import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; import java.lang.invoke.MethodHandles; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -117,12 +116,6 @@ protected ContainerElementConstraintMappingContext getThis() { return this; } - @Override - @Deprecated - public PropertyConstraintMappingContext property(String property, ElementType elementType) { - return typeContext.property( property, elementType ); - } - @Override public PropertyConstraintMappingContext field(String property) { return typeContext.field( property ); diff --git a/engine/src/main/java/org/hibernate/validator/internal/cfg/context/TypeConstraintMappingContextImpl.java b/engine/src/main/java/org/hibernate/validator/internal/cfg/context/TypeConstraintMappingContextImpl.java index db83a7240b..9f00c514b5 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/cfg/context/TypeConstraintMappingContextImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/cfg/context/TypeConstraintMappingContextImpl.java @@ -79,12 +79,6 @@ public TypeConstraintMappingContext constraint(ConstraintDef definition return this; } - @Override - @Deprecated - public TypeConstraintMappingContext ignoreAnnotations() { - return ignoreAnnotations( true ); - } - @Override public TypeConstraintMappingContext ignoreAnnotations(boolean ignoreAnnotations) { mapping.getAnnotationProcessingOptions().ignoreClassLevelConstraintAnnotations( beanClass, ignoreAnnotations ); @@ -109,23 +103,6 @@ public TypeConstraintMappingContext defaultGroupSequenceProviderClass(Class. - */ -package org.hibernate.validator.internal.constraintvalidators.hv; - -import org.hibernate.validator.constraints.Email; -import org.hibernate.validator.internal.constraintvalidators.AbstractEmailValidator; - -/** - * Checks that a given character sequence (e.g. string) is a well-formed email address. - * - * @author Guillaume Smet - */ -@SuppressWarnings("deprecation") -public class EmailValidator extends AbstractEmailValidator { - -} diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/ModCheckValidator.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/ModCheckValidator.java deleted file mode 100644 index d8477aa6ce..0000000000 --- a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/ModCheckValidator.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.internal.constraintvalidators.hv; - -import java.util.List; - -import jakarta.validation.ConstraintValidator; - -import org.hibernate.validator.internal.util.ModUtil; - -/** - * Mod check validator for MOD10 and MOD11 algorithms - * - * http://en.wikipedia.org/wiki/Luhn_algorithm - * http://en.wikipedia.org/wiki/Check_digit - * - * @author George Gastaldi - * @author Hardy Ferentschik - * @deprecated As of release 5.1.0, replaced by {@link Mod10CheckValidator} and {@link Mod11CheckValidator} - */ -@Deprecated -public class ModCheckValidator extends ModCheckBase implements ConstraintValidator { - /** - * Multiplier used by the mod algorithms - */ - private int multiplier; - - /** - * The type of checksum algorithm - */ - private org.hibernate.validator.constraints.ModCheck.ModType modType; - - @Override - public void initialize(org.hibernate.validator.constraints.ModCheck constraintAnnotation) { - super.initialize( - constraintAnnotation.startIndex(), - constraintAnnotation.endIndex(), - constraintAnnotation.checkDigitPosition(), - constraintAnnotation.ignoreNonDigitCharacters() - ); - - this.modType = constraintAnnotation.modType(); - this.multiplier = constraintAnnotation.multiplier(); - } - - /** - * Check if the input passes the Mod10 (Luhn algorithm implementation only) or Mod11 test - * - * @param digits the digits over which to calculate the Mod10 or Mod11 checksum - * @param checkDigit the check digit - * - * @return {@code true} if the mod 10/11 result matches the check digit, {@code false} otherwise - */ - @Override - public boolean isCheckDigitValid(List digits, char checkDigit) { - int modResult = -1; - int checkValue = extractDigit( checkDigit ); - - if ( modType.equals( org.hibernate.validator.constraints.ModCheck.ModType.MOD11 ) ) { - modResult = ModUtil.calculateMod11Check( digits, multiplier ); - - if ( modResult == 10 || modResult == 11 ) { - modResult = 0; - } - } - else { - modResult = ModUtil.calculateLuhnMod10Check( digits ); - } - - return checkValue == modResult; - } - -} diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/NotBlankValidator.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/NotBlankValidator.java deleted file mode 100644 index e90d6561f6..0000000000 --- a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/NotBlankValidator.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.internal.constraintvalidators.hv; - -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; - -import org.hibernate.validator.constraints.NotBlank; - -/** - * Check that a character sequence's (e.g. string) trimmed length is not empty. - * - * @author Hardy Ferentschik - */ -@SuppressWarnings("deprecation") -public class NotBlankValidator implements ConstraintValidator { - - /** - * Checks that the trimmed string is not empty. - * - * @param charSequence the character sequence to validate - * @param constraintValidatorContext context in which the constraint is evaluated - * @return returns {@code true} if the string is {@code null} or the length of the trimmed - * {@code charSequence} is strictly superior to 0, {@code false} otherwise - */ - @Override - public boolean isValid(CharSequence charSequence, ConstraintValidatorContext constraintValidatorContext) { - if ( charSequence == null ) { - return true; - } - - return charSequence.toString().trim().length() > 0; - } -} diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/PredefinedScopeConfigurationImpl.java b/engine/src/main/java/org/hibernate/validator/internal/engine/PredefinedScopeConfigurationImpl.java index bfeae2c8a2..3f3c185bb2 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/engine/PredefinedScopeConfigurationImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/engine/PredefinedScopeConfigurationImpl.java @@ -6,10 +6,7 @@ */ package org.hibernate.validator.internal.engine; -import static org.hibernate.validator.internal.util.logging.Messages.MESSAGES; - import java.util.Collections; -import java.util.Locale; import java.util.Set; import jakarta.validation.spi.BootstrapState; @@ -18,7 +15,6 @@ import org.hibernate.validator.PredefinedScopeHibernateValidatorConfiguration; import org.hibernate.validator.internal.util.CollectionHelper; -import org.hibernate.validator.internal.util.Contracts; /** * @author Guillaume Smet @@ -64,14 +60,6 @@ public boolean isIncludeBeansAndConstraintsDefinedOnlyInXml() { return includeBeansAndConstraintsDefinedOnlyInXml; } - @Override - @Deprecated - public PredefinedScopeHibernateValidatorConfiguration initializeLocales(Set localesToInitialize) { - Contracts.assertNotNull( localesToInitialize, MESSAGES.parameterMustNotBeNull( "localesToInitialize" ) ); - locales( localesToInitialize ); - return thisAsT(); - } - @Override public PredefinedScopeHibernateValidatorConfiguration includeBeansAndConstraintsDefinedOnlyInXml(boolean include) { this.includeBeansAndConstraintsDefinedOnlyInXml = include; diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryConfigurationHelper.java b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryConfigurationHelper.java index 85cacf226f..c77b58015c 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryConfigurationHelper.java +++ b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryConfigurationHelper.java @@ -112,35 +112,19 @@ static boolean checkPropertiesForBoolean(Map properties, String * Returns a list with {@link ConstraintMappingContributor}s configured via the * {@link HibernateValidatorConfiguration#CONSTRAINT_MAPPING_CONTRIBUTORS} property. * - * Also takes into account the deprecated {@link HibernateValidatorConfiguration#CONSTRAINT_MAPPING_CONTRIBUTOR} - * property. - * * @param properties the properties used to bootstrap the factory * * @return a list with property-configured {@link ConstraintMappingContributor}s; May be empty but never {@code null} */ static List determinePropertyConfiguredConstraintMappingContributors( Map properties, ClassLoader externalClassLoader) { - @SuppressWarnings("deprecation") - String deprecatedPropertyValue = properties.get( HibernateValidatorConfiguration.CONSTRAINT_MAPPING_CONTRIBUTOR ); String propertyValue = properties.get( HibernateValidatorConfiguration.CONSTRAINT_MAPPING_CONTRIBUTORS ); - if ( StringHelper.isNullOrEmptyString( deprecatedPropertyValue ) && StringHelper.isNullOrEmptyString( propertyValue ) ) { + if ( StringHelper.isNullOrEmptyString( propertyValue ) ) { return Collections.emptyList(); } - StringBuilder assembledPropertyValue = new StringBuilder(); - if ( !StringHelper.isNullOrEmptyString( deprecatedPropertyValue ) ) { - assembledPropertyValue.append( deprecatedPropertyValue ); - } - if ( !StringHelper.isNullOrEmptyString( propertyValue ) ) { - if ( assembledPropertyValue.length() > 0 ) { - assembledPropertyValue.append( "," ); - } - assembledPropertyValue.append( propertyValue ); - } - - String[] contributorNames = assembledPropertyValue.toString().split( "," ); + String[] contributorNames = propertyValue.split( "," ); List contributors = newArrayList( contributorNames.length ); for ( String contributorName : contributorNames ) { diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/core/BuiltinConstraint.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/core/BuiltinConstraint.java index c7b420a0bd..123807f8b5 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/core/BuiltinConstraint.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/core/BuiltinConstraint.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" ), @@ -63,13 +62,8 @@ enum BuiltinConstraint { Arrays.asList( ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LUHN_CHECK ) ), ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD10_CHECK( "org.hibernate.validator.constraints.Mod10Check" ), ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD11_CHECK( "org.hibernate.validator.constraints.Mod11Check" ), - 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" ), ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_RANGE( "org.hibernate.validator.constraints.Range", Arrays.asList( JAKARTA_VALIDATION_CONSTRAINTS_MIN, JAKARTA_VALIDATION_CONSTRAINTS_MAX ) ), diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/core/ConstraintHelper.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/core/ConstraintHelper.java index 107534c68d..822a1b8b36 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/metadata/core/ConstraintHelper.java +++ b/engine/src/main/java/org/hibernate/validator/internal/metadata/core/ConstraintHelper.java @@ -36,17 +36,13 @@ 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; import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_LUHN_CHECK; import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_MOD10_CHECK; 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; import static org.hibernate.validator.internal.metadata.core.BuiltinConstraint.ORG_HIBERNATE_VALIDATOR_CONSTRAINTS_PL_PESEL; @@ -117,7 +113,6 @@ import org.hibernate.validator.constraints.LuhnCheck; import org.hibernate.validator.constraints.Mod10Check; import org.hibernate.validator.constraints.Mod11Check; -import org.hibernate.validator.constraints.ModCheck; import org.hibernate.validator.constraints.Normalized; import org.hibernate.validator.constraints.ParameterScriptAssert; import org.hibernate.validator.constraints.Range; @@ -338,7 +333,6 @@ import org.hibernate.validator.internal.constraintvalidators.hv.LuhnCheckValidator; import org.hibernate.validator.internal.constraintvalidators.hv.Mod10CheckValidator; import org.hibernate.validator.internal.constraintvalidators.hv.Mod11CheckValidator; -import org.hibernate.validator.internal.constraintvalidators.hv.ModCheckValidator; import org.hibernate.validator.internal.constraintvalidators.hv.NormalizedValidator; import org.hibernate.validator.internal.constraintvalidators.hv.ParameterScriptAssertValidator; import org.hibernate.validator.internal.constraintvalidators.hv.ScriptAssertValidator; @@ -762,9 +756,6 @@ protected Map, List, List, List. - */ -package org.hibernate.validator.parameternameprovider; - -import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.lang.reflect.Parameter; -import java.util.List; - -import jakarta.validation.ParameterNameProvider; - -/** - * @author Khalid Alqinyah - * @since 5.2 - * @deprecated since 6.0 - getting the parameter names via reflection is now enabled by default. Planned for removal. - */ -@Deprecated -public class ReflectionParameterNameProvider implements ParameterNameProvider { - - @Override - public List getParameterNames(Constructor constructor) { - return getParameterNames( constructor.getParameters() ); - } - - @Override - public List getParameterNames(Method method) { - return getParameterNames( method.getParameters() ); - } - - private List getParameterNames(Parameter[] parameters) { - List parameterNames = newArrayList(); - - for ( Parameter parameter : parameters ) { - // If '-parameters' is used at compile time, actual names will be returned. Otherwise, it will be arg0, arg1... - parameterNames.add( parameter.getName() ); - } - - return parameterNames; - } -} diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages.properties index 9e38fa576b..53dd387311 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages.properties @@ -24,17 +24,13 @@ 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} org.hibernate.validator.constraints.LuhnCheck.message = the check digit for ${validatedValue} is invalid, Luhn Modulo 10 checksum failed org.hibernate.validator.constraints.Mod10Check.message = the check digit for ${validatedValue} is invalid, Modulo 10 checksum failed 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} org.hibernate.validator.constraints.ScriptAssert.message = script expression "{script}" didn't evaluate to true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ar.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ar.properties index e2b44dcea3..5a5a52b68d 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ar.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ar.properties @@ -17,11 +17,8 @@ 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 -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} org.hibernate.validator.constraints.ScriptAssert.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 diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_cs.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_cs.properties index 9059c32232..0d1ceaf3d2 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_cs.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_cs.properties @@ -24,16 +24,12 @@ 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} 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 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} org.hibernate.validator.constraints.ScriptAssert.message = v\u00fdraz skriptu "{script}" se nevyhodnotil na true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_da.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_da.properties index a46845c892..d5e3e3d587 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_da.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_da.properties @@ -24,16 +24,12 @@ 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} org.hibernate.validator.constraints.LuhnCheck.message = kontrolcifferet for ${validatedValue} er ugyldigt, Luhn Modulo 10 checksum mislykkedes 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} org.hibernate.validator.constraints.ScriptAssert.message = script udtryk "{script}" evaluerede ikke til true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties index d4b6103c2e..499a6750ba 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = Gr\u00f6\u00dfe muss zw org.hibernate.validator.constraints.CreditCardNumber.message = ung\u00fcltige Kreditkartennummer org.hibernate.validator.constraints.Currency.message = ung\u00fcltige W\u00e4hrung (muss eine der folgenden sein: {value}) org.hibernate.validator.constraints.EAN.message = ung\u00fcltiger {type}-Barcode -org.hibernate.validator.constraints.Email.message = muss eine korrekt formatierte E-Mail-Adresse sein org.hibernate.validator.constraints.ISBN.message = ung\u00fcltige ISBN org.hibernate.validator.constraints.Length.message = L\u00e4nge muss zwischen {min} und {max} sein org.hibernate.validator.constraints.CodePointLength.message = L\u00e4nge muss zwischen {min} und {max} sein org.hibernate.validator.constraints.LuhnCheck.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, Luhn Modulo 10-Kontrollsumme ist fehlgeschlagen org.hibernate.validator.constraints.Mod10Check.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, Modulo 10-Kontrollsumme ist fehlgeschlagen org.hibernate.validator.constraints.Mod11Check.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, Modulo 11-Kontrollsumme ist fehlgeschlagen -org.hibernate.validator.constraints.ModCheck.message = die Pr\u00fcfziffer f\u00fcr ${validatedValue} ist ung\u00fcltig, {modType}-Kontrollsumme ist fehlgeschlagen -org.hibernate.validator.constraints.NotBlank.message = darf nicht leer sein -org.hibernate.validator.constraints.NotEmpty.message = darf nicht leer sein org.hibernate.validator.constraints.ParametersScriptAssert.message = die Evaluierung des Scriptausdrucks "{script}" ergab nicht true org.hibernate.validator.constraints.Range.message = muss zwischen {min} und {max} sein org.hibernate.validator.constraints.ScriptAssert.message = die Evaluierung des Scriptausdrucks "{script}" ergab nicht true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_es.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_es.properties index 6ce372ca56..ea3b12c69c 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_es.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_es.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = el tama\u00f1o debe est org.hibernate.validator.constraints.CreditCardNumber.message = n\u00famero de tarjeta de cr\u00e9dito no v\u00e1lido org.hibernate.validator.constraints.Currency.message = moneda no v\u00e1lida (debe ser una de {value}) org.hibernate.validator.constraints.EAN.message = c\u00f3digo de barras {type} no v\u00e1lido -org.hibernate.validator.constraints.Email.message = debe ser una direcci\u00f3n de correo electr\u00f3nico con formato correcto org.hibernate.validator.constraints.ISBN.message = ISBN no v\u00e1lido org.hibernate.validator.constraints.Length.message = la longitud debe estar entre {min} y {max} org.hibernate.validator.constraints.CodePointLength.message = la longitud debe estar entre {min} y {max} org.hibernate.validator.constraints.LuhnCheck.message = el d\u00edgito de comprobaci\u00f3n para ${validatedValue} no es v\u00e1lido, ha fallado la suma de comprobaci\u00f3n de Luhn Modulo 10 org.hibernate.validator.constraints.Mod10Check.message = el d\u00edgito de comprobaci\u00f3n para ${validatedValue} no es v\u00e1lido, ha fallado la suma de comprobaci\u00f3n de Modulo 10 org.hibernate.validator.constraints.Mod11Check.message = el d\u00edgito de comprobaci\u00f3n para ${validatedValue} no es v\u00e1lido, ha fallado la suma de comprobaci\u00f3n de Modulo 11 -org.hibernate.validator.constraints.ModCheck.message = el d\u00edgito de comprobaci\u00f3n para ${validatedValue} no es v\u00e1lido, ha fallado la suma de comprobaci\u00f3n {modType} -org.hibernate.validator.constraints.NotBlank.message = no debe estar vac\u00edo -org.hibernate.validator.constraints.NotEmpty.message = no debe estar vac\u00edo org.hibernate.validator.constraints.ParametersScriptAssert.message = la expresi\u00f3n de script "{script}" no se ha evaluado en verdadera org.hibernate.validator.constraints.Range.message = debe estar entre {min} y {max} org.hibernate.validator.constraints.ScriptAssert.message = la expresi\u00f3n de script "{script}" no se ha evaluado en verdadera diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fa.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fa.properties index 424e486c97..94d8ced1b5 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fa.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fa.properties @@ -24,15 +24,11 @@ jakarta.validation.constraints.Size.message = \u0633\u0627\u06CC\u063 org.hibernate.validator.constraints.CreditCardNumber.message = \u0634\u0645\u0627\u0631\u0647 \u06A9\u0627\u0631\u062A \u0627\u0639\u062A\u0628\u0627\u0631\u06CC \u062F\u0631\u0633\u062A \u0646\u0645\u06CC\u0628\u0627\u0634\u062F org.hibernate.validator.constraints.Currency.message = \u0648\u0627\u062D\u062F \u067E\u0648\u0644 \u062F\u0631\u0633\u062A \u0646\u0645\u06CC\u0628\u0627\u0634\u062F (\u0628\u0627\u06CC\u062F \u06CC\u06A9\u06CC \u0627\u0632 {value} \u0628\u0627\u0634\u062F) org.hibernate.validator.constraints.EAN.message = \u0645\u0642\u062F\u0627\u0631 \u0628\u0631\u0627\u06CC \u0628\u0627\u0631\u06A9\u062F {type} \u062F\u0631\u0633\u062A \u0646\u0645\u06CC\u0628\u0627\u0634\u062F -org.hibernate.validator.constraints.Email.message = \u0627\u06CC\u0645\u06CC\u0644 \u062F\u0631\u0633\u062A \u0646\u0645\u06CC\u0628\u0627\u0634\u062F org.hibernate.validator.constraints.Length.message = \u0637\u0648\u0644 \u0628\u0627\u06CC\u062F \u0628\u06CC\u0646 {min} \u0648 {max} \u0628\u0627\u0634\u062F org.hibernate.validator.constraints.CodePointLength.message = \u0637\u0648\u0644 \u0628\u0627\u06CC\u062F \u0628\u06CC\u0646 {min} \u0648 {max} \u0628\u0627\u0634\u062F org.hibernate.validator.constraints.LuhnCheck.message = \u0645\u0642\u062F\u0627\u0631 ${validatedValue} \u0628\u0627 Luhn Modulo 10 \u0647\u0645\u062E\u0648\u0627\u0646\u06CC \u0646\u062F\u0627\u0631\u062F org.hibernate.validator.constraints.Mod10Check.message = \u0645\u0642\u062F\u0627\u0631 ${validatedValue} \u0628\u0627 Modulo 10 \u0647\u0645\u062E\u0648\u0627\u0646\u06CC \u0646\u062F\u0627\u0631\u062F org.hibernate.validator.constraints.Mod11Check.message = \u0645\u0642\u062F\u0627\u0631 ${validatedValue} \u0628\u0627 Modulo 11 \u0647\u0645\u062E\u0648\u0627\u0646\u06CC \u0646\u062F\u0627\u0631\u062F -org.hibernate.validator.constraints.ModCheck.message = \u0645\u0642\u062F\u0627\u0631 ${validatedValue} \u0628\u0627 {modType} \u0647\u0645\u062E\u0648\u0627\u0646\u06CC \u0646\u062F\u0627\u0631\u062F -org.hibernate.validator.constraints.NotBlank.message = \u0645\u0642\u062F\u0627\u0631 \u0646\u0628\u0627\u06CC\u062F \u062E\u0627\u0644\u06CC \u0628\u0627\u0634\u062F -org.hibernate.validator.constraints.NotEmpty.message = \u0645\u0642\u062F\u0627\u0631 \u0646\u0628\u0627\u06CC\u062F \u062E\u0627\u0644\u06CC \u0628\u0627\u0634\u062F org.hibernate.validator.constraints.ParametersScriptAssert.message = \u0627\u0633\u06A9\u0631\u06CC\u067E\u062A "{script}" \u0645\u0642\u062F\u0627\u0631 \u062F\u0631\u0633\u062A \u0628\u0631\u0646\u0645\u06CC\u06AF\u0631\u062F\u0627\u0646\u062F org.hibernate.validator.constraints.Range.message = \u0645\u0642\u062F\u0627\u0631 \u0628\u0627\u06CC\u062F \u0628\u06CC\u0646 {min} \u0648 {max} \u0628\u0627\u0634\u062F org.hibernate.validator.constraints.ScriptAssert.message = \u0627\u0633\u06A9\u0631\u06CC\u067E\u062A "{script}" \u0645\u0642\u062F\u0627\u0631 \u062F\u0631\u0633\u062A \u0628\u0631\u0646\u0645\u06CC\u06AF\u0631\u062F\u0627\u0646\u062F diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties index 19ddd8509e..4a913f3d91 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = la taille doit \u00eatr org.hibernate.validator.constraints.CreditCardNumber.message = num\u00e9ro de carte de cr\u00e9dit non valide org.hibernate.validator.constraints.Currency.message = devise non valide (il doit s'agir de l'une des valeurs suivantes : {value}) org.hibernate.validator.constraints.EAN.message = code-barres {type} non valide -org.hibernate.validator.constraints.Email.message = doit \u00eatre une adresse \u00e9lectronique syntaxiquement correcte org.hibernate.validator.constraints.ISBN.message = ISBN non valide org.hibernate.validator.constraints.Length.message = la longueur doit \u00eatre comprise entre {min} et {max} org.hibernate.validator.constraints.CodePointLength.message = la longueur doit \u00eatre comprise entre {min} et {max} org.hibernate.validator.constraints.LuhnCheck.message = la cl\u00e9 de contr\u00f4le pour ${validatedValue} n'est pas valide ; la somme de contr\u00f4le de l'algorithme de Luhn (modulo 10) a \u00e9chou\u00e9 org.hibernate.validator.constraints.Mod10Check.message = la cl\u00e9 de contr\u00f4le pour ${validatedValue} n'est pas valide ; la somme de contr\u00f4le de l'algorithme modulo 10 a \u00e9chou\u00e9 org.hibernate.validator.constraints.Mod11Check.message = la cl\u00e9 de contr\u00f4le pour ${validatedValue} n'est pas valide ; la somme de contr\u00f4le de l'algorithme modulo 11 a \u00e9chou\u00e9 -org.hibernate.validator.constraints.ModCheck.message = la cl\u00e9 de contr\u00f4le pour ${validatedValue} n'est pas valide ; la somme de contr\u00f4le de l'algorithme {modType} a \u00e9chou\u00e9 -org.hibernate.validator.constraints.NotBlank.message = ne doit pas \u00eatre vide -org.hibernate.validator.constraints.NotEmpty.message = ne doit pas \u00eatre vide org.hibernate.validator.constraints.ParametersScriptAssert.message = le script "{script}" n'a pas \u00E9t\u00E9 \u00E9valu\u00E9 \u00E0 vrai org.hibernate.validator.constraints.Range.message = doit \u00eatre compris entre {min} et {max} org.hibernate.validator.constraints.ScriptAssert.message = le script "{script}" n'a pas \u00E9t\u00E9 \u00E9valu\u00E9 \u00E0 vrai diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_hu.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_hu.properties index 087748f501..35a8442fd5 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_hu.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_hu.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = a m\u00e9retnek a(z) {m org.hibernate.validator.constraints.CreditCardNumber.message = \u00e9rv\u00e9nytelen hitelk\u00e1rtyasz\u00e1m org.hibernate.validator.constraints.Currency.message = \u00e9rv\u00e9nytelen p\u00e9nznem (a k\u00f6vetkez\u0151k egyike lehet: {value}) org.hibernate.validator.constraints.EAN.message = \u00e9rv\u00e9nytelen {type} vonalk\u00f3d -org.hibernate.validator.constraints.Email.message = helyes form\u00e1tum\u00fa e-mail c\u00edmnek kell lennie org.hibernate.validator.constraints.ISBN.message = \u00e9rv\u00e9nytelen ISBN org.hibernate.validator.constraints.Length.message = a hossznak a(z) {min} \u00e9s {max} \u00e9rt\u00e9kek k\u00f6z\u00f6tt kell lennie org.hibernate.validator.constraints.CodePointLength.message = a hossznak a(z) {min} \u00e9s {max} \u00e9rt\u00e9kek k\u00f6z\u00f6tt kell lennie org.hibernate.validator.constraints.LuhnCheck.message = a(z) ${validatedValue} ellen\u0151rz\u0151 sz\u00e1mjegye \u00e9rv\u00e9nytelen, a Luhn Modulo 10 ellen\u0151rz\u0151\u00f6sszeg meghi\u00fasult org.hibernate.validator.constraints.Mod10Check.message = a(z) ${validatedValue} ellen\u0151rz\u0151 sz\u00e1mjegye \u00e9rv\u00e9nytelen, a Modulo 10 ellen\u0151rz\u0151\u00f6sszeg meghi\u00fasult org.hibernate.validator.constraints.Mod11Check.message = a(z) ${validatedValue} ellen\u0151rz\u0151 sz\u00e1mjegye \u00e9rv\u00e9nytelen, a Modulo 11 ellen\u0151rz\u0151\u00f6sszeg meghi\u00fasult -org.hibernate.validator.constraints.ModCheck.message = a(z) ${validatedValue} ellen\u0151rz\u0151 sz\u00e1mjegye \u00e9rv\u00e9nytelen, a(z) {modType} ellen\u0151rz\u0151\u00f6sszeg meghi\u00fasult -org.hibernate.validator.constraints.NotBlank.message = nem lehet \u00fcres -org.hibernate.validator.constraints.NotEmpty.message = nem lehet \u00fcres org.hibernate.validator.constraints.ParametersScriptAssert.message = a(z) "{script}" parancsf\u00e1jl kifejez\u00e9s nem true \u00e9rt\u00e9kre \u00e9rt\u00e9kel\u0151d\u00f6tt ki org.hibernate.validator.constraints.Range.message = a(z) {min} \u00e9s {max} \u00e9rt\u00e9kek k\u00f6z\u00f6tt kell lennie org.hibernate.validator.constraints.ScriptAssert.message = a(z) "{script}" parancsf\u00e1jl kifejez\u00e9s nem true \u00e9rt\u00e9kre \u00e9rt\u00e9kel\u0151d\u00f6tt ki diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_it.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_it.properties index 6b43704f8b..c19464e7c9 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_it.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_it.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = la dimensione deve esse org.hibernate.validator.constraints.CreditCardNumber.message = numero carta di credito non valido org.hibernate.validator.constraints.Currency.message = valuta non valida (deve essere una di {value}) org.hibernate.validator.constraints.EAN.message = codicie a barre {type} non valido -org.hibernate.validator.constraints.Email.message = non \u00e8 un indirizzo email nel formato corretto org.hibernate.validator.constraints.ISBN.message = ISBN non valido org.hibernate.validator.constraints.Length.message = la lunghezza deve essere compresa tra {min} e {max} org.hibernate.validator.constraints.CodePointLength.message = la lunghezza deve essere compresa tra {min} e {max} org.hibernate.validator.constraints.LuhnCheck.message = la cifra di controllo per ${validatedValue} non \u00e8 valida, checksum Luhn Modulo 10 non riuscito org.hibernate.validator.constraints.Mod10Check.message = la cifra di controllo per ${validatedValue} non \u00e8 valida, checksum Modulo 10 non riuscito org.hibernate.validator.constraints.Mod11Check.message = la cifra di controllo per ${validatedValue} non \u00e8 valida, checksum Modulo 11 non riuscito -org.hibernate.validator.constraints.ModCheck.message = la cifra di controllo per ${validatedValue} non \u00e8 valida, checksum {modType} non riuscito -org.hibernate.validator.constraints.NotBlank.message = non deve essere spazio -org.hibernate.validator.constraints.NotEmpty.message = non deve essere vuoto org.hibernate.validator.constraints.ParametersScriptAssert.message = espressione script "{script}" non valutata true org.hibernate.validator.constraints.Range.message = deve essere compresa tra {min} e {max} org.hibernate.validator.constraints.ScriptAssert.message = espressione script "{script}" non valutata true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ja.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ja.properties index d1f28df20f..e542aa631e 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ja.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ja.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = {min} \u304b\u3089 {max org.hibernate.validator.constraints.CreditCardNumber.message = \u6b63\u3057\u304f\u306a\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u306e\u756a\u53f7\u3067\u3059 org.hibernate.validator.constraints.Currency.message = \u6b63\u3057\u304f\u306a\u3044\u901a\u8ca8\u5358\u4f4d\u3067\u3059 ({value} \u306e\u4e2d\u304b\u3089\u9078\u3093\u3067\u304f\u3060\u3055\u3044) org.hibernate.validator.constraints.EAN.message = \u6b63\u3057\u304f\u306a\u3044 {type} \u30d0\u30fc\u30b3\u30fc\u30c9\u3067\u3059 -org.hibernate.validator.constraints.Email.message = \u96fb\u5b50\u30e1\u30fc\u30eb\u3068\u3057\u3066\u6b63\u3057\u3044\u5f62\u5f0f\u306b\u3057\u3066\u304f\u3060\u3055\u3044 org.hibernate.validator.constraints.ISBN.message = \u6b63\u3057\u304f\u306a\u3044 ISBN \u3067\u3059 org.hibernate.validator.constraints.Length.message = {min} \u304b\u3089 {max} \u306e\u9593\u306e\u9577\u3055\u306b\u3057\u3066\u304f\u3060\u3055\u3044 org.hibernate.validator.constraints.CodePointLength.message = {min} \u304b\u3089 {max} \u306e\u9593\u306e\u9577\u3055\u306b\u3057\u3066\u304f\u3060\u3055\u3044 org.hibernate.validator.constraints.LuhnCheck.message = ${validatedValue} \u306e\u30c1\u30a7\u30c3\u30af\u30c7\u30b8\u30c3\u30c8\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093 (Luhn \u30e2\u30c7\u30e5\u30e9\u30b910\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0) org.hibernate.validator.constraints.Mod10Check.message = ${validatedValue} \u306e\u30c1\u30a7\u30c3\u30af\u30c7\u30b8\u30c3\u30c8\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093 (\u30e2\u30c7\u30e5\u30e9\u30b910) org.hibernate.validator.constraints.Mod11Check.message = ${validatedValue} \u306e\u30c1\u30a7\u30c3\u30af\u30c7\u30b8\u30c3\u30c8\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093 (\u30e2\u30c7\u30e5\u30e9\u30b911) -org.hibernate.validator.constraints.ModCheck.message = ${validatedValue} \u306e\u30c1\u30a7\u30c3\u30af\u30c7\u30b8\u30c3\u30c8\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093 ({modType} \u306e\u30c1\u30a7\u30c3\u30af\u30b5\u30e0\u304c\u5931\u6557\u3057\u307e\u3057\u305f) -org.hibernate.validator.constraints.NotBlank.message = \u7a7a\u767d\u306f\u8a31\u53ef\u3055\u308c\u3066\u307e\u305b\u3093 -org.hibernate.validator.constraints.NotEmpty.message = \u7a7a\u8981\u7d20\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093 org.hibernate.validator.constraints.ParametersScriptAssert.message = \u6b21\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u5f0f "{script}" \u306b\u3088\u308b\u8a55\u4fa1\u7d50\u679c\u304c true \u306b\u306a\u308a\u307e\u305b\u3093\u3067\u3057\u305f org.hibernate.validator.constraints.Range.message = {min} \u304b\u3089 {max} \u306e\u9593\u306b\u3057\u3066\u304f\u3060\u3055\u3044 org.hibernate.validator.constraints.ScriptAssert.message = \u6b21\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u5f0f "{script}" \u306b\u3088\u308b\u8a55\u4fa1\u7d50\u679c\u304c true \u306b\u306a\u308a\u307e\u305b\u3093\u3067\u3057\u305f diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ko.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ko.properties index cec639c20b..d74b1c747f 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ko.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ko.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = \ud06c\uae30\uac00 {min org.hibernate.validator.constraints.CreditCardNumber.message = \uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 \uc2e0\uc6a9\uce74\ub4dc \ubc88\ud638\uc785\ub2c8\ub2e4 org.hibernate.validator.constraints.Currency.message = \uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 \ud1b5\ud654\uc785\ub2c8\ub2e4({value} \uc911 \ud558\ub098\uc5ec\uc57c \ud568) org.hibernate.validator.constraints.EAN.message = \uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 {type} \ubc14\ucf54\ub4dc\uc785\ub2c8\ub2e4 -org.hibernate.validator.constraints.Email.message = \uc62c\ubc14\ub978 \ud615\uc2dd\uc758 \uc774\uba54\uc77c \uc8fc\uc18c\uc5ec\uc57c \ud569\ub2c8\ub2e4 org.hibernate.validator.constraints.ISBN.message = \uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 ISBN\uc785\ub2c8\ub2e4 org.hibernate.validator.constraints.Length.message = \uae38\uc774\uac00 {min}\uc5d0\uc11c {max} \uc0ac\uc774\uc5ec\uc57c \ud569\ub2c8\ub2e4 org.hibernate.validator.constraints.CodePointLength.message = \uae38\uc774\uac00 {min}\uc5d0\uc11c {max} \uc0ac\uc774\uc5ec\uc57c \ud569\ub2c8\ub2e4 org.hibernate.validator.constraints.LuhnCheck.message = ${validatedValue}\uc758 \uccb4\ud06c \ub514\uc9c0\ud2b8\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Luhn Modulo 10 \uccb4\ud06c\uc12c\uc774 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4 org.hibernate.validator.constraints.Mod10Check.message = ${validatedValue}\uc758 \uccb4\ud06c \ub514\uc9c0\ud2b8\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Modulo 10 \uccb4\ud06c\uc12c\uc774 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4 org.hibernate.validator.constraints.Mod11Check.message = ${validatedValue}\uc758 \uccb4\ud06c \ub514\uc9c0\ud2b8\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Modulo 11 \uccb4\ud06c\uc12c\uc774 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4 -org.hibernate.validator.constraints.ModCheck.message = ${validatedValue}\uc758 \uccb4\ud06c \ub514\uc9c0\ud2b8\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. {modType} \uccb4\ud06c\uc12c\uc774 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4 -org.hibernate.validator.constraints.NotBlank.message = \uacf5\ubc31\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4 -org.hibernate.validator.constraints.NotEmpty.message = \ube44\uc5b4 \uc788\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4 org.hibernate.validator.constraints.ParametersScriptAssert.message = \uc2a4\ud06c\ub9bd\ud2b8 \ud45c\ud604\uc2dd "{script}"\uac00 true\ub85c \ud3c9\uac00\ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4 org.hibernate.validator.constraints.Range.message = {min}\uc5d0\uc11c {max} \uc0ac\uc774\uc5ec\uc57c \ud569\ub2c8\ub2e4 org.hibernate.validator.constraints.ScriptAssert.message = \uc2a4\ud06c\ub9bd\ud2b8 \ud45c\ud604\uc2dd "{script}"\uac00 true\ub85c \ud3c9\uac00\ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4 diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties index 8d5c6894b8..82a2e54ff0 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties @@ -15,9 +15,6 @@ jakarta.validation.constraints.Past.message = \u04E8\u043D\u0433\u04E9\u0 jakarta.validation.constraints.Pattern.message = "{regexp}"-\u0434 \u0442\u0430\u0430\u0440\u0430\u0445 \u0451\u0441\u0442\u043E\u0439 jakarta.validation.constraints.Size.message = \u0425\u044D\u043C\u0436\u044D\u044D {min}-\u0441 {max} \u0445\u043E\u043E\u0440\u043E\u043D\u0434 \u0431\u0430\u0439\u043D\u0430 -org.hibernate.validator.constraints.Email.message = \u0411\u0443\u0440\u0443\u0443 \u0438-\u043C\u044D\u0439\u043B \u0445\u0430\u044F\u0433 \u0431\u0430\u0439\u043D\u0430 org.hibernate.validator.constraints.Length.message = \u0422\u044D\u043C\u0434\u044D\u0433\u0442\u0438\u0439\u043D \u0443\u0440\u0442 {min}-\u0441 {max} \u0445\u043E\u043E\u0440\u043E\u043D\u0434 \u0431\u0430\u0439\u043D\u0430 org.hibernate.validator.constraints.CodePointLength.message = \u0422\u044D\u043C\u0434\u044D\u0433\u0442\u0438\u0439\u043D \u0443\u0440\u0442 {min}-\u0441 {max} \u0445\u043E\u043E\u0440\u043E\u043D\u0434 \u0431\u0430\u0439\u043D\u0430 -org.hibernate.validator.constraints.NotBlank.message = \u0425\u043E\u043E\u0441\u043E\u043D \u0431\u0430\u0439\u0436 \u0431\u043E\u043B\u043E\u0445\u0433\u04AF\u0439 -org.hibernate.validator.constraints.NotEmpty.message = \u0425\u043E\u043E\u0441\u043E\u043D \u0431\u0430\u0439\u0436 \u0431\u043E\u043B\u043E\u0445\u0433\u04AF\u0439 org.hibernate.validator.constraints.Range.message = \u0423\u0442\u0433\u0430 {min}-\u0441 {max} \u0445\u043E\u043E\u0440\u043E\u043D\u0434 \u0431\u0430\u0439\u043D\u0430 diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_nl.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_nl.properties index efb195598f..c2de279969 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_nl.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_nl.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = grootte moet tussen org.hibernate.validator.constraints.CreditCardNumber.message = creditcard nummer ongeldig org.hibernate.validator.constraints.Currency.message = ongeldige valuta (toegestane waarden: {value}) org.hibernate.validator.constraints.EAN.message = ongeldige barcode -org.hibernate.validator.constraints.Email.message = geen geldig e-mailadres org.hibernate.validator.constraints.ISBN.message = ongeldig ISBN org.hibernate.validator.constraints.Length.message = moet tussen {min} en {max} tekens lang zijn org.hibernate.validator.constraints.CodePointLength.message = moet tussen {min} en {max} tekens lang zijn org.hibernate.validator.constraints.LuhnCheck.message = het controlecijfer voor ${validatedValue} is ongeldig, Luhn Modulo 10 checksum mislukt org.hibernate.validator.constraints.Mod10Check.message = het controlecijfer voor ${validatedValue} is ongeldig, Modulo 10 checksum mislukt org.hibernate.validator.constraints.Mod11Check.message = het controlecijfer voor ${validatedValue} is ongeldig, Modulo 11 checksum mislukt -org.hibernate.validator.constraints.ModCheck.message = het controlecijfer voor ${validatedValue} is ongeldig, {modType} checksum mislukt -org.hibernate.validator.constraints.NotBlank.message = mag niet onbeschreven zijn -org.hibernate.validator.constraints.NotEmpty.message = mag niet leeg zijn org.hibernate.validator.constraints.ParametersScriptAssert.message = scriptexpressie "{script}" is ongeldig org.hibernate.validator.constraints.Range.message = moet tussen {min} en {max} zijn org.hibernate.validator.constraints.ScriptAssert.message = scriptexpressie "{script}" is ongeldig diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pl.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pl.properties index 54ff38c67f..58b1ad7418 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pl.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pl.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = wielko\u015b\u0107 musi org.hibernate.validator.constraints.CreditCardNumber.message = niepoprawny numer karty kredytowej org.hibernate.validator.constraints.Currency.message = niepoprawna waluta (musi by\u0107 jedn\u0105 z nast\u0119puj\u0105cych: {value}) org.hibernate.validator.constraints.EAN.message = niepoprawny kod paskowy {type} -org.hibernate.validator.constraints.Email.message = musi by\u0107 poprawnie sformatowanym adresem e-mail org.hibernate.validator.constraints.ISBN.message = niepoprawny numer ISBN org.hibernate.validator.constraints.Length.message = d\u0142ugo\u015b\u0107 musi wynosi\u0107 od {min} do {max} org.hibernate.validator.constraints.CodePointLength.message = d\u0142ugo\u015b\u0107 musi wynosi\u0107 od {min} do {max} org.hibernate.validator.constraints.LuhnCheck.message = cyfra kontrolna dla warto\u015bci ${validatedValue} jest niepoprawna, sprawdzenie sumy kontrolnej za pomoc\u0105 algorytmu Luhn Modulo 10 nie powiod\u0142o si\u0119 org.hibernate.validator.constraints.Mod10Check.message = cyfra kontrolna dla warto\u015bci ${validatedValue} jest niepoprawna, sprawdzenie sumy kontrolnej za pomoc\u0105 algorytmu Modulo 10 nie powiod\u0142o si\u0119 org.hibernate.validator.constraints.Mod11Check.message = cyfra kontrolna dla warto\u015bci ${validatedValue} jest niepoprawna, sprawdzenie sumy kontrolnej za pomoc\u0105 algorytmu Modulo 11 nie powiod\u0142o si\u0119 -org.hibernate.validator.constraints.ModCheck.message = cyfra kontrolna dla warto\u015bci ${validatedValue} jest niepoprawna, sprawdzenie sumy kontrolnej za pomoc\u0105 algorytmu {modType} nie powiod\u0142o si\u0119 -org.hibernate.validator.constraints.NotBlank.message = nie mo\u017ce by\u0107 odst\u0119pem -org.hibernate.validator.constraints.NotEmpty.message = nie mo\u017ce by\u0107 puste org.hibernate.validator.constraints.ParametersScriptAssert.message = warto\u015bciowanie wyra\u017cenia skryptu {script} nie zwr\u00f3ci\u0142o warto\u015bci true org.hibernate.validator.constraints.Range.message = musi nale\u017ce\u0107 do zakresu od {min} do {max} org.hibernate.validator.constraints.ScriptAssert.message = warto\u015bciowanie wyra\u017cenia skryptu {script} nie zwr\u00f3ci\u0142o warto\u015bci true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pt.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pt.properties index ef33f3093e..f1637fcc6e 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pt.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_pt.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = tamanho deve ser entre org.hibernate.validator.constraints.CreditCardNumber.message = n\u00famero do cart\u00e3o de cr\u00e9dito inv\u00e1lido org.hibernate.validator.constraints.Currency.message = moeda inv\u00e1lida (deve ser uma de {value}) org.hibernate.validator.constraints.EAN.message = c\u00f3digo de barras {type} inv\u00e1lido -org.hibernate.validator.constraints.Email.message = deve ser um endere\u00e7o de e-mail bem formado org.hibernate.validator.constraints.ISBN.message = ISBN inv\u00e1lido org.hibernate.validator.constraints.Length.message = o comprimento deve ser entre {min} e {max} org.hibernate.validator.constraints.CodePointLength.message = o comprimento deve ser entre {min} e {max} org.hibernate.validator.constraints.LuhnCheck.message = o d\u00edgito de verifica\u00e7\u00e3o para ${validatedValue} \u00e9 inv\u00e1lido, soma de verifica\u00e7\u00e3o Modulo 10 com falha org.hibernate.validator.constraints.Mod10Check.message = o d\u00edgito de verifica\u00e7\u00e3o para ${validatedValue} \u00e9 inv\u00e1lido, soma de verifica\u00e7\u00e3o Modulo 10 com falha org.hibernate.validator.constraints.Mod11Check.message = o d\u00edgito de verifica\u00e7\u00e3o para ${validatedValue} \u00e9 inv\u00e1lido, soma de verifica\u00e7\u00e3o Modulo 11 com falha -org.hibernate.validator.constraints.ModCheck.message = o d\u00edgito de verifica\u00e7\u00e3o para ${validatedValue} \u00e9 inv\u00e1lido, soma de verifica\u00e7\u00e3o {modType} com falha -org.hibernate.validator.constraints.NotBlank.message = n\u00e3o deve estar em branco -org.hibernate.validator.constraints.NotEmpty.message = n\u00e3o deve estar vazio org.hibernate.validator.constraints.ParametersScriptAssert.message = express\u00e3o de script "{script}" n\u00e3o avaliou para true org.hibernate.validator.constraints.Range.message = deve estar entre {min} e {max} org.hibernate.validator.constraints.ScriptAssert.message = express\u00e3o de script "{script}" n\u00e3o avaliou para true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ro.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ro.properties index 21cc483200..6198662999 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ro.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ro.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = dimensiunea trebuie s\u org.hibernate.validator.constraints.CreditCardNumber.message = num\u0103r invalid de card de credit org.hibernate.validator.constraints.Currency.message = moned\u0103 invalid\u0103 trebuie s\u0103 fie una din {value}) org.hibernate.validator.constraints.EAN.message = cod de bare {type} invalid -org.hibernate.validator.constraints.Email.message = trebuie s\u0103 fie o adres\u0103 de e-mail cu format corect org.hibernate.validator.constraints.ISBN.message = ISBN invalid org.hibernate.validator.constraints.Length.message = lungimea trebuie s\u0103 fie \u00eentre {min} \u015fi {max} org.hibernate.validator.constraints.CodePointLength.message = lungimea trebuie s\u0103 fie \u00eentre {min} \u015fi {max} org.hibernate.validator.constraints.LuhnCheck.message = cifra de verificare pentru ${validatedValue} este invalid\u0103, suma de control Luhn Modulo 10 a e\u015fuat org.hibernate.validator.constraints.Mod10Check.message = cifra de verificare pentru ${validatedValue} este invalid\u0103, suma de control Modulo 10 a e\u015fuat org.hibernate.validator.constraints.Mod11Check.message = cifra de verificare pentru ${validatedValue} este invalid\u0103, suma de control Modulo 11 a e\u015fuat -org.hibernate.validator.constraints.ModCheck.message = cifra de verificare pentru ${validatedValue} este invalid\u0103, suma de control {modType} a e\u015fuat -org.hibernate.validator.constraints.NotBlank.message = nu trebuie s\u0103 fie blanc -org.hibernate.validator.constraints.NotEmpty.message = nu trebuie s\u0103 fie gol org.hibernate.validator.constraints.ParametersScriptAssert.message = expresia de script "{script}" nu s-a evaluat la true org.hibernate.validator.constraints.Range.message = trebuie s\u0103 fie \u00eentre {min} \u015fi {max} org.hibernate.validator.constraints.ScriptAssert.message = expresia de script "{script}" nu s-a evaluat la true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ru.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ru.properties index f49985cf0e..b822d329ab 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ru.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_ru.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = \u0440\u0430\u0437\u043 org.hibernate.validator.constraints.CreditCardNumber.message = \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u043a\u0440\u0435\u0434\u0438\u0442\u043d\u043e\u0439 \u043a\u0430\u0440\u0442\u044b org.hibernate.validator.constraints.Currency.message = \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f \u0434\u0435\u043d\u0435\u0436\u043d\u0430\u044f \u0435\u0434\u0438\u043d\u0438\u0446\u0430 (\u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f: {value}) org.hibernate.validator.constraints.EAN.message = \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0448\u0442\u0440\u0438\u0445\u043e\u0432\u043e\u0439 \u043a\u043e\u0434 {type} -org.hibernate.validator.constraints.Email.message = \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u043c \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b org.hibernate.validator.constraints.ISBN.message = \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 ISBN org.hibernate.validator.constraints.Length.message = \u0434\u043b\u0438\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0441\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c \u043e\u0442 {min} \u0434\u043e {max} org.hibernate.validator.constraints.CodePointLength.message = \u0434\u043b\u0438\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0441\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c \u043e\u0442 {min} \u0434\u043e {max} org.hibernate.validator.constraints.LuhnCheck.message = \u041a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u0440\u044f\u0434 \u0434\u043b\u044f ${validatedValue} \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c, \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u043e\u0439 \u0441\u0443\u043c\u043c\u044b Luhn Modulo 10 org.hibernate.validator.constraints.Mod10Check.message = \u041a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u0440\u044f\u0434 \u0434\u043b\u044f ${validatedValue} \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c, \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u043e\u0439 \u0441\u0443\u043c\u043c\u044b Modulo 10 org.hibernate.validator.constraints.Mod11Check.message = \u041a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u0440\u044f\u0434 \u0434\u043b\u044f ${validatedValue} \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c, \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u043e\u0439 \u0441\u0443\u043c\u043c\u044b Modulo 11 -org.hibernate.validator.constraints.ModCheck.message = \u041a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u0440\u044f\u0434 \u0434\u043b\u044f ${validatedValue} \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c, \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u043e\u0439 \u0441\u0443\u043c\u043c\u044b {modType} -org.hibernate.validator.constraints.NotBlank.message = \u043d\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c -org.hibernate.validator.constraints.NotEmpty.message = \u043d\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c org.hibernate.validator.constraints.ParametersScriptAssert.message = \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0432\u044b\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044f \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0441\u0446\u0435\u043d\u0430\u0440\u0438\u044f "{script}" \u043d\u0435 \u0440\u0430\u0432\u0435\u043d true org.hibernate.validator.constraints.Range.message = \u0434\u043e\u043b\u0436\u043d\u043e \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u044c\u0441\u044f \u0432 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0435 \u043e\u0442 {min} \u0434\u043e {max} org.hibernate.validator.constraints.ScriptAssert.message = \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0432\u044b\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044f \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0441\u0446\u0435\u043d\u0430\u0440\u0438\u044f "{script}" \u043d\u0435 \u0440\u0430\u0432\u0435\u043d true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_sk.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_sk.properties index 01eec7b50d..78b94d4b08 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_sk.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_sk.properties @@ -17,15 +17,11 @@ jakarta.validation.constraints.Size.message = ve\u013ekos\u0165 mus\u00ed org.hibernate.validator.constraints.CreditCardNumber.message = neplatn\u00e9 \u010d\u00edslo kreditnej karty org.hibernate.validator.constraints.EAN.message = nespr\u00e1vny {type} \u010diarov\u00fd k\u00f3d -org.hibernate.validator.constraints.Email.message = nespr\u00e1vny form\u00e1t emailovej adresy org.hibernate.validator.constraints.Length.message = d\u013a\u017eka mus\u00ed by\u0165 medzi {min} a {max} org.hibernate.validator.constraints.CodePointLength.message = d\u013a\u017eka mus\u00ed by\u0165 medzi {min} a {max} org.hibernate.validator.constraints.LuhnCheck.message = kontroln\u00e1 \u010d\u00edslica pre ${validatedValue} nie je spr\u00e1vna, kontroln\u00fd s\u00fa\u010det Luhn Modulo 10 zlyhal org.hibernate.validator.constraints.Mod10Check.message = kontroln\u00e1 \u010d\u00edslica pre ${validatedValue} nie je spr\u00e1vna, kontroln\u00fd s\u00fa\u010det Modulo 10 zlyhal org.hibernate.validator.constraints.Mod11Check.message = kontroln\u00e1 \u010d\u00edslica pre ${validatedValue} nie je spr\u00e1vna, kontroln\u00fd s\u00fa\u010det Modulo 11 zlyhal -org.hibernate.validator.constraints.ModCheck.message = kontroln\u00e1 \u010d\u00edslica pre ${validatedValue} nie je spr\u00e1vna, kontroln\u00fd s\u00fa\u010det {modType} zlyhal -org.hibernate.validator.constraints.NotBlank.message = nem\u00f4\u017ee by\u0165 pr\u00e1zdne -org.hibernate.validator.constraints.NotEmpty.message = nem\u00f4\u017ee by\u0165 pr\u00e1zdne org.hibernate.validator.constraints.ParametersScriptAssert.message = skriptovac\u00ed v\u00fdraz "{script}" nebol vyhodnoten\u00fd na \u00e1no org.hibernate.validator.constraints.Range.message = mus\u00ed by\u0165 medzi {min} a {max} org.hibernate.validator.constraints.ScriptAssert.message = skriptovac\u00ed v\u00fdraz "{script}" nebol vyhodnoten\u00fd na \u00e1no diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties index 134c19a83b..d6d09e20e0 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties @@ -15,9 +15,6 @@ jakarta.validation.constraints.Past.message = ge\u00E7mi\u015F bir tarih jakarta.validation.constraints.Pattern.message = '{regexp}' ile e\u015Fle\u015Fmeli jakarta.validation.constraints.Size.message = boyut '{min}' ile '{max}' aras\u0131nda olmal\u0131 -org.hibernate.validator.constraints.Email.message = d\u00FCzg\u00FCn bi\u00E7imli bir e-posta adresi de\u011Fil! org.hibernate.validator.constraints.Length.message = uzunluk '{min}' ile '{max}' aras\u0131nda olmal\u0131 org.hibernate.validator.constraints.CodePointLength.message = uzunluk '{min}' ile '{max}' aras\u0131nda olmal\u0131 -org.hibernate.validator.constraints.NotBlank.message = bo\u015F de\u011Fer olamaz -org.hibernate.validator.constraints.NotEmpty.message = bo\u015F de\u011Fer olamaz org.hibernate.validator.constraints.Range.message = {min} ve {max} aras\u0131nda olmal\u0131d\u0131r! diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_uk.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_uk.properties index 0c87936ab0..51d7fcf62c 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_uk.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_uk.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = \u0440\u043e\u0437\u043 org.hibernate.validator.constraints.CreditCardNumber.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0438\u0439 \u043d\u043e\u043c\u0435\u0440 \u043a\u0440\u0435\u0434\u0438\u0442\u043d\u043e\u0457 \u043a\u0430\u0440\u0442\u0438 org.hibernate.validator.constraints.Currency.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0430 \u0432\u0430\u043b\u044e\u0442\u0430 (\u043f\u043e\u0432\u0438\u043d\u043d\u0430 \u0431\u0443\u0442\u0438 \u043e\u0434\u043d\u0456\u0454\u044e \u0456\u0437 {value}) org.hibernate.validator.constraints.EAN.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0438\u0439 \u0448\u0442\u0440\u0438\u0445\u043a\u043e\u0434 {type} -org.hibernate.validator.constraints.Email.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e \u0441\u0444\u043e\u0440\u043c\u043e\u0432\u0430\u043d\u0430 email \u0430\u0434\u0440\u0435\u0441\u0430 org.hibernate.validator.constraints.ISBN.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0438\u0439 ISBN org.hibernate.validator.constraints.Length.message = \u0434\u043e\u0432\u0436\u0438\u043d\u0430 \u043c\u0430\u0454 \u0431\u0443\u0442\u0438 \u043c\u0456\u0436 {min} \u0442\u0430 {max} org.hibernate.validator.constraints.CodePointLength.message = \u0434\u043e\u0432\u0436\u0438\u043d\u0430 \u043c\u0430\u0454 \u0431\u0443\u0442\u0438 \u043c\u0456\u0436 {min} \u0442\u0430 {max} org.hibernate.validator.constraints.LuhnCheck.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0430 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u0430 \u0446\u0438\u0444\u0440\u0430 \u0434\u043b\u044f ${validatedValue}, \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u0437\u0430 \u0430\u043b\u0433\u043e\u0440\u0438\u0442\u043c\u043e\u043c \u041b\u0443\u043d\u0430 \u0437\u0430\u043a\u0456\u043d\u0447\u0438\u043b\u0430\u0441\u044c \u0437 \u043f\u043e\u043c\u0438\u043b\u043a\u043e\u044e org.hibernate.validator.constraints.Mod10Check.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0430 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u0430 \u0446\u0438\u0444\u0440\u0430 \u0434\u043b\u044f ${validatedValue}, \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u0437\u0430 \u0430\u043b\u0433\u043e\u0440\u0438\u0442\u043c\u043e\u043c Mod10 \u0437\u0430\u043a\u0456\u043d\u0447\u0438\u043b\u0430\u0441\u044c \u0437 \u043f\u043e\u043c\u0438\u043b\u043a\u043e\u044e org.hibernate.validator.constraints.Mod11Check.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0430 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u0430 \u0446\u0438\u0444\u0440\u0430 \u0434\u043b\u044f ${validatedValue}, \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u0437\u0430 \u0430\u043b\u0433\u043e\u0440\u0438\u0442\u043c\u043e\u043c Mod11 \u0437\u0430\u043a\u0456\u043d\u0447\u0438\u043b\u0430\u0441\u044c \u0437 \u043f\u043e\u043c\u0438\u043b\u043a\u043e\u044e -org.hibernate.validator.constraints.ModCheck.message = \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0430 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044c\u043d\u0430 \u0446\u0438\u0444\u0440\u0430 \u0434\u043b\u044f ${validatedValue}, \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u0437\u0430 \u0430\u043b\u0433\u043e\u0440\u0438\u0442\u043c\u043e\u043c {modType} \u0437\u0430\u043a\u0456\u043d\u0447\u0438\u043b\u0430\u0441\u044c \u0437 \u043f\u043e\u043c\u0438\u043b\u043a\u043e\u044e -org.hibernate.validator.constraints.NotBlank.message = \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 \u043f\u0443\u0441\u0442\u0438\u043c -org.hibernate.validator.constraints.NotEmpty.message = \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c org.hibernate.validator.constraints.ParametersScriptAssert.message = \u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0432\u0438\u0439 \u0432\u0438\u0440\u0430\u0437 "{script}" \u043d\u0435 \u0454 \u0456\u0441\u0442\u0438\u043d\u043d\u0438\u043c org.hibernate.validator.constraints.Range.message = \u043c\u0430\u0454 \u0431\u0443\u0442\u0438 \u043c\u0456\u0436 {min} \u0442\u0430 {max} org.hibernate.validator.constraints.ScriptAssert.message = \u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0432\u0438\u0439 \u0432\u0438\u0440\u0430\u0437 "{script}" \u043d\u0435 \u0454 \u0456\u0441\u0442\u0438\u043d\u043d\u0438\u043c diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh.properties index 075bf5f140..217dca565a 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = \u5927\u5c0f\u5fc5\u987 org.hibernate.validator.constraints.CreditCardNumber.message = \u65e0\u6548\u4fe1\u7528\u5361\u5361\u53f7 org.hibernate.validator.constraints.Currency.message = \u65e0\u6548\u8d27\u5e01\uff08\u5fc5\u987b\u4e3a {value} \u4e4b\u4e00\uff09 org.hibernate.validator.constraints.EAN.message = \u65e0\u6548 {type} \u6761\u5f62\u7801 -org.hibernate.validator.constraints.Email.message = \u7535\u5b50\u90ae\u4ef6\u5730\u5740\u683c\u5f0f\u4e0d\u89c4\u8303 org.hibernate.validator.constraints.ISBN.message = \u65e0\u6548 ISBN org.hibernate.validator.constraints.Length.message = \u957f\u5ea6\u5fc5\u987b\u4ecb\u4e8e {min} \u4e0e {max} \u4e4b\u95f4 org.hibernate.validator.constraints.CodePointLength.message = \u957f\u5ea6\u5fc5\u987b\u4ecb\u4e8e {min} \u4e0e {max} \u4e4b\u95f4 org.hibernate.validator.constraints.LuhnCheck.message = ${validatedValue} \u7684\u6821\u9a8c\u4f4d\u65e0\u6548\uff0cLuhn Modulo 10 \u6821\u9a8c\u548c\u5931\u8d25 org.hibernate.validator.constraints.Mod10Check.message = ${validatedValue} \u7684\u6821\u9a8c\u4f4d\u65e0\u6548\uff0cModulo 10 \u6821\u9a8c\u548c\u5931\u8d25 org.hibernate.validator.constraints.Mod11Check.message = ${validatedValue} \u7684\u6821\u9a8c\u4f4d\u65e0\u6548\uff0cModulo 11 \u6821\u9a8c\u548c\u5931\u8d25 -org.hibernate.validator.constraints.ModCheck.message = ${validatedValue} \u7684\u6821\u9a8c\u4f4d\u65e0\u6548\uff0c{modType} \u6821\u9a8c\u548c\u5931\u8d25 -org.hibernate.validator.constraints.NotBlank.message = \u53ef\u80fd\u4e0d\u4e3a\u7a7a -org.hibernate.validator.constraints.NotEmpty.message = \u53ef\u80fd\u4e0d\u4e3a\u7a7a org.hibernate.validator.constraints.ParametersScriptAssert.message = \u811a\u672c\u8868\u8fbe\u5f0f "{script}" \u672a\u6c42\u503c\u4e3a true org.hibernate.validator.constraints.Range.message = \u5fc5\u987b\u4ecb\u4e8e {min} \u4e0e {max} \u4e4b\u95f4 org.hibernate.validator.constraints.ScriptAssert.message = \u811a\u672c\u8868\u8fbe\u5f0f "{script}" \u672a\u6c42\u503c\u4e3a true diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_CN.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_CN.properties index 386abccee2..316d8c8424 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_CN.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_CN.properties @@ -24,15 +24,11 @@ jakarta.validation.constraints.Size.message = \u4e2a\u6570\u5fc5\u987 org.hibernate.validator.constraints.CreditCardNumber.message = \u4e0d\u5408\u6cd5\u7684\u4fe1\u7528\u5361\u53f7\u7801 org.hibernate.validator.constraints.Currency.message = \u4e0d\u5408\u6cd5\u7684\u8d27\u5e01 (\u5fc5\u987b\u662f{value}\u5176\u4e2d\u4e4b\u4e00) org.hibernate.validator.constraints.EAN.message = \u4e0d\u5408\u6cd5\u7684{type}\u6761\u5f62\u7801 -org.hibernate.validator.constraints.Email.message = \u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740 org.hibernate.validator.constraints.Length.message = \u957f\u5ea6\u9700\u8981\u5728{min}\u548c{max}\u4e4b\u95f4 org.hibernate.validator.constraints.CodePointLength.message = \u957f\u5ea6\u9700\u8981\u5728{min}\u548c{max}\u4e4b\u95f4 org.hibernate.validator.constraints.LuhnCheck.message = ${validatedValue}\u7684\u6821\u9a8c\u7801\u4e0d\u5408\u6cd5, Luhn\u6a2110\u6821\u9a8c\u548c\u4e0d\u5339\u914d org.hibernate.validator.constraints.Mod10Check.message = ${validatedValue}\u7684\u6821\u9a8c\u7801\u4e0d\u5408\u6cd5, \u6a2110\u6821\u9a8c\u548c\u4e0d\u5339\u914d org.hibernate.validator.constraints.Mod11Check.message = ${validatedValue}\u7684\u6821\u9a8c\u7801\u4e0d\u5408\u6cd5, \u6a2111\u6821\u9a8c\u548c\u4e0d\u5339\u914d -org.hibernate.validator.constraints.ModCheck.message = ${validatedValue}\u7684\u6821\u9a8c\u7801\u4e0d\u5408\u6cd5, {modType}\u6821\u9a8c\u548c\u4e0d\u5339\u914d -org.hibernate.validator.constraints.NotBlank.message = \u4e0d\u80fd\u4e3a\u7a7a -org.hibernate.validator.constraints.NotEmpty.message = \u4e0d\u80fd\u4e3a\u7a7a org.hibernate.validator.constraints.ParametersScriptAssert.message = \u6267\u884c\u811a\u672c\u8868\u8fbe\u5f0f"{script}"\u6ca1\u6709\u8fd4\u56de\u671f\u671b\u7ed3\u679c org.hibernate.validator.constraints.Range.message = \u9700\u8981\u5728{min}\u548c{max}\u4e4b\u95f4 org.hibernate.validator.constraints.ScriptAssert.message = \u6267\u884c\u811a\u672c\u8868\u8fbe\u5f0f"{script}"\u6ca1\u6709\u8fd4\u56de\u671f\u671b\u7ed3\u679c diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_TW.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_TW.properties index 70045fc3be..9c3910cd33 100644 --- a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_TW.properties +++ b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_zh_TW.properties @@ -24,16 +24,12 @@ jakarta.validation.constraints.Size.message = \u5927\u5c0f\u5fc5\u980 org.hibernate.validator.constraints.CreditCardNumber.message = \u7121\u6548\u7684\u4fe1\u7528\u5361\u5361\u865f org.hibernate.validator.constraints.Currency.message = \u7121\u6548\u7684\u8ca8\u5e63\uff08\u5fc5\u9808\u662f {value} \u4e4b\u4e00\uff09 org.hibernate.validator.constraints.EAN.message = \u7121\u6548\u7684 {type} \u689d\u78bc -org.hibernate.validator.constraints.Email.message = \u4e0d\u662f\u5f62\u5f0f\u5b8c\u6574\u7684\u96fb\u5b50\u90f5\u4ef6\u4f4d\u5740 org.hibernate.validator.constraints.ISBN.message = \u7121\u6548\u7684 ISBN org.hibernate.validator.constraints.Length.message = \u9577\u5ea6\u5fc5\u9808\u5728 {min} \u548c {max} \u4e4b\u9593 org.hibernate.validator.constraints.CodePointLength.message = \u9577\u5ea6\u5fc5\u9808\u5728 {min} \u548c {max} \u4e4b\u9593 org.hibernate.validator.constraints.LuhnCheck.message = ${validatedValue} \u7684\u6aa2\u67e5\u78bc\u7121\u6548\uff0cLuhn \u6a21\u6578 10 \u7e3d\u548c\u6aa2\u67e5\u5931\u6557 org.hibernate.validator.constraints.Mod10Check.message = ${validatedValue} \u7684\u6aa2\u67e5\u78bc\u7121\u6548\uff0c\u6a21\u6578 10 \u7e3d\u548c\u6aa2\u67e5\u5931\u6557 org.hibernate.validator.constraints.Mod11Check.message = ${validatedValue} \u7684\u6aa2\u67e5\u78bc\u7121\u6548\uff0c\u6a21\u6578 11 \u7e3d\u548c\u6aa2\u67e5\u5931\u6557 -org.hibernate.validator.constraints.ModCheck.message = ${validatedValue} \u7684\u6aa2\u67e5\u78bc\u7121\u6548\uff0c{modType} \u7e3d\u548c\u6aa2\u67e5\u5931\u6557 -org.hibernate.validator.constraints.NotBlank.message = \u4e0d\u80fd\u662f\u7a7a\u7684 -org.hibernate.validator.constraints.NotEmpty.message = \u4e0d\u80fd\u662f\u7a7a\u7684 org.hibernate.validator.constraints.ParametersScriptAssert.message = Script \u8868\u793a\u5f0f "{script}" \u4e0d\u662f\u6c42\u503c\u70ba true org.hibernate.validator.constraints.Range.message = \u5fc5\u9808\u5728 {min} \u548c {max} \u4e4b\u9593 org.hibernate.validator.constraints.ScriptAssert.message = Script \u8868\u793a\u5f0f "{script}" \u4e0d\u662f\u6c42\u503c\u70ba true diff --git a/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingContributorConfiguredInValidationXmlTest.java b/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingContributorConfiguredInValidationXmlTest.java index 50445293c9..07f08cefc0 100644 --- a/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingContributorConfiguredInValidationXmlTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingContributorConfiguredInValidationXmlTest.java @@ -57,29 +57,6 @@ public void run() { } ); } - @Test - @TestForIssue(jiraKey = "HV-1545") - public void shouldApplyConstraintMappingsFromContributorsConfiguredInValidationXmlWithDeprecatedProperty() { - runWithCustomValidationXml( "deprecated-constraint-mapping-contributor-validation.xml", new Runnable() { - - @Override - public void run() { - Validator validator = ValidatorUtil.getValidator(); - - Set> violations = validator.validate( new Marathon() ); - assertThat( violations ).containsOnlyViolations( - violationOf( NotNull.class ).withProperty( "name" ), - violationOf( Min.class ).withProperty( "numberOfHelpers" ) - ); - - violations = validator.validate( new Runner() ); - assertThat( violations ).containsOnlyViolations( - violationOf( AssertTrue.class ).withProperty( "paidEntryFee" ) - ); - } - } ); - } - private void runWithCustomValidationXml(String validationXmlName, Runnable runnable) { new ValidationXmlTestHelper( ConstraintMappingContributorConfiguredInValidationXmlTest.class ).runWithCustomValidationXml( validationXmlName, runnable ); } diff --git a/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java b/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java index ff036cf29a..7a4dd4b126 100644 --- a/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java @@ -13,7 +13,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.lang.annotation.ElementType; import java.util.Arrays; import java.util.Calendar; import java.util.GregorianCalendar; @@ -528,13 +527,12 @@ public void testProgrammaticAndAnnotationPropertyConstraintsAddUp() { } @Test - @SuppressWarnings("deprecation") public void testDeprecatedPropertyMethodForFieldAndGetterProgrammaticConstraintDefinition() { mapping.type( Marathon.class ) - .property( "name", ElementType.METHOD ) + .getter( "name" ) .constraint( new SizeDef().min( 5 ) ) .constraint( new SizeDef().min( 10 ) ) - .property( "runners", ElementType.FIELD ) + .field( "runners" ) .constraint( new SizeDef().max( 10 ).min( 1 ) ); config.addMapping( mapping ); Validator validator = config.buildValidatorFactory().getValidator(); diff --git a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/EmailConstrainedTest.java b/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/EmailConstrainedTest.java deleted file mode 100644 index 207f87b39d..0000000000 --- a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/EmailConstrainedTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.test.constraints.annotations.hv; - -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertNoViolations; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.violationOf; - -import java.util.Set; - -import jakarta.validation.ConstraintViolation; - -import org.hibernate.validator.constraints.Email; -import org.hibernate.validator.test.constraints.annotations.AbstractConstrainedTest; - -import org.testng.annotations.Test; - -/** - * @author Marko Bekhta - */ -@SuppressWarnings("deprecation") -public class EmailConstrainedTest extends AbstractConstrainedTest { - - @Test - public void testEmail() { - Foo foo = new Foo( "foo@example.com" ); - Set> violations = validator.validate( foo ); - assertNoViolations( violations ); - } - - @Test - public void testEmailInvalid() { - Foo foo = new Foo( "foo@e@" ); - Set> violations = validator.validate( foo ); - assertThat( violations ).containsOnlyViolations( - violationOf( Email.class ) - ); - } - - private static class Foo { - - @Email - private final String email; - - public Foo(String email) { - this.email = email; - } - } -} diff --git a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/ModCheckConstrainedTest.java b/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/ModCheckConstrainedTest.java deleted file mode 100644 index 89ba3ec87e..0000000000 --- a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/ModCheckConstrainedTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.test.constraints.annotations.hv; - -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertNoViolations; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.violationOf; - -import java.util.Set; - -import jakarta.validation.ConstraintViolation; - -import org.hibernate.validator.constraints.ModCheck; -import org.hibernate.validator.test.constraints.annotations.AbstractConstrainedTest; - -import org.testng.annotations.Test; - -/** - * @author Marko Bekhta - */ -@SuppressWarnings("deprecation") -public class ModCheckConstrainedTest extends AbstractConstrainedTest { - - @Test - public void testModCheck() { - Foo foo = new Foo( "A79927398713" ); - Set> violations = validator.validate( foo ); - assertNoViolations( violations ); - } - - @Test - public void testModCheckInvalid() { - Foo foo = new Foo( "A79927398714" ); - Set> violations = validator.validate( foo ); - assertThat( violations ).containsOnlyViolations( - violationOf( ModCheck.class ) - ); - } - - private static class Foo { - - @ModCheck(multiplier = 2, modType = ModCheck.ModType.MOD10) - private final String string; - - public Foo(String string) { - this.string = string; - } - } -} diff --git a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/NotBlankConstrainedTest.java b/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/NotBlankConstrainedTest.java deleted file mode 100644 index e565c4a8c8..0000000000 --- a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/NotBlankConstrainedTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.test.constraints.annotations.hv; - -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertNoViolations; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.violationOf; - -import java.util.Set; - -import jakarta.validation.ConstraintViolation; - -import org.hibernate.validator.constraints.NotBlank; -import org.hibernate.validator.test.constraints.annotations.AbstractConstrainedTest; - -import org.testng.annotations.Test; - -/** - * @author Marko Bekhta - */ -@SuppressWarnings("deprecation") -public class NotBlankConstrainedTest extends AbstractConstrainedTest { - - @Test - public void testNotBlank() { - Foo foo = new Foo( "foo" ); - Set> violations = validator.validate( foo ); - assertNoViolations( violations ); - } - - @Test - public void testNotBlankInvalid() { - Foo foo = new Foo( "" ); - Set> violations = validator.validate( foo ); - assertThat( violations ).containsOnlyViolations( - violationOf( NotBlank.class ) - ); - } - - private static class Foo { - - @NotBlank - private final String string; - - public Foo(String string) { - this.string = string; - } - } -} diff --git a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/NotEmptyConstrainedTest.java b/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/NotEmptyConstrainedTest.java deleted file mode 100644 index c7abf54f34..0000000000 --- a/engine/src/test/java/org/hibernate/validator/test/constraints/annotations/hv/NotEmptyConstrainedTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.test.constraints.annotations.hv; - -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertNoViolations; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat; -import static org.hibernate.validator.testutil.ConstraintViolationAssert.violationOf; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import jakarta.validation.ConstraintViolation; - -import org.hibernate.validator.constraints.NotEmpty; -import org.hibernate.validator.test.constraints.annotations.AbstractConstrainedTest; - -import org.testng.annotations.Test; - -/** - * @author Marko Bekhta - */ -@SuppressWarnings("deprecation") -public class NotEmptyConstrainedTest extends AbstractConstrainedTest { - - @Test - public void testNotEmpty() { - Map map = new HashMap<>(); - map.put( "", "" ); - Foo foo = new Foo( "foo", new Object[] { "" }, new boolean[] { true }, new byte[] { 1 }, - new char[] { 'c' }, new double[] { 1.0 }, new float[] { 1.0f }, new int[] { 1 }, - new long[] { 1L }, new short[] { 1 }, Arrays.asList( "" ), map - ); - Set> violations = validator.validate( foo ); - assertNoViolations( violations ); - } - - @Test - public void testNotEmptyInvalid() { - Foo foo = new Foo( "", new Object[] { }, new boolean[] { }, new byte[] { }, - new char[] { }, new double[] { }, new float[] { }, new int[] { }, - new long[] { }, new short[] { }, Collections.emptyList(), Collections.emptyMap() - ); - Set> violations = validator.validate( foo ); - assertThat( violations ).containsOnlyViolations( - violationOf( NotEmpty.class ).withProperty( "string" ), - violationOf( NotEmpty.class ).withProperty( "objects" ), - violationOf( NotEmpty.class ).withProperty( "booleans" ), - violationOf( NotEmpty.class ).withProperty( "bytes" ), - violationOf( NotEmpty.class ).withProperty( "chars" ), - violationOf( NotEmpty.class ).withProperty( "doubles" ), - violationOf( NotEmpty.class ).withProperty( "floats" ), - violationOf( NotEmpty.class ).withProperty( "ints" ), - violationOf( NotEmpty.class ).withProperty( "longs" ), - violationOf( NotEmpty.class ).withProperty( "shorts" ), - violationOf( NotEmpty.class ).withProperty( "collection" ), - violationOf( NotEmpty.class ).withProperty( "map" ) - ); - } - - private static class Foo { - - @NotEmpty - private final String string; - - @NotEmpty - private final Object[] objects; - - @NotEmpty - private final boolean[] booleans; - - @NotEmpty - private final byte[] bytes; - - @NotEmpty - private final char[] chars; - - @NotEmpty - private final double[] doubles; - - @NotEmpty - private final float[] floats; - - @NotEmpty - private final int[] ints; - - @NotEmpty - private final long[] longs; - - @NotEmpty - private final short[] shorts; - - @NotEmpty - private final Collection collection; - - @NotEmpty - private final Map map; - - public Foo(String string, Object[] objects, boolean[] booleans, byte[] bytes, - char[] chars, double[] doubles, float[] floats, int[] ints, - long[] longs, short[] shorts, Collection collection, - Map map) { - this.string = string; - this.objects = objects; - this.booleans = booleans; - this.bytes = bytes; - this.chars = chars; - this.doubles = doubles; - this.floats = floats; - this.ints = ints; - this.longs = longs; - this.shorts = shorts; - this.collection = collection; - this.map = map; - } - } -} diff --git a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/MessagePropertiesTest.java b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/MessagePropertiesTest.java index 2ff315042c..892d1910d3 100644 --- a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/MessagePropertiesTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/MessagePropertiesTest.java @@ -56,7 +56,6 @@ import org.hibernate.validator.constraints.LuhnCheck; import org.hibernate.validator.constraints.Mod10Check; import org.hibernate.validator.constraints.Mod11Check; -import org.hibernate.validator.constraints.ModCheck; import org.hibernate.validator.constraints.Normalized; import org.hibernate.validator.constraints.ParameterScriptAssert; import org.hibernate.validator.constraints.Range; @@ -83,7 +82,6 @@ * * @author Guillaume Smet */ -@SuppressWarnings("deprecation") public class MessagePropertiesTest { private static final List ALL_SUPPORTED_LOCALES = Arrays.asList( @@ -153,17 +151,13 @@ public void testMessageProperties() throws NoSuchMethodException, SecurityExcept violationOf( CreditCardNumber.class ), violationOf( Currency.class ), violationOf( EAN.class ), - violationOf( org.hibernate.validator.constraints.Email.class ), violationOf( ISBN.class ), violationOf( Length.class ), violationOf( CodePointLength.class ), violationOf( LuhnCheck.class ), violationOf( Mod10Check.class ), violationOf( Mod11Check.class ), - violationOf( ModCheck.class ), violationOf( Normalized.class ), - violationOf( org.hibernate.validator.constraints.NotBlank.class ), - violationOf( org.hibernate.validator.constraints.NotEmpty.class ), violationOf( Range.class ), violationOf( UniqueElements.class ), violationOf( URL.class ), @@ -290,9 +284,6 @@ private static class Bean { @EAN private String ean = "invalid"; - @org.hibernate.validator.constraints.Email - private String hvEmail = "invalid"; - @ISBN private String isbn = "invalid"; @@ -311,18 +302,9 @@ private static class Bean { @Mod11Check private String mod11Check = "4"; - @ModCheck(multiplier = 2, modType = ModCheck.ModType.MOD10) - private String modCheck = "4"; - @Normalized(form = java.text.Normalizer.Form.NFKC) private String normalized = "\uFE64script\uFE65"; - @org.hibernate.validator.constraints.NotBlank - private String hvNotBlank = ""; - - @org.hibernate.validator.constraints.NotEmpty - private List hvNotEmpty = Collections.emptyList(); - @Range(min = 2, max = 4) private int range = 6; diff --git a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/PredefinedScopeAllConstraintsTest.java b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/PredefinedScopeAllConstraintsTest.java index 174fda4a9d..e648d2f96f 100644 --- a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/PredefinedScopeAllConstraintsTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/PredefinedScopeAllConstraintsTest.java @@ -55,7 +55,6 @@ import org.hibernate.validator.constraints.LuhnCheck; import org.hibernate.validator.constraints.Mod10Check; import org.hibernate.validator.constraints.Mod11Check; -import org.hibernate.validator.constraints.ModCheck; import org.hibernate.validator.constraints.Normalized; import org.hibernate.validator.constraints.ParameterScriptAssert; import org.hibernate.validator.constraints.Range; @@ -82,7 +81,6 @@ * * @author Guillaume Smet */ -@SuppressWarnings("deprecation") public class PredefinedScopeAllConstraintsTest { @Test @@ -112,17 +110,13 @@ public void testConstraints() throws NoSuchMethodException, SecurityException { testConstraint( CreditCardNumber.class, new CreditCardNumberBean() ); testConstraint( Currency.class, new CurrencyBean() ); testConstraint( EAN.class, new EANBean() ); - testConstraint( org.hibernate.validator.constraints.Email.class, new HvEmailBean() ); testConstraint( ISBN.class, new ISBNBean() ); testConstraint( Length.class, new LengthBean() ); testConstraint( CodePointLength.class, new CodePointLengthBean() ); testConstraint( LuhnCheck.class, new LuhnCheckBean() ); testConstraint( Mod10Check.class, new Mod10CheckBean() ); testConstraint( Mod11Check.class, new Mod11CheckBean() ); - testConstraint( ModCheck.class, new ModCheckBean() ); testConstraint( Normalized.class, new NormalizedBean() ); - testConstraint( org.hibernate.validator.constraints.NotBlank.class, new HvNotBlankBean() ); - testConstraint( org.hibernate.validator.constraints.NotEmpty.class, new HvNotEmptyBean() ); testConstraint( Range.class, new RangeBean() ); testConstraint( UniqueElements.class, new UniqueElementsBean() ); testConstraint( URL.class, new URLBean() ); @@ -314,12 +308,6 @@ private static class EANBean { private String ean = "invalid"; } - private static class HvEmailBean { - - @org.hibernate.validator.constraints.Email - private String hvEmail = "invalid"; - } - private static class ISBNBean { @ISBN @@ -356,12 +344,6 @@ private static class Mod11CheckBean { private String mod11Check = "4"; } - private static class ModCheckBean { - - @ModCheck(multiplier = 2, modType = ModCheck.ModType.MOD10) - private String modCheck = "4"; - } - private static class NormalizedBean { @Normalized(form = java.text.Normalizer.Form.NFKC) @@ -369,18 +351,6 @@ private static class NormalizedBean { } - private static class HvNotBlankBean { - - @org.hibernate.validator.constraints.NotBlank - private String hvNotBlank = ""; - } - - private static class HvNotEmptyBean { - - @org.hibernate.validator.constraints.NotEmpty - private List hvNotEmpty = Collections.emptyList(); - } - private static class RangeBean { @Range(min = 2, max = 4) diff --git a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/BlankValidatorTest.java b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/bv/BlankValidatorTest.java similarity index 92% rename from engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/BlankValidatorTest.java rename to engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/bv/BlankValidatorTest.java index 10622e0bc8..ec62bc9341 100644 --- a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/BlankValidatorTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/bv/BlankValidatorTest.java @@ -4,7 +4,7 @@ * License: Apache License, Version 2.0 * See the license.txt file in the root directory or . */ -package org.hibernate.validator.test.internal.constraintvalidators.hv; +package org.hibernate.validator.test.internal.constraintvalidators.bv; import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertNoViolations; import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat; @@ -17,23 +17,22 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.Validator; +import jakarta.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.NotBlank; -import org.hibernate.validator.internal.constraintvalidators.hv.NotBlankValidator; +import org.hibernate.validator.internal.constraintvalidators.bv.NotBlankValidator; import org.testng.annotations.Test; /** * @author Hardy Ferentschik */ -@SuppressWarnings("deprecation") public class BlankValidatorTest { @Test public void testConstraintValidator() { NotBlankValidator constraintValidator = new NotBlankValidator(); assertTrue( constraintValidator.isValid( "a", null ) ); - assertTrue( constraintValidator.isValid( null, null ) ); + assertFalse( constraintValidator.isValid( null, null ) ); assertFalse( constraintValidator.isValid( "", null ) ); assertFalse( constraintValidator.isValid( " ", null ) ); assertFalse( constraintValidator.isValid( "\t", null ) ); diff --git a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/EmailValidatorTest.java b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/bv/EmailValidatorTest.java similarity index 99% rename from engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/EmailValidatorTest.java rename to engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/bv/EmailValidatorTest.java index f4ab1d566b..429604d476 100644 --- a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/EmailValidatorTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/bv/EmailValidatorTest.java @@ -4,7 +4,7 @@ * License: Apache License, Version 2.0 * See the license.txt file in the root directory or . */ -package org.hibernate.validator.test.internal.constraintvalidators.hv; +package org.hibernate.validator.test.internal.constraintvalidators.bv; import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat; import static org.hibernate.validator.testutil.ConstraintViolationAssert.violationOf; @@ -23,7 +23,7 @@ import org.hibernate.validator.HibernateValidatorConfiguration; import org.hibernate.validator.cfg.ConstraintMapping; import org.hibernate.validator.cfg.defs.EmailDef; -import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator; +import org.hibernate.validator.internal.constraintvalidators.bv.EmailValidator; import org.hibernate.validator.internal.util.DomainNameUtil; import org.hibernate.validator.internal.util.StringHelper; import org.hibernate.validator.testutil.MyCustomStringImpl; diff --git a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/ModCheckValidatorTest.java b/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/ModCheckValidatorTest.java deleted file mode 100644 index 5512ec6612..0000000000 --- a/engine/src/test/java/org/hibernate/validator/test/internal/constraintvalidators/hv/ModCheckValidatorTest.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.test.internal.constraintvalidators.hv; - -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - -import org.hibernate.validator.constraints.ModCheck; -import org.hibernate.validator.internal.constraintvalidators.hv.ModCheckValidator; -import org.hibernate.validator.internal.util.annotation.ConstraintAnnotationDescriptor; -import org.hibernate.validator.testutil.MyCustomStringImpl; - -import org.testng.annotations.Test; - -/** - * Tests for the {@code ModCheckValidator}. - * - * @author Hardy Ferentschik - */ -@SuppressWarnings("deprecation") -public class ModCheckValidatorTest { - - @Test(expectedExceptions = IllegalArgumentException.class) - public void testInvalidStartIndex() { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, -1, Integer.MAX_VALUE, -1, false ); - validator.initialize( modCheck ); - } - - @Test(expectedExceptions = IllegalArgumentException.class) - public void testInvalidEndIndex() { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, 0, -1, -1, false ); - validator.initialize( modCheck ); - } - - @Test(expectedExceptions = IllegalArgumentException.class) - public void testEndIndexLessThanStartIndex() { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, 5, 0, -1, false ); - validator.initialize( modCheck ); - } - - @Test(expectedExceptions = IllegalArgumentException.class) - public void testInvalidCheckDigitPosition() { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, 0, 10, 5, false ); - validator.initialize( modCheck ); - } - - @Test - public void testFailOnNonNumeric() throws Exception { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, 0, Integer.MAX_VALUE, -1, false ); - validator.initialize( modCheck ); - - assertFalse( validator.isValid( new MyCustomStringImpl( "A79927398713" ), null ) ); - } - - @Test - public void testIgnoreNonNumeric() throws Exception { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, 0, Integer.MAX_VALUE, -1, true ); - validator.initialize( modCheck ); - - assertTrue( validator.isValid( new MyCustomStringImpl( "A79927398713" ), null ) ); - } - - @Test - public void testValidMod10() throws Exception { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, 0, Integer.MAX_VALUE, -1, false ); - validator.initialize( modCheck ); - - assertTrue( validator.isValid( "79927398713", null ) ); - } - - @Test - public void testInvalidMod10() throws Exception { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD10, 2, 0, Integer.MAX_VALUE, -1, false ); - validator.initialize( modCheck ); - - assertFalse( validator.isValid( new MyCustomStringImpl( "79927398714" ), null ) ); - } - - @Test - public void testValidMod11() throws Exception { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD11, 11, 0, Integer.MAX_VALUE, -1, false ); - validator.initialize( modCheck ); - - assertTrue( validator.isValid( "23322023583", null ) ); - - assertTrue( validator.isValid( "37879695001", null ) ); - - assertTrue( validator.isValid( "33181429643", null ) ); - } - - @Test - public void testInvalidMod11() throws Exception { - ModCheckValidator validator = new ModCheckValidator(); - ModCheck modCheck = createModCheckAnnotation( ModCheck.ModType.MOD11, 11, 0, Integer.MAX_VALUE, -1, false ); - validator.initialize( modCheck ); - - assertFalse( validator.isValid( "23322023584", null ) ); - - assertFalse( validator.isValid( "37879695002", null ) ); - - assertFalse( validator.isValid( "33181429652", null ) ); - - } - - private ModCheck createModCheckAnnotation(ModCheck.ModType modType, int multiplier, int start, int end, int checkDigitIndex, boolean ignoreNonDigits) { - ConstraintAnnotationDescriptor.Builder descriptorBuilder = new ConstraintAnnotationDescriptor.Builder<>( ModCheck.class ); - descriptorBuilder.setAttribute( "modType", modType ); - descriptorBuilder.setAttribute( "multiplier", multiplier ); - descriptorBuilder.setAttribute( "startIndex", start ); - descriptorBuilder.setAttribute( "endIndex", end ); - descriptorBuilder.setAttribute( "checkDigitPosition", checkDigitIndex ); - descriptorBuilder.setAttribute( "ignoreNonDigitCharacters", ignoreNonDigits ); - - return descriptorBuilder.build().getAnnotation(); - } -} diff --git a/engine/src/test/java/org/hibernate/validator/test/internal/engine/serialization/CustomConstraintSerializableTest.java b/engine/src/test/java/org/hibernate/validator/test/internal/engine/serialization/CustomConstraintSerializableTest.java index d6d287787b..be0ee2e20e 100644 --- a/engine/src/test/java/org/hibernate/validator/test/internal/engine/serialization/CustomConstraintSerializableTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/internal/engine/serialization/CustomConstraintSerializableTest.java @@ -35,17 +35,6 @@ */ public class CustomConstraintSerializableTest { - @Test - public void testSerializeHibernateEmail() throws Exception { - Validator validator = ValidatorUtil.getValidator(); - - HibernateEmail invalidHibernateEmail = new HibernateEmail(); - invalidHibernateEmail.email = "test@"; - - Set> constraintViolations = validator.validate( invalidHibernateEmail ); - doSerialize( constraintViolations.iterator().next() ); - } - /** * HV-291 * @@ -76,13 +65,5 @@ static class CustomEmail implements Serializable { String email; } - - @SuppressWarnings("deprecation") - static class HibernateEmail implements Serializable { - private static final long serialVersionUID = 7206154160792549270L; - - @org.hibernate.validator.constraints.Email - String email; - } } diff --git a/engine/src/test/java/org/hibernate/validator/test/parameternameprovider/ReflectionParameterNameProviderTest.java b/engine/src/test/java/org/hibernate/validator/test/parameternameprovider/ReflectionParameterNameProviderTest.java deleted file mode 100644 index 0371fe4ec1..0000000000 --- a/engine/src/test/java/org/hibernate/validator/test/parameternameprovider/ReflectionParameterNameProviderTest.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Hibernate Validator, declare and validate application constraints - * - * License: Apache License, Version 2.0 - * See the license.txt file in the root directory or . - */ -package org.hibernate.validator.test.parameternameprovider; - -import static org.testng.Assert.assertEquals; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import jakarta.validation.ParameterNameProvider; - -import org.hibernate.validator.parameternameprovider.ReflectionParameterNameProvider; - -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -/** - * Tests for {@link org.hibernate.validator.parameternameprovider.ReflectionParameterNameProvider}. - * - * @author Khalid Alqinyah - */ -public class ReflectionParameterNameProviderTest { - - private ParameterNameProvider parameterNameProvider; - - @BeforeClass - @SuppressWarnings("deprecation") - public void setup() { - parameterNameProvider = new ReflectionParameterNameProvider(); - } - - @Test - public void testConstructorParametersZeroParameters() throws Exception { - List expected = Collections.emptyList(); - List actual = parameterNameProvider.getParameterNames( Foo.class.getConstructor() ); - assertEquals( actual, expected, "Constructor with zero parameters does not match expected" ); - } - - @Test - public void testConstructorParametersOneParameter() throws Exception { - List expected = Arrays.asList( "bar" ); - List actual = parameterNameProvider.getParameterNames( Foo.class.getConstructor( String.class ) ); - assertEquals( actual, expected, "Constructor with one parameter does not match expected" ); - } - - @Test - public void testConstructorParametersTwoParameters() throws Exception { - List expected = Arrays.asList( "bar", "baz" ); - List actual = parameterNameProvider.getParameterNames( - Foo.class.getConstructor( - String.class, - String.class - ) - ); - assertEquals( actual, expected, "Constructor with two parameters does not match expected" ); - } - - @Test - public void testMethodParametersZeroParameters() throws Exception { - List expected = Collections.emptyList(); - List actual = parameterNameProvider.getParameterNames( Foo.class.getMethod( "foo" ) ); - assertEquals( actual, expected, "Method with zero parameters does not match expected" ); - } - - @Test - public void testMethodParametersOneParameter() throws Exception { - List expected = Arrays.asList( "bar" ); - List actual = parameterNameProvider.getParameterNames( Foo.class.getMethod( "foo", String.class ) ); - assertEquals( actual, expected, "Method with one parameter does not match expected" ); - } - - @Test - public void testMethodParametersTwoParameters() throws Exception { - List expected = Arrays.asList( "bar", "baz" ); - List actual = parameterNameProvider.getParameterNames( - Foo.class.getMethod( - "foo", - String.class, - String.class - ) - ); - assertEquals( actual, expected, "Method with two parameters does not match expected" ); - } - - @SuppressWarnings("unused") - private static class Foo { - public Foo() { - } - - public Foo(String bar) { - } - - public Foo(String bar, String baz) { - } - - public void foo() { - } - - public void foo(String bar) { - } - - public void foo(String bar, String baz) { - } - } -} - diff --git a/engine/src/test/resources/org/hibernate/validator/test/cfg/deprecated-constraint-mapping-contributor-validation.xml b/engine/src/test/resources/org/hibernate/validator/test/cfg/deprecated-constraint-mapping-contributor-validation.xml deleted file mode 100644 index d696b64553..0000000000 --- a/engine/src/test/resources/org/hibernate/validator/test/cfg/deprecated-constraint-mapping-contributor-validation.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - org.hibernate.validator.test.cfg.ConstraintMappingContributorConfiguredInValidationXmlTest$MyConstraintMappingContributor1 - org.hibernate.validator.test.cfg.ConstraintMappingContributorConfiguredInValidationXmlTest$MyConstraintMappingContributor2 - diff --git a/engine/src/test/resources/org/hibernate/validator/test/internal/engine/methodvalidation/xml/method-validation-mapping.xml b/engine/src/test/resources/org/hibernate/validator/test/internal/engine/methodvalidation/xml/method-validation-mapping.xml index f2557887c4..1280e94c53 100644 --- a/engine/src/test/resources/org/hibernate/validator/test/internal/engine/methodvalidation/xml/method-validation-mapping.xml +++ b/engine/src/test/resources/org/hibernate/validator/test/internal/engine/methodvalidation/xml/method-validation-mapping.xml @@ -132,7 +132,7 @@ - + [XML] - must not be null @@ -211,7 +211,7 @@ - +