http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java index 7e3ad46..b260a9e 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java @@ -64,9 +64,9 @@ import org.apache.commons.weaver.privilizer.Privilizing.CallTo; public class ValidationMappingParser { private static final String VALIDATION_MAPPING_XSD = "META-INF/validation-mapping-1.1.xsd"; - private static final Set<ConstraintAnnotationAttributes> RESERVED_PARAMS = Collections.unmodifiableSet(EnumSet.of( - ConstraintAnnotationAttributes.GROUPS, ConstraintAnnotationAttributes.MESSAGE, - ConstraintAnnotationAttributes.PAYLOAD, ConstraintAnnotationAttributes.VALIDATION_APPLIES_TO)); + private static final Set<ConstraintAnnotationAttributes> RESERVED_PARAMS = Collections + .unmodifiableSet(EnumSet.of(ConstraintAnnotationAttributes.GROUPS, ConstraintAnnotationAttributes.MESSAGE, + ConstraintAnnotationAttributes.PAYLOAD, ConstraintAnnotationAttributes.VALIDATION_APPLIES_TO)); private final Set<Class<?>> processedClasses; private final ApacheValidatorFactory factory; @@ -100,7 +100,8 @@ public class ValidationMappingParser { processClassLevel(bean.getClassType(), beanClass, defaultPackage); processConstructorLevel(bean.getConstructor(), beanClass, defaultPackage, ignoreAnnotations); processFieldLevel(bean.getField(), beanClass, defaultPackage, ignoreAnnotations); - final Collection<String> potentialMethodName = processPropertyLevel(bean.getGetter(), beanClass, defaultPackage, ignoreAnnotations); + final Collection<String> potentialMethodName = + processPropertyLevel(bean.getGetter(), beanClass, defaultPackage, ignoreAnnotations); processMethodLevel(bean.getMethod(), beanClass, defaultPackage, ignoreAnnotations, potentialMethodName); processedClasses.add(beanClass); } @@ -115,7 +116,8 @@ public class ValidationMappingParser { final Unmarshaller unmarshaller = jc.createUnmarshaller(); unmarshaller.setSchema(getSchema()); final StreamSource stream = new StreamSource(in); - final JAXBElement<ConstraintMappingsType> root = unmarshaller.unmarshal(stream, ConstraintMappingsType.class); + final JAXBElement<ConstraintMappingsType> root = + unmarshaller.unmarshal(stream, ConstraintMappingsType.class); mappings = root.getValue(); } catch (final JAXBException e) { throw new ValidationException("Failed to parse XML deployment descriptor file.", e); @@ -135,8 +137,7 @@ public class ValidationMappingParser { return ValidationParser.getSchema(VALIDATION_MAPPING_XSD); } - private void processClassLevel(ClassType classType, Class<?> beanClass, - String defaultPackage) { + private void processClassLevel(ClassType classType, Class<?> beanClass, String defaultPackage) { if (classType == null) { return; } @@ -154,16 +155,14 @@ public class ValidationMappingParser { // constraints for (ConstraintType constraint : classType.getConstraint()) { - MetaConstraint<?, ?> metaConstraint = - createConstraint(constraint, beanClass, null, defaultPackage); + MetaConstraint<?, ?> metaConstraint = createConstraint(constraint, beanClass, null, defaultPackage); factory.addMetaConstraint(beanClass, metaConstraint); } } @SuppressWarnings("unchecked") - private <A extends Annotation, T> MetaConstraint<?, ?> createConstraint( - final ConstraintType constraint, final Class<T> beanClass, - final Member member, final String defaultPackage) { + private <A extends Annotation, T> MetaConstraint<?, ?> createConstraint(final ConstraintType constraint, + final Class<T> beanClass, final Member member, final String defaultPackage) { final Class<A> annotationClass = (Class<A>) loadClass(constraint.getAnnotation(), defaultPackage); final AnnotationProxyBuilder<A> annoBuilder = new AnnotationProxyBuilder<A>(annotationClass); @@ -193,24 +192,23 @@ public class ValidationMappingParser { } } - private <A extends Annotation> Class<?> getAnnotationParameterType(final Class<A> annotationClass, final String name) { + private <A extends Annotation> Class<?> getAnnotationParameterType(final Class<A> annotationClass, + final String name) { final Method m = Reflection.getPublicMethod(annotationClass, name); if (m == null) { - throw new ValidationException("Annotation of type " + annotationClass.getName() + - " does not contain a parameter " + name + "."); + throw new ValidationException( + "Annotation of type " + annotationClass.getName() + " does not contain a parameter " + name + "."); } return m.getReturnType(); } - private Object getElementValue(ElementType elementType, Class<?> returnType, - String defaultPackage) { + private Object getElementValue(ElementType elementType, Class<?> returnType, String defaultPackage) { removeEmptyContentElements(elementType); boolean isArray = returnType.isArray(); if (!isArray) { if (elementType.getContent().size() != 1) { - throw new ValidationException( - "Attempt to specify an array where single value is expected."); + throw new ValidationException("Attempt to specify an array where single value is expected."); } return getSingleValue(elementType.getContent().get(0), returnType, defaultPackage); } @@ -312,9 +310,8 @@ public class ValidationMappingParser { throw new ValidationException(String.format("Unknown annotation value type %s", returnType.getName())); } - private <A extends Annotation> Annotation createAnnotation(AnnotationType annotationType, - Class<A> returnType, - String defaultPackage) { + private <A extends Annotation> Annotation createAnnotation(AnnotationType annotationType, Class<A> returnType, + String defaultPackage) { AnnotationProxyBuilder<A> metaAnnotation = new AnnotationProxyBuilder<A>(returnType); for (ElementType elementType : annotationType.getElement()) { String name = elementType.getName(); @@ -340,15 +337,15 @@ public class ValidationMappingParser { @SuppressWarnings("unchecked") private Class<? extends Payload>[] getPayload(PayloadType payloadType, String defaultPackage) { if (payloadType == null) { - return new Class[]{}; + return new Class[] {}; } List<Class<? extends Payload>> payloadList = new ArrayList<Class<? extends Payload>>(); for (String groupClass : payloadType.getValue()) { Class<?> payload = loadClass(groupClass, defaultPackage); if (!Payload.class.isAssignableFrom(payload)) { - throw new ValidationException("Specified payload class " + payload.getName() + - " does not implement javax.validation.Payload"); + throw new ValidationException( + "Specified payload class " + payload.getName() + " does not implement javax.validation.Payload"); } payloadList.add((Class<? extends Payload>) payload); } @@ -358,7 +355,7 @@ public class ValidationMappingParser { private Class<?>[] createGroupSequence(GroupSequenceType groupSequenceType, String defaultPackage) { if (groupSequenceType != null) { Class<?>[] groupSequence = new Class<?>[groupSequenceType.getValue().size()]; - int i=0; + int i = 0; for (String groupName : groupSequenceType.getValue()) { Class<?> group = loadClass(groupName, defaultPackage); groupSequence[i++] = group; @@ -374,17 +371,20 @@ public class ValidationMappingParser { for (final MethodType methodType : methods) { final String methodName = methodType.getName(); if (methodNames.contains(methodName) || getters.contains(methodName)) { - throw new ValidationException(methodName + " is defined more than once in mapping xml for bean " + beanClass.getName()); - } + throw new ValidationException( + methodName + " is defined more than once in mapping xml for bean " + beanClass.getName()); + } methodNames.add(methodName); - final Method method = Reflection.getDeclaredMethod(beanClass, methodName, toTypes(methodType.getParameter(), defaultPackage)); + final Method method = + Reflection.getDeclaredMethod(beanClass, methodName, toTypes(methodType.getParameter(), defaultPackage)); if (method == null) { throw new ValidationException(beanClass.getName() + " does not contain the method " + methodName); } // ignore annotations - final boolean ignoreMethodAnnotation = methodType.getIgnoreAnnotations() == null ? parentIgnoreAnn : methodType.getIgnoreAnnotations(); + final boolean ignoreMethodAnnotation = + methodType.getIgnoreAnnotations() == null ? parentIgnoreAnn : methodType.getIgnoreAnnotations(); factory.getAnnotationIgnores().setIgnoreAnnotationsOnMember(method, ignoreMethodAnnotation); final boolean ignoreAnn; @@ -398,14 +398,14 @@ public class ValidationMappingParser { int i = 0; for (final ParameterType p : methodType.getParameter()) { for (final ConstraintType constraintType : p.getConstraint()) { - final MetaConstraint<?, ?> constraint = createConstraint(constraintType, beanClass, method, defaultPackage); + final MetaConstraint<?, ?> constraint = + createConstraint(constraintType, beanClass, method, defaultPackage); constraint.setIndex(i); factory.addMetaConstraint(beanClass, constraint); } if (p.getValid() != null) { - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, method, - AnnotationProxyBuilder.ValidAnnotation.INSTANCE); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, method, + AnnotationProxyBuilder.ValidAnnotation.INSTANCE); constraint.setIndex(i); factory.addMetaConstraint(beanClass, constraint); } @@ -414,15 +414,15 @@ public class ValidationMappingParser { for (final GroupConversionType groupConversion : p.getConvertGroup()) { final Class<?> from = loadClass(groupConversion.getFrom(), defaultPackage); final Class<?> to = loadClass(groupConversion.getTo(), defaultPackage); - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, method, - new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, method, + new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); constraint.setIndex(i); factory.addMetaConstraint(beanClass, constraint); } } - boolean ignoreParametersAnnotation = p.getIgnoreAnnotations() == null ? ignoreMethodAnnotation : p.getIgnoreAnnotations(); + boolean ignoreParametersAnnotation = + p.getIgnoreAnnotations() == null ? ignoreMethodAnnotation : p.getIgnoreAnnotations(); factory.getAnnotationIgnores().setIgnoreAnnotationsOnParameter(method, i, ignoreParametersAnnotation); i++; @@ -431,13 +431,13 @@ public class ValidationMappingParser { final ReturnValueType returnValue = methodType.getReturnValue(); if (returnValue != null) { for (final ConstraintType constraintType : returnValue.getConstraint()) { - final MetaConstraint<?, ?> constraint = createConstraint(constraintType, beanClass, method, defaultPackage); + final MetaConstraint<?, ?> constraint = + createConstraint(constraintType, beanClass, method, defaultPackage); factory.addMetaConstraint(beanClass, constraint); } if (returnValue.getValid() != null) { - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, method, - AnnotationProxyBuilder.ValidAnnotation.INSTANCE); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, method, + AnnotationProxyBuilder.ValidAnnotation.INSTANCE); factory.addMetaConstraint(beanClass, constraint); } @@ -445,9 +445,8 @@ public class ValidationMappingParser { for (final GroupConversionType groupConversion : returnValue.getConvertGroup()) { final Class<?> from = loadClass(groupConversion.getFrom(), defaultPackage); final Class<?> to = loadClass(groupConversion.getTo(), defaultPackage); - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, method, - new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, method, + new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); factory.addMetaConstraint(beanClass, constraint); } } @@ -458,7 +457,8 @@ public class ValidationMappingParser { final CrossParameterType crossParameter = methodType.getCrossParameter(); if (crossParameter != null) { for (final ConstraintType constraintType : crossParameter.getConstraint()) { - final MetaConstraint<?, ?> constraint = createConstraint(constraintType, beanClass, method, defaultPackage); + final MetaConstraint<?, ?> constraint = + createConstraint(constraintType, beanClass, method, defaultPackage); factory.addMetaConstraint(beanClass, constraint); } factory.getAnnotationIgnores().setIgnoreAnnotationOnCrossParameter(method, @@ -473,7 +473,8 @@ public class ValidationMappingParser { final Constructor<?> constructor = Reflection.getDeclaredConstructor(beanClass, toTypes(constructorType.getParameter(), defaultPackage)); if (constructor == null) { - throw new ValidationException(beanClass.getName() + " does not contain the constructor " + constructorType); + throw new ValidationException( + beanClass.getName() + " does not contain the constructor " + constructorType); } // ignore annotations @@ -492,14 +493,14 @@ public class ValidationMappingParser { int i = 0; for (final ParameterType p : constructorType.getParameter()) { for (final ConstraintType constraintType : p.getConstraint()) { - final MetaConstraint<?, ?> constraint = createConstraint(constraintType, beanClass, constructor, defaultPackage); + final MetaConstraint<?, ?> constraint = + createConstraint(constraintType, beanClass, constructor, defaultPackage); constraint.setIndex(i); factory.addMetaConstraint(beanClass, constraint); } if (p.getValid() != null) { - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, constructor, - AnnotationProxyBuilder.ValidAnnotation.INSTANCE); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, constructor, + AnnotationProxyBuilder.ValidAnnotation.INSTANCE); constraint.setIndex(i); factory.addMetaConstraint(beanClass, constraint); } @@ -508,9 +509,8 @@ public class ValidationMappingParser { for (final GroupConversionType groupConversion : p.getConvertGroup()) { final Class<?> from = loadClass(groupConversion.getFrom(), defaultPackage); final Class<?> to = loadClass(groupConversion.getTo(), defaultPackage); - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, constructor, - new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, + constructor, new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); constraint.setIndex(i); factory.addMetaConstraint(beanClass, constraint); } @@ -530,14 +530,14 @@ public class ValidationMappingParser { final ReturnValueType returnValue = constructorType.getReturnValue(); if (returnValue != null) { for (final ConstraintType constraintType : returnValue.getConstraint()) { - final MetaConstraint<?, ?> constraint = createConstraint(constraintType, beanClass, constructor, defaultPackage); + final MetaConstraint<?, ?> constraint = + createConstraint(constraintType, beanClass, constructor, defaultPackage); constraint.setIndex(-1); factory.addMetaConstraint(beanClass, constraint); } if (returnValue.getValid() != null) { - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, constructor, - AnnotationProxyBuilder.ValidAnnotation.INSTANCE); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, constructor, + AnnotationProxyBuilder.ValidAnnotation.INSTANCE); constraint.setIndex(-1); factory.addMetaConstraint(beanClass, constraint); } @@ -546,9 +546,8 @@ public class ValidationMappingParser { for (final GroupConversionType groupConversion : returnValue.getConvertGroup()) { final Class<?> from = loadClass(groupConversion.getFrom(), defaultPackage); final Class<?> to = loadClass(groupConversion.getTo(), defaultPackage); - final MetaConstraint<?, ?> constraint = - new MetaConstraint<A, Annotation>(beanClass, constructor, - new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, + constructor, new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); constraint.setIndex(-1); factory.addMetaConstraint(beanClass, constraint); } @@ -560,7 +559,8 @@ public class ValidationMappingParser { final CrossParameterType crossParameter = constructorType.getCrossParameter(); if (crossParameter != null) { for (final ConstraintType constraintType : crossParameter.getConstraint()) { - final MetaConstraint<?, ?> constraint = createConstraint(constraintType, beanClass, constructor, defaultPackage); + final MetaConstraint<?, ?> constraint = + createConstraint(constraintType, beanClass, constructor, defaultPackage); factory.addMetaConstraint(beanClass, constraint); } factory.getAnnotationIgnores().setIgnoreAnnotationOnCrossParameter(constructor, @@ -581,15 +581,15 @@ public class ValidationMappingParser { return types; } - private <A> void processFieldLevel(List<FieldType> fields, Class<A> beanClass, - String defaultPackage, boolean ignoreAnnotations) { + private <A> void processFieldLevel(List<FieldType> fields, Class<A> beanClass, String defaultPackage, + boolean ignoreAnnotations) { final List<String> fieldNames = new ArrayList<String>(); for (FieldType fieldType : fields) { String fieldName = fieldType.getName(); if (fieldNames.contains(fieldName)) { - throw new ValidationException(fieldName + " is defined more than once in mapping xml for bean " - + beanClass.getName()); - } + throw new ValidationException( + fieldName + " is defined more than once in mapping xml for bean " + beanClass.getName()); + } fieldNames.add(fieldName); final Field field = Reflection.getDeclaredField(beanClass, fieldName); @@ -598,7 +598,8 @@ public class ValidationMappingParser { } // ignore annotations - final boolean ignoreFieldAnnotation = fieldType.getIgnoreAnnotations() == null ? ignoreAnnotations : fieldType.getIgnoreAnnotations(); + final boolean ignoreFieldAnnotation = + fieldType.getIgnoreAnnotations() == null ? ignoreAnnotations : fieldType.getIgnoreAnnotations(); factory.getAnnotationIgnores().setIgnoreAnnotationsOnMember(field, ignoreFieldAnnotation); // valid @@ -609,40 +610,39 @@ public class ValidationMappingParser { for (final GroupConversionType conversion : fieldType.getConvertGroup()) { final Class<?> from = loadClass(conversion.getFrom(), defaultPackage); final Class<?> to = loadClass(conversion.getTo(), defaultPackage); - final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, field, new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, field, + new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); factory.addMetaConstraint(beanClass, constraint); } // constraints for (ConstraintType constraintType : fieldType.getConstraint()) { - MetaConstraint<?, ?> constraint = - createConstraint(constraintType, beanClass, field, defaultPackage); + MetaConstraint<?, ?> constraint = createConstraint(constraintType, beanClass, field, defaultPackage); factory.addMetaConstraint(beanClass, constraint); } } } private <A> Collection<String> processPropertyLevel(List<GetterType> getters, Class<A> beanClass, - String defaultPackage, boolean ignoreAnnotatino) { + String defaultPackage, boolean ignoreAnnotatino) { List<String> getterNames = new ArrayList<String>(); for (GetterType getterType : getters) { final String getterName = getterType.getName(); final String methodName = "get" + StringUtils.capitalize(getterType.getName()); if (getterNames.contains(methodName)) { - throw new ValidationException(getterName + - " is defined more than once in mapping xml for bean " + - beanClass.getName()); + throw new ValidationException( + getterName + " is defined more than once in mapping xml for bean " + beanClass.getName()); } getterNames.add(methodName); final Method method = getGetter(beanClass, getterName); if (method == null) { - throw new ValidationException( - beanClass.getName() + " does not contain the property " + getterName); + throw new ValidationException(beanClass.getName() + " does not contain the property " + getterName); } // ignore annotations - final boolean ignoreGetterAnnotation = getterType.getIgnoreAnnotations() == null ? ignoreAnnotatino : getterType.getIgnoreAnnotations(); + final boolean ignoreGetterAnnotation = + getterType.getIgnoreAnnotations() == null ? ignoreAnnotatino : getterType.getIgnoreAnnotations(); factory.getAnnotationIgnores().setIgnoreAnnotationsOnMember(method, ignoreGetterAnnotation); // valid @@ -654,14 +654,15 @@ public class ValidationMappingParser { for (final GroupConversionType conversion : getterType.getConvertGroup()) { final Class<?> from = loadClass(conversion.getFrom(), defaultPackage); final Class<?> to = loadClass(conversion.getTo(), defaultPackage); - final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, method, new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); + final MetaConstraint<?, ?> constraint = new MetaConstraint<A, Annotation>(beanClass, method, + new AnnotationProxyBuilder.ConvertGroupAnnotation(from, to)); factory.addMetaConstraint(beanClass, constraint); } // constraints for (ConstraintType constraintType : getterType.getConstraint()) { MetaConstraint<?, ?> metaConstraint = - createConstraint(constraintType, beanClass, method, defaultPackage); + createConstraint(constraintType, beanClass, method, defaultPackage); factory.addMetaConstraint(beanClass, metaConstraint); } } @@ -670,8 +671,8 @@ public class ValidationMappingParser { } @SuppressWarnings("unchecked") - private void processConstraintDefinitions( - List<ConstraintDefinitionType> constraintDefinitionList, String defaultPackage) { + private void processConstraintDefinitions(List<ConstraintDefinitionType> constraintDefinitionList, + String defaultPackage) { for (ConstraintDefinitionType constraintDefinition : constraintDefinitionList) { String annotationClassName = constraintDefinition.getAnnotation(); @@ -688,8 +689,8 @@ public class ValidationMappingParser { If include-existing-validator is set to false, ConstraintValidator defined on the constraint annotation are ignored. */ - if (validatedByType.getIncludeExistingValidators() != null && - validatedByType.getIncludeExistingValidators()) { + if (validatedByType.getIncludeExistingValidators() != null + && validatedByType.getIncludeExistingValidators()) { /* If set to true, the list of ConstraintValidators described in XML are concatenated to the list of ConstraintValidator described on the @@ -699,13 +700,10 @@ public class ValidationMappingParser { } for (String validatorClassName : validatedByType.getValue()) { Class<? extends ConstraintValidator<?, ?>> validatorClass; - validatorClass = (Class<? extends ConstraintValidator<?, ?>>) - loadClass(validatorClassName); - + validatorClass = (Class<? extends ConstraintValidator<?, ?>>) loadClass(validatorClassName); if (!ConstraintValidator.class.isAssignableFrom(validatorClass)) { - throw new ValidationException( - validatorClass + " is not a constraint validator class"); + throw new ValidationException(validatorClass + " is not a constraint validator class"); } /* @@ -713,30 +711,32 @@ public class ValidationMappingParser { ConstraintValidator in the array. The new list is returned by ConstraintDescriptor.getConstraintValidatorClasses(). */ - if (!classes.contains(validatorClass)) classes.add(validatorClass); + if (!classes.contains(validatorClass)) + classes.add(validatorClass); } if (factory.getConstraintsCache().containsConstraintValidator(annotationClass)) { - throw new ValidationException("Constraint validator for " + - annotationClass.getName() + " already configured."); + throw new ValidationException( + "Constraint validator for " + annotationClass.getName() + " already configured."); } else { factory.getConstraintsCache().putConstraintValidator(annotationClass, - classes.toArray(new Class[classes.size()])); + classes.toArray(new Class[classes.size()])); } } } private List<Class<? extends ConstraintValidator<? extends Annotation, ?>>> findConstraintValidatorClasses( - Class<? extends Annotation> annotationType) { + Class<? extends Annotation> annotationType) { List<Class<? extends ConstraintValidator<? extends Annotation, ?>>> classes = - new ArrayList<Class<? extends ConstraintValidator<? extends Annotation, ?>>>(); + new ArrayList<Class<? extends ConstraintValidator<? extends Annotation, ?>>>(); Class<? extends ConstraintValidator<?, ?>>[] validator = - factory.getDefaultConstraints().getValidatorClasses(annotationType); + factory.getDefaultConstraints().getValidatorClasses(annotationType); if (validator == null) { /* Collections.addAll() would be more straightforward here, but there is an Oracle compiler bug of some sort * that precludes this: */ - Class<? extends ConstraintValidator<?, ?>>[] validatedBy = annotationType.getAnnotation(Constraint.class).validatedBy(); + Class<? extends ConstraintValidator<?, ?>>[] validatedBy = + annotationType.getAnnotation(Constraint.class).validatedBy(); classes.addAll(Arrays.asList(validatedBy)); } else { Collections.addAll(classes, validator);
http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/AssertFalseValidatorTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/AssertFalseValidatorTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/AssertFalseValidatorTest.java index 85a7dd8..89acd0f 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/AssertFalseValidatorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/AssertFalseValidatorTest.java @@ -39,16 +39,16 @@ import org.junit.Test; * @author Carlos Vara */ public class AssertFalseValidatorTest { - + /** * Test {@link AssertFalseValidator} with <code>null</code> context. */ @Test public void testAssertFalseValidator() { - AssertFalseValidator afv = new AssertFalseValidator(); - assertFalse("True value validation must fail", afv.isValid(true, null)); - assertTrue("False value validation must succeed", afv.isValid(false, null)); - assertTrue("Null value validation must succeed", afv.isValid(null, null)); + AssertFalseValidator afv = new AssertFalseValidator(); + assertFalse("True value validation must fail", afv.isValid(true, null)); + assertTrue("False value validation must succeed", afv.isValid(false, null)); + assertTrue("Null value validation must succeed", afv.isValid(null, null)); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/AssertTrueValidatorTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/AssertTrueValidatorTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/AssertTrueValidatorTest.java index 74be874..3453ac0 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/AssertTrueValidatorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/AssertTrueValidatorTest.java @@ -39,16 +39,16 @@ import org.junit.Test; * @author Carlos Vara */ public class AssertTrueValidatorTest { - + /** * Test {@link AssertTrueValidator} with null context. */ @Test public void testAssertTrueValidator() { - AssertTrueValidator atv = new AssertTrueValidator(); - assertTrue("True value validation must succeed", atv.isValid(true, null)); - assertFalse("False value validation must fail", atv.isValid(false, null)); - assertTrue("Null value validation must succeed", atv.isValid(null, null)); + AssertTrueValidator atv = new AssertTrueValidator(); + assertTrue("True value validation must succeed", atv.isValid(true, null)); + assertFalse("False value validation must fail", atv.isValid(false, null)); + assertTrue("Null value validation must succeed", atv.isValid(null, null)); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java b/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java index 1104510..093c714 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java @@ -36,7 +36,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @version $Rev: 999729 $ $Date: 2010-09-21 21:37:54 -0500 (Tue, 21 Sep 2010) $ */ -@Target( { ANNOTATION_TYPE, METHOD, FIELD }) +@Target({ ANNOTATION_TYPE, METHOD, FIELD }) @Constraint(validatedBy = AuthorAddressKnown.Validator.class) @Retention(RUNTIME) public @interface AuthorAddressKnown { @@ -45,7 +45,7 @@ public @interface AuthorAddressKnown { Class<?>[] groups() default {}; - Class<? extends Payload>[] payload() default { }; + Class<? extends Payload>[] payload() default {}; public static class Validator implements ConstraintValidator<AuthorAddressKnown, Author> { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java b/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java index 1516eb8..5a68bb3 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java @@ -37,8 +37,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; // email @Pattern(regexp = "[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}"), // agimatec - @Pattern(regexp = ".*?COMPANY.*?") -}) + @Pattern(regexp = ".*?COMPANY.*?") }) /** * test a constraint WITHOUT an own ConstraintValidator implementation. * the validations, that must be processed are in the combined constraints only!! @@ -47,25 +46,25 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; */ @Constraint(validatedBy = {}) @Documented -@Target({ANNOTATION_TYPE, METHOD, FIELD, CONSTRUCTOR, PARAMETER}) +@Target({ ANNOTATION_TYPE, METHOD, FIELD, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) public @interface CompanyEmail { String message() default "Not an email of COMPANY"; - @OverridesAttribute(constraint = Pattern.class, name = "message", - constraintIndex = 0) String emailMessage() default "Not an email"; + @OverridesAttribute(constraint = Pattern.class, name = "message", constraintIndex = 0) + String emailMessage() default "Not an email"; - @OverridesAttribute(constraint = Pattern.class, name = "message", - constraintIndex = 1) String agimatecMessage() default "Not COMPANY"; + @OverridesAttribute(constraint = Pattern.class, name = "message", constraintIndex = 1) + String agimatecMessage() default "Not COMPANY"; Class<?>[] groups() default {}; Class<? extends Payload>[] payload() default {}; - @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER}) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented - @interface List { + @interface List { CompanyEmail[] value(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/DigitsValidatorTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/DigitsValidatorTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/DigitsValidatorTest.java index 39d3a7a..18af3ed 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/DigitsValidatorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/DigitsValidatorTest.java @@ -32,7 +32,7 @@ import org.junit.Test; * @since <pre>02/03/2009</pre> * @version 1.0 */ -public class DigitsValidatorTest { +public class DigitsValidatorTest { @Test public void testValidateNumber() { DigitsValidatorForNumber validator = new DigitsValidatorForNumber(); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java b/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java index 7462464..a562052 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java @@ -43,20 +43,19 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Constraint(validatedBy = FrenchZipcodeValidator.class) @ReportAsSingleViolation @Documented -@Target({ANNOTATION_TYPE, METHOD, FIELD}) +@Target({ ANNOTATION_TYPE, METHOD, FIELD }) @Retention(RUNTIME) public @interface FrenchZipCode { - @OverridesAttribute.List({ - @OverridesAttribute(constraint = Size.class, name= "min"), - @OverridesAttribute(constraint = Size.class, name = "max")}) + @OverridesAttribute.List({ @OverridesAttribute(constraint = Size.class, name = "min"), + @OverridesAttribute(constraint = Size.class, name = "max") }) int size() default 6; - @OverridesAttribute(constraint=Size.class, name="message") + @OverridesAttribute(constraint = Size.class, name = "message") String sizeMessage() default "{error.zipcode.size}"; String message() default "Wrong zipcode"; Class<?>[] groups() default {}; - Class<? extends Payload>[] payload() default { }; + Class<? extends Payload>[] payload() default {}; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java b/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java index 0c04494..b4a5e2c 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java @@ -31,8 +31,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Description: allow distinct string values for element (like enums) <br/> */ -@Target({ANNOTATION_TYPE, METHOD, FIELD}) -@Constraint(validatedBy = {HasStringValidator.class}) +@Target({ ANNOTATION_TYPE, METHOD, FIELD }) +@Constraint(validatedBy = { HasStringValidator.class }) @Retention(RUNTIME) public @interface HasValue { String[] value(); @@ -41,5 +41,5 @@ public @interface HasValue { Class<?>[] groups() default {}; - Class<? extends Payload>[] payload() default { }; + Class<? extends Payload>[] payload() default {}; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/NotNullValidatorTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/NotNullValidatorTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/NotNullValidatorTest.java index 4f45f80..dbeb6a8 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/NotNullValidatorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/NotNullValidatorTest.java @@ -44,9 +44,9 @@ public class NotNullValidatorTest { */ @Test public void testNotNullValidator() { - NotNullValidator nnv = new NotNullValidator(); - assertTrue("Non null value validation must succeed", nnv.isValid("hello", null)); - assertFalse("Null value validation must fail", nnv.isValid(null, null)); + NotNullValidator nnv = new NotNullValidator(); + assertTrue("Non null value validation must succeed", nnv.isValid("hello", null)); + assertFalse("Null value validation must fail", nnv.isValid(null, null)); } - + } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/NullValidatorTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/NullValidatorTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/NullValidatorTest.java index fe39b2e..328276e 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/NullValidatorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/NullValidatorTest.java @@ -44,9 +44,9 @@ public class NullValidatorTest { */ @Test public void testNullValidator() { - NullValidator nv = new NullValidator(); - assertTrue("Null value validation must succeed", nv.isValid(null, null)); - assertFalse("Non null value validation must fail", nv.isValid("hello", null)); + NullValidator nv = new NullValidator(); + assertTrue("Null value validation must succeed", nv.isValid(null, null)); + assertFalse("Non null value validation must fail", nv.isValid("hello", null)); } - + } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java b/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java index 0cb2fb9..56ecd1c 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java @@ -45,5 +45,5 @@ public @interface Password { int robustness() default 8; - Class<? extends Payload>[] payload() default { }; + Class<? extends Payload>[] payload() default {}; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java index 6c92c7a..8c4dff1 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java @@ -32,10 +32,12 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; */ @Documented @Constraint(validatedBy = ZipCodeCityCoherenceValidator.class) -@Target({TYPE}) +@Target({ TYPE }) @Retention(RUNTIME) public @interface ZipCodeCityCoherence { - String message() default "{validator.zipCodeCityCoherence}"; + String message() default "{validator.zipCodeCityCoherence}"; + Class<?>[] groups() default {}; - Class<? extends Payload>[] payload() default { }; + + Class<? extends Payload>[] payload() default {}; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java index ab53656..4aeeeb0 100644 --- a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java +++ b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java @@ -18,7 +18,6 @@ */ package org.apache.bval.constraints; - import org.apache.bval.jsr.example.ZipCodeCityCarrier; import javax.validation.ConstraintValidator; @@ -30,8 +29,7 @@ import javax.validation.ConstraintValidatorContext; * Date: 01.04.2008 <br/> * Time: 11:45:22 <br/> */ -public class ZipCodeCityCoherenceValidator - implements ConstraintValidator<ZipCodeCityCoherence, ZipCodeCityCarrier> { +public class ZipCodeCityCoherenceValidator implements ConstraintValidator<ZipCodeCityCoherence, ZipCodeCityCarrier> { @Override public void initialize(ZipCodeCityCoherence constraintAnnotation) { } @@ -46,7 +44,8 @@ public class ZipCodeCityCoherenceValidator } if ("error".equals(adr.getCity())) { context.disableDefaultConstraintViolation(); - context.buildConstraintViolationWithTemplate("city not OK").addPropertyNode("city").addConstraintViolation(); + context.buildConstraintViolationWithTemplate("city not OK").addPropertyNode("city") + .addConstraintViolation(); r = false; } return r; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java index 0db4e5c..d81f90a 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java @@ -73,13 +73,12 @@ public class BeanDescriptorTest extends ValidationTestBase { */ @Test public void testCorrectValueForInheritedGroupsAttribute() { - Set<ConstraintDescriptor<?>> passwordDescriptors = - validator.getConstraintsForClass(Account.class).getConstraintsForProperty("password") - .getConstraintDescriptors(); + Set<ConstraintDescriptor<?>> passwordDescriptors = validator.getConstraintsForClass(Account.class) + .getConstraintsForProperty("password").getConstraintDescriptors(); assertEquals("Incorrect number of descriptors", 1, passwordDescriptors.size()); ConstraintDescriptor<?> passwordDescriptor = passwordDescriptors.iterator().next(); - assertEquals("Incorrect number of composing constraints", 1, passwordDescriptor - .getComposingConstraints().size()); + assertEquals("Incorrect number of composing constraints", 1, + passwordDescriptor.getComposingConstraints().size()); ConstraintDescriptor<?> notNullDescriptor = passwordDescriptor.getComposingConstraints().iterator().next(); // Check that the groups value containts Group1.class @@ -110,10 +109,10 @@ public class BeanDescriptorTest extends ValidationTestBase { // Person and the Default group Class<?>[] notNullGroups = (Class<?>[]) notNullDescriptor.getAttributes().get("groups"); assertEquals("Incorrect number of groups", 2, notNullGroups.length); - assertTrue("Default group not present", notNullGroups[0].equals(Default.class) - || notNullGroups[1].equals(Default.class)); - assertTrue("Implicit group not present", notNullGroups[0].equals(Person.class) - || notNullGroups[1].equals(Person.class)); + assertTrue("Default group not present", + notNullGroups[0].equals(Default.class) || notNullGroups[1].equals(Default.class)); + assertTrue("Implicit group not present", + notNullGroups[0].equals(Person.class) || notNullGroups[1].equals(Person.class)); } /** @@ -179,7 +178,7 @@ public class BeanDescriptorTest extends ValidationTestBase { @NotNull(groups = {}) @Constraint(validatedBy = {}) @Documented - @Target( { METHOD, FIELD, TYPE }) + @Target({ METHOD, FIELD, TYPE }) @Retention(RUNTIME) public static @interface Password { String message() default "Invalid password"; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java index 2483236..c72ec72 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java @@ -187,7 +187,7 @@ public class BootstrapTest { final ProviderSpecificBootstrap<ApacheValidatorConfiguration> specializedBuilderFactory = type.providerResolver(resolver); - + thrown.expect(ValidationException.class); thrown.expectMessage("provider"); thrown.expectMessage(ApacheValidationProvider.class.getName()); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java index 3b4361e..70250a1 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java @@ -42,8 +42,7 @@ public class ComposedConstraintsTest extends ValidationTestBase { @Test public void testMetaDataAPI_ComposedConstraints() { ElementDescriptor ed = - validator.getConstraintsForClass(FrenchAddress.class) - .getConstraintsForProperty("zipCode"); + validator.getConstraintsForClass(FrenchAddress.class).getConstraintsForProperty("zipCode"); assertEquals(1, ed.getConstraintDescriptors().size()); for (ConstraintDescriptor<?> cd : ed.getConstraintDescriptors()) { assertTrue(cd.isReportAsSingleViolation()); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java index 309f06e..c75e96c 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java @@ -91,9 +91,8 @@ public class ConstraintCompositionTest extends ValidationTestBase { @Test public void testAnnotationGroupsAreInherited() { // Check that the groups() value is right when querying the metadata - ConstraintDescriptor<?> manNameDesc = - validator.getConstraintsForClass(Man.class).getConstraintsForProperty("name").getConstraintDescriptors() - .iterator().next(); + ConstraintDescriptor<?> manNameDesc = validator.getConstraintsForClass(Man.class) + .getConstraintsForProperty("name").getConstraintDescriptors().iterator().next(); ConstraintDescriptor<?> personNameDesc = manNameDesc.getComposingConstraints().iterator().next(); ConstraintDescriptor<?> notNullDesc = personNameDesc.getComposingConstraints().iterator().next(); assertEquals("There should only be 1 group", 1, manNameDesc.getGroups().size()); @@ -118,9 +117,8 @@ public class ConstraintCompositionTest extends ValidationTestBase { @Test public void testAnnotationPayloadsAreInherited() { // Check that the payload() value is right when querying the metadata - ConstraintDescriptor<?> manNameDesc = - validator.getConstraintsForClass(Man.class).getConstraintsForProperty("name").getConstraintDescriptors() - .iterator().next(); + ConstraintDescriptor<?> manNameDesc = validator.getConstraintsForClass(Man.class) + .getConstraintsForProperty("name").getConstraintDescriptors().iterator().next(); ConstraintDescriptor<?> personNameDesc = manNameDesc.getComposingConstraints().iterator().next(); ConstraintDescriptor<?> notNullDesc = personNameDesc.getComposingConstraints().iterator().next(); assertEquals("There should only be 1 payload class", 1, manNameDesc.getPayload().size()); @@ -207,7 +205,7 @@ public class ConstraintCompositionTest extends ValidationTestBase { @NotNull(message = "A person needs a non null name", groups = { Group1.class }, payload = {}) @Constraint(validatedBy = {}) @Documented - @Target( { METHOD, FIELD, TYPE }) + @Target({ METHOD, FIELD, TYPE }) @Retention(RUNTIME) public static @interface PersonName { String message() default "Wrong person name"; @@ -220,7 +218,7 @@ public class ConstraintCompositionTest extends ValidationTestBase { @PersonName(groups = { Group2.class }, payload = { Payload1.class, Payload2.class }) @Constraint(validatedBy = {}) @Documented - @Target( { METHOD, FIELD, TYPE }) + @Target({ METHOD, FIELD, TYPE }) @Retention(RUNTIME) public static @interface ManName { String message() default "Wrong man name"; @@ -230,11 +228,11 @@ public class ConstraintCompositionTest extends ValidationTestBase { Class<? extends Payload>[] payload() default {}; } - @Size.List( { @Size(min = 3, max = 3, message = "Id is too short"), + @Size.List({ @Size(min = 3, max = 3, message = "Id is too short"), @Size(min = 5, max = 5, message = "Id is too long") }) @Constraint(validatedBy = {}) @Documented - @Target( { METHOD, FIELD, TYPE }) + @Target({ METHOD, FIELD, TYPE }) @Retention(RUNTIME) public static @interface PersonId { String message() default "Wrong person id"; @@ -255,7 +253,7 @@ public class ConstraintCompositionTest extends ValidationTestBase { @Constraint(validatedBy = {}) @ReportAsSingleViolation @Documented - @Target( { METHOD, FIELD, TYPE }) + @Target({ METHOD, FIELD, TYPE }) @Retention(RUNTIME) public static @interface ElevenDigitsCode { String message() default "Invalid code"; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java index 4060808..aa7d02f 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java @@ -130,11 +130,11 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { } public static class Person { - @MinList( { @Min(value = 20), @Min(value = 30) }) + @MinList({ @Min(value = 20), @Min(value = 30) }) public Integer age; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented public static @interface MinList { @@ -146,7 +146,7 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { public String prop; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { NotNullValidator.class }) @@ -161,7 +161,7 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { public String prop; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { NotNullValidator.class }) @@ -178,7 +178,7 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { public String prop; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { NotNullValidator.class }) @@ -193,7 +193,7 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { public String prop; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { NotNullValidator.class }) @@ -213,7 +213,7 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { public String prop; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { NotNullValidator.class }) @@ -228,7 +228,7 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { public String prop; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { NotNullValidator.class }) @@ -245,7 +245,7 @@ public class ConstraintDefinitionsTest extends ValidationTestBase { public String prop; } - @Target( { METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { NotNullValidator.class }) http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java index 72f1aca..5aa1de9 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java @@ -78,8 +78,7 @@ public class ConstraintValidatorContextTest { @Test public void testPersonLawyerName() { - cvb.addNode("person").addNode("name").inIterable().atKey("john") - .addConstraintViolation(); + cvb.addNode("person").addNode("name").inIterable().atKey("john").addConstraintViolation(); Error error = cvc.getErrorMessages().iterator().next(); PathImpl errorPath = (PathImpl) error.getOwner(); assertEquals("Incorrect path created", "person[john].name", errorPath.toString()); @@ -87,8 +86,7 @@ public class ConstraintValidatorContextTest { @Test public void test0Name() { - cvb.addNode(null).addNode("name").inIterable().atIndex(0).addNode(null) - .inIterable().addConstraintViolation(); + cvb.addNode(null).addNode("name").inIterable().atIndex(0).addNode(null).inIterable().addConstraintViolation(); Error error = cvc.getErrorMessages().iterator().next(); PathImpl errorPath = (PathImpl) error.getOwner(); assertEquals("Incorrect path created", "[0].name[]", errorPath.toString()); @@ -105,8 +103,7 @@ public class ConstraintValidatorContextTest { @Test public void testRootPath() { // Adding only nulls should still give a root path - cvb.addNode(null).addNode(null).addNode(null).addNode(null) - .addConstraintViolation(); + cvb.addNode(null).addNode(null).addNode(null).addNode(null).addConstraintViolation(); Error error = cvc.getErrorMessages().iterator().next(); PathImpl errorPath = (PathImpl) error.getOwner(); assertTrue("Created path must be a root path", errorPath.isRootPath()); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java index 676eaed..7de16e8 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java @@ -46,45 +46,45 @@ import org.junit.Test; */ public class ContextConstraintValidatorFactoryTest extends ValidationTestBase { - @Documented - @Retention(RetentionPolicy.RUNTIME) - @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD }) - @Constraint(validatedBy = { Contrived.Validator.class }) - public @interface Contrived { - String message() default "{org.apache.bval.constraints.Contrived.message}"; + @Documented + @Retention(RetentionPolicy.RUNTIME) + @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD }) + @Constraint(validatedBy = { Contrived.Validator.class }) + public @interface Contrived { + String message() default "{org.apache.bval.constraints.Contrived.message}"; - Class<?>[] groups() default {}; + Class<?>[] groups() default {}; - Class<? extends Payload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; - public static class Validator implements ConstraintValidator<Contrived, Object> { - private Object requiredCollaborator; + public static class Validator implements ConstraintValidator<Contrived, Object> { + private Object requiredCollaborator; - public Object getRequiredCollaborator() { - return requiredCollaborator; - } + public Object getRequiredCollaborator() { + return requiredCollaborator; + } - public void setRequiredCollaborator(Object requiredCollaborator) { - this.requiredCollaborator = requiredCollaborator; - } + public void setRequiredCollaborator(Object requiredCollaborator) { + this.requiredCollaborator = requiredCollaborator; + } - @Override + @Override public void initialize(Contrived constraintAnnotation) { - } + } - @Override + @Override public boolean isValid(Object value, ConstraintValidatorContext context) { - getRequiredCollaborator().toString(); - return true; - } + getRequiredCollaborator().toString(); + return true; + } - } + } - } + } - @Contrived - public static class Example { - } + @Contrived + public static class Example { + } @Override protected Validator createValidator() { @@ -110,9 +110,9 @@ public class ContextConstraintValidatorFactoryTest extends ValidationTestBase { return factory.usingContext().constraintValidatorFactory(constraintValidatorFactory).getValidator(); } - @Test - public void testContextBoundConstraintValidatorFactory() { - final Set<ConstraintViolation<Example>> violations = validator.validate(new Example()); - assertTrue(violations.isEmpty()); - } + @Test + public void testContextBoundConstraintValidatorFactory() { + final Set<ConstraintViolation<Example>> violations = validator.validate(new Example()); + assertTrue(violations.isEmpty()); + } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java index 20ead2a..e2ac750 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java @@ -87,7 +87,9 @@ public class CustomConstraintValidatorFactoryTest { public static @interface GoodPerson { String message() default "Not a good person"; - Class<?>[] groups() default { }; + + Class<?>[] groups() default {}; + Class<? extends Payload>[] payload() default {}; public static class GoodPersonValidator implements ConstraintValidator<GoodPerson, Person> { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java index f3636e7..355d676 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java @@ -107,8 +107,8 @@ public class CustomValidatorFactoryTest { @Test public void testDefaultValidatorFactory() { - Validation.byProvider(ApacheValidationProvider.class).configure().buildValidatorFactory().unwrap( - ApacheValidatorFactory.class); + Validation.byProvider(ApacheValidationProvider.class).configure().buildValidatorFactory() + .unwrap(ApacheValidatorFactory.class); } @Test http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java index 9df3abe..a6c8a5b 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java @@ -49,8 +49,8 @@ public class DefaultMessageInterpolatorTest { final Validator gvalidator = getValidator(); - assertFalse(gvalidator.getConstraintsForClass(PreferredGuest.class).getConstraintsForProperty( - "guestCreditCardNumber").getConstraintDescriptors().isEmpty()); + assertFalse(gvalidator.getConstraintsForClass(PreferredGuest.class) + .getConstraintsForProperty("guestCreditCardNumber").getConstraintDescriptors().isEmpty()); MessageInterpolator.Context ctx = new MessageInterpolator.Context() { @@ -110,8 +110,8 @@ public class DefaultMessageInterpolatorTest { @Override public ConstraintDescriptor<?> getConstraintDescriptor() { - return validator.getConstraintsForClass(Person.class) - .getConstraintsForProperty("idNumber").getConstraintDescriptors().iterator().next(); + return validator.getConstraintsForClass(Person.class).getConstraintsForProperty("idNumber") + .getConstraintDescriptors().iterator().next(); } @Override @@ -134,8 +134,8 @@ public class DefaultMessageInterpolatorTest { @Override public ConstraintDescriptor<?> getConstraintDescriptor() { - return validator.getConstraintsForClass(Person.class) - .getConstraintsForProperty("otherId").getConstraintDescriptors().iterator().next(); + return validator.getConstraintsForClass(Person.class).getConstraintsForProperty("otherId") + .getConstraintDescriptors().iterator().next(); } @Override http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java b/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java index 8c8940a..83f2427 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java @@ -171,13 +171,12 @@ public class Jsr303Test extends ValidationTestBase { Set<ConstraintViolation<MaxTestEntity>> violations = validator.validate(entity); assertEquals(4, violations.size()); } - + @Test public void testConstraintValidatorResolutionAlgorithm2() { thrown.expect(UnexpectedTypeException.class); thrown.expectMessage("No validator could be found for type java.lang.Object. " - + "See: @Max at private java.lang.Object org.apache.bval.jsr.example." - + "NoValidatorTestEntity.anything"); + + "See: @Max at private java.lang.Object org.apache.bval.jsr.example." + "NoValidatorTestEntity.anything"); NoValidatorTestEntity entity2 = new NoValidatorTestEntity(); validator.validate(entity2); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java index e992069..ab65286 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java @@ -39,8 +39,9 @@ public class TckReproducerTest extends ValidationTestBase { private static <T> void assertCorrectNumberOfViolations(Set<ConstraintViolation<T>> violations, int expectedViolations) { - assertEquals("Wrong number of constraint violations. Expected: " + expectedViolations + " Actual: " - + violations.size(), expectedViolations, violations.size()); + assertEquals( + "Wrong number of constraint violations. Expected: " + expectedViolations + " Actual: " + violations.size(), + expectedViolations, violations.size()); } @Test http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java index 71449fb..f6c7a4f 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java @@ -297,8 +297,8 @@ public class ValidationTest extends ValidationTestBase { } @Test - public void testValidateNestedPropertyPath() throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + public void testValidateNestedPropertyPath() + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { final String propPath = "addresses[0].country.ISO2Code"; Author author = new Author(); @@ -331,8 +331,8 @@ public class ValidationTest extends ValidationTestBase { } @Test - public void testValidateCascadingNestedBean() throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + public void testValidateCascadingNestedBean() + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { final String propPath = "addresses[0]"; CascadingPropertyValidator v = validator.unwrap(CascadingPropertyValidator.class); @@ -375,8 +375,8 @@ public class ValidationTest extends ValidationTestBase { } @Test - public void testValidateCascadingNestedProperty() throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + public void testValidateCascadingNestedProperty() + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { final String propPath = "addresses[0].country"; CascadingPropertyValidator v = validator.unwrap(CascadingPropertyValidator.class); @@ -436,8 +436,8 @@ public class ValidationTest extends ValidationTestBase { } @Test - public void testValidateCascadingKeyedElement() throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + public void testValidateCascadingKeyedElement() + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { final String propPath = "[foo]"; CascadingPropertyValidator v = validator.unwrap(CascadingPropertyValidator.class); @@ -484,8 +484,8 @@ public class ValidationTest extends ValidationTestBase { @SuppressWarnings("unchecked") @Test - public void testValidateCascadingKeyedGenericElement() throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + public void testValidateCascadingKeyedGenericElement() + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { final String propPath = "[foo]"; CascadingPropertyValidator v = validator.unwrap(CascadingPropertyValidator.class); @@ -527,8 +527,8 @@ public class ValidationTest extends ValidationTestBase { } @Test - public void testValidateCascadingIndexedElement() throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + public void testValidateCascadingIndexedElement() + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { final String propPath = "[0]"; CascadingPropertyValidator v = validator.unwrap(CascadingPropertyValidator.class); Address value = new Address(); @@ -575,31 +575,31 @@ public class ValidationTest extends ValidationTestBase { Object list = Collections.singletonList(value); iv = v.validateProperty(list, propPath, true); assertEquals(1, iv.size()); // null country - + value.setCountry(new Country()); iv = v.validateProperty(list, propPath, true); assertEquals(1, iv.size()); // null country.name - + value.getCountry().setName("NWO"); iv = v.validateProperty(list, propPath, true); assertEquals(0, iv.size()); - + value = new Address(); value.setCity("whatever"); value.setAddressline1("1 address line"); Set<?> iv2; iv2 = v.validateValue(List.class, propPath, value, true); assertEquals(1, iv2.size()); // null country - + value.setCountry(new Country()); iv2 = v.validateValue(List.class, propPath, value, true); assertEquals(1, iv2.size()); // null country.name - + value.getCountry().setName("NWO"); iv2 = v.validateValue(List.class, propPath, value, true); assertEquals(0, iv2.size()); } - + public interface Foo { } @@ -678,7 +678,8 @@ public class ValidationTest extends ValidationTestBase { @Test public void testKeyedMetadata() { @SuppressWarnings("serial") - BeanDescriptor beanDescriptor = validator.getConstraintsForClass(new HashMap<String, Object>() {}.getClass()); + BeanDescriptor beanDescriptor = validator.getConstraintsForClass(new HashMap<String, Object>() { + }.getClass()); assertNotNull(beanDescriptor); assertFalse(beanDescriptor.isBeanConstrained()); assertNull(beanDescriptor.getConstraintsForProperty("[foo]")); @@ -710,8 +711,8 @@ public class ValidationTest extends ValidationTestBase { @Test public void testValidateClassImplementingCloneable() { - Set<ConstraintViolation<TestCloneableClass>> errors = validator.validate(new TestCloneableClass()); - assertTrue(errors.isEmpty()); + Set<ConstraintViolation<TestCloneableClass>> errors = validator.validate(new TestCloneableClass()); + assertTrue(errors.isEmpty()); } @Test http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java index 4c710d3..2574c1d 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java @@ -36,7 +36,6 @@ import javax.validation.constraints.NotNull; import org.junit.Test; - /** * Checks the correct behavior of the validator resolution algorithm. * @@ -60,7 +59,7 @@ public class ValidatorResolutionTest extends ValidationTestBase { @Constraint(validatedBy = { InvalidPersonNameValidator.class }) @Documented - @Target( { METHOD, FIELD, TYPE }) + @Target({ METHOD, FIELD, TYPE }) @Retention(RUNTIME) public static @interface PersonName { String message() default "Wrong person name"; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java index ee3b9ce..51413f3 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.example; - import org.apache.bval.constraints.HasValue; import javax.validation.Valid; @@ -28,7 +27,7 @@ import javax.validation.Valid; */ public class AccessTestBusinessObject { // test that field-access is used, not method-access - @HasValue({"1", "3"}) + @HasValue({ "1", "3" }) protected String var1; // test that field-access is used, not method-access @@ -52,7 +51,6 @@ public class AccessTestBusinessObject { this._next = next; } - public void setNext(AccessTestBusinessObject next) { this.next = next; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java index c26be32..0d7b2f1 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.example; - import org.apache.bval.constraints.ZipCodeCityCoherence; import javax.validation.GroupSequence; @@ -96,7 +95,7 @@ public class Address implements ZipCodeCityCarrier { * Check both basic constraints and high level ones. * High level constraints are not checked if basic constraints fail. */ - @GroupSequence(value = {Default.class, HighLevelCoherence.class}) + @GroupSequence(value = { Default.class, HighLevelCoherence.class }) public interface Complete { } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java index d7a257a..4cbd6a3 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.example; - import org.apache.bval.constraints.NotEmpty; import javax.validation.GroupSequence; @@ -26,7 +25,7 @@ import javax.validation.Valid; import javax.validation.constraints.Size; import java.util.List; -@GroupSequence({First.class, Author.class, Last.class}) +@GroupSequence({ First.class, Author.class, Last.class }) public class Author { @NotEmpty(groups = Last.class) private String firstName; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java index 28bc13b..e548c9a 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.example; - import org.apache.bval.constraints.NotEmpty; import javax.validation.GroupSequence; @@ -26,7 +25,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -@GroupSequence({First.class, Second.class, Book.class, Last.class}) +@GroupSequence({ First.class, Second.class, Book.class, Last.class }) public class Book { @NotNull(groups = First.class) @NotEmpty(groups = First.class) @@ -76,7 +75,7 @@ public class Book { this.author = author; } - @GroupSequence(value = {First.class, Second.class, Last.class}) + @GroupSequence(value = { First.class, Second.class, Last.class }) public interface All { } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java index 48019ac..94f5e03 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java @@ -33,8 +33,8 @@ public class Continent { @NotNull public String name; - + @Valid public Set<Country> countries = new HashSet<Country>(); - + } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java index 8737e06..23144c1 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.example; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java index a44d488..8348108 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.example; - import org.apache.bval.constraints.Email; import org.apache.bval.constraints.Password; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java index 9d27f40..b482392 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java @@ -36,7 +36,7 @@ public class Employee implements Person { @Override public String getMiddleName() { - return null; // not supported + return null; // not supported } @Override http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java index 0b80cb5..4ee8101 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java @@ -22,11 +22,8 @@ import javax.validation.constraints.Pattern; public class Engine { @Pattern.List({ - @Pattern(regexp = "^[A-Z0-9-]+$", flags = Pattern.Flag.CASE_INSENSITIVE, - message = "must contain alphabetical characters only"), - @Pattern( - regexp = "^....-....-....$", message = "must match ....-....-....")}) + @Pattern(regexp = "^[A-Z0-9-]+$", flags = Pattern.Flag.CASE_INSENSITIVE, message = "must contain alphabetical characters only"), + @Pattern(regexp = "^....-....-....$", message = "must match ....-....-....") }) public String serialNumber; - } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java index b909aa1..261a8ee 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java @@ -26,5 +26,5 @@ import javax.validation.constraints.Max; public class NoValidatorTestEntity { @Max(20) private Object anything; - + }
