mass format
Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/8d2d29aa Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/8d2d29aa Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/8d2d29aa Branch: refs/heads/master Commit: 8d2d29aa9dd157f26b2ac6438b5d57bd753bb577 Parents: 1bc9d2c Author: Matt Benson <[email protected]> Authored: Tue Oct 25 15:34:35 2016 +0000 Committer: Matt Benson <[email protected]> Committed: Tue Oct 25 15:34:35 2016 +0000 ---------------------------------------------------------------------- .../org/apache/bval/BeanValidationContext.java | 3 +- .../java/org/apache/bval/BeanValidator.java | 3 +- .../java/org/apache/bval/MetaBeanBuilder.java | 2 +- .../java/org/apache/bval/MetaBeanFinder.java | 1 - .../org/apache/bval/MetaBeanManagerFactory.java | 1 - .../src/main/java/org/apache/bval/Validate.java | 2 +- .../java/org/apache/bval/ValidationResults.java | 7 +- .../org/apache/bval/model/DynaTypeEnum.java | 1 - .../org/apache/bval/model/MetaAnnotated.java | 4 +- .../java/org/apache/bval/model/MetaBean.java | 4 +- .../apache/bval/model/ValidationListener.java | 5 +- .../java/org/apache/bval/util/BValVersion.java | 2 +- .../bval/util/BeanUtilsPropertyAccess.java | 3 +- .../org/apache/bval/util/IndexedAccess.java | 3 +- .../org/apache/bval/util/PropertyAccess.java | 45 +- .../java/org/apache/bval/util/StringUtils.java | 3 +- .../java/org/apache/bval/util/Validate.java | 2 - .../org/apache/bval/util/ValidationHelper.java | 22 +- .../apache/bval/util/reflection/TypeUtils.java | 43 +- .../org/apache/bval/model/MetaPropertyTest.java | 5 +- .../org/apache/bval/util/StringUtilsTest.java | 2 +- .../constraints/checkdigit/ABANumber.java | 6 +- .../checkdigit/ABANumberValidator.java | 8 +- .../extras/constraints/checkdigit/CUSIP.java | 6 +- .../constraints/checkdigit/CUSIPValidator.java | 14 +- .../extras/constraints/checkdigit/EAN13.java | 6 +- .../constraints/checkdigit/EAN13Validator.java | 8 +- .../extras/constraints/checkdigit/IBAN.java | 6 +- .../constraints/checkdigit/IBANValidator.java | 5 +- .../extras/constraints/checkdigit/ISBN10.java | 6 +- .../constraints/checkdigit/ISBN10Validator.java | 6 +- .../extras/constraints/checkdigit/Luhn.java | 6 +- .../constraints/checkdigit/LuhnValidator.java | 8 +- .../checkdigit/ModulusValidator.java | 16 +- .../extras/constraints/checkdigit/Sedol.java | 6 +- .../constraints/checkdigit/SedolValidator.java | 16 +- .../extras/constraints/checkdigit/Verhoeff.java | 6 +- .../checkdigit/VerhoeffValidator.java | 5 +- .../constraints/creditcard/AmericanExpress.java | 8 +- .../extras/constraints/creditcard/Diners.java | 8 +- .../extras/constraints/creditcard/Discover.java | 8 +- .../constraints/creditcard/Mastercard.java | 8 +- .../extras/constraints/creditcard/Visa.java | 8 +- .../bval/extras/constraints/file/Directory.java | 6 +- .../constraints/file/DirectoryValidator.java | 1 - .../extras/constraints/file/NotDirectory.java | 6 +- .../constraints/file/NotDirectoryValidator.java | 1 - .../bval/extras/constraints/file/Symlink.java | 6 +- .../constraints/file/SymlinkValidator.java | 1 - .../bval/extras/constraints/net/Domain.java | 6 +- .../extras/constraints/net/DomainValidator.java | 565 +++++++++---------- .../extras/constraints/net/InetAddress.java | 6 +- .../constraints/net/InetAddressValidator.java | 7 +- .../checkdigit/ABANumberValidatorTest.java | 9 +- .../checkdigit/AbstractCheckDigitTest.java | 13 +- .../checkdigit/CUSIPValidatorTest.java | 14 +- .../constraints/net/DomainValidatorTest.java | 37 +- .../net/InetAddressValidatorTest.java | 36 +- .../org/apache/bval/json/JSONGenerator.java | 8 +- .../java/org/apache/bval/cdi/BValBinding.java | 2 +- .../java/org/apache/bval/cdi/BValExtension.java | 37 +- .../org/apache/bval/cdi/BValInterceptor.java | 33 +- .../apache/bval/cdi/BValInterceptorBean.java | 5 +- .../apache/bval/cdi/EmptyAnnotationLiteral.java | 50 +- .../java/org/apache/bval/cdi/ValidatorBean.java | 2 +- .../apache/bval/cdi/ValidatorFactoryBean.java | 2 +- .../DecimalMaxValidatorForNumber.java | 2 +- .../java/org/apache/bval/constraints/Email.java | 2 +- .../apache/bval/constraints/EmailValidator.java | 1 - .../constraints/FutureValidatorForCalendar.java | 1 - .../org/apache/bval/constraints/NotEmpty.java | 7 +- .../constraints/PastValidatorForCalendar.java | 1 - .../bval/constraints/PatternValidator.java | 1 - .../SizeValidatorForArrayOfBoolean.java | 2 +- .../SizeValidatorForArrayOfByte.java | 2 +- .../SizeValidatorForArrayOfChar.java | 2 +- .../SizeValidatorForArrayOfDouble.java | 2 +- .../SizeValidatorForArrayOfFloat.java | 2 +- .../constraints/SizeValidatorForArrayOfInt.java | 2 +- .../SizeValidatorForArrayOfLong.java | 2 +- .../SizeValidatorForArrayOfShort.java | 2 +- .../bval/constraints/SizeValidatorForMap.java | 2 +- .../main/java/org/apache/bval/el/ELFacade.java | 14 +- .../bval/jsr/AnnotationConstraintBuilder.java | 63 ++- .../apache/bval/jsr/AnnotationProcessor.java | 11 +- .../apache/bval/jsr/ApacheFactoryContext.java | 4 +- .../bval/jsr/ApacheValidationProvider.java | 3 +- .../apache/bval/jsr/ApacheValidatorFactory.java | 36 +- .../bval/jsr/AppendValidationToBuilder.java | 2 +- .../org/apache/bval/jsr/BeanDescriptorImpl.java | 198 ++++--- .../bval/jsr/BootstrapConfigurationImpl.java | 12 +- .../bval/jsr/CascadingPropertyValidator.java | 8 +- .../org/apache/bval/jsr/ClassValidator.java | 208 ++++--- .../org/apache/bval/jsr/ConfigurationImpl.java | 21 +- .../jsr/ConstraintAnnotationAttributes.java | 3 +- .../org/apache/bval/jsr/ConstraintDefaults.java | 4 +- .../bval/jsr/ConstraintDescriptorImpl.java | 51 +- .../apache/bval/jsr/ConstraintFinderImpl.java | 25 +- .../apache/bval/jsr/ConstraintValidation.java | 59 +- .../bval/jsr/ConstraintValidationListener.java | 38 +- .../jsr/ConstraintValidatorContextImpl.java | 27 +- .../bval/jsr/ConstraintValidatorIdentity.java | 9 +- .../bval/jsr/ConstraintViolationImpl.java | 43 +- .../bval/jsr/ConstructorDescriptorImpl.java | 3 +- .../jsr/DefaultConstraintValidatorFactory.java | 4 +- .../bval/jsr/DefaultMessageInterpolator.java | 54 +- .../jsr/DefaultValidationProviderResolver.java | 11 +- .../apache/bval/jsr/ElementDescriptorImpl.java | 9 +- .../org/apache/bval/jsr/GraphBeanIdentity.java | 18 +- .../apache/bval/jsr/GroupValidationContext.java | 6 +- .../bval/jsr/GroupValidationContextImpl.java | 9 +- .../bval/jsr/InvocableElementDescriptor.java | 9 +- .../java/org/apache/bval/jsr/JsrFeatures.java | 3 - .../org/apache/bval/jsr/JsrMetaBeanFactory.java | 22 +- .../apache/bval/jsr/MethodDescriptorImpl.java | 3 +- .../jsr/NodeBuilderCustomizableContextImpl.java | 9 +- .../apache/bval/jsr/NodeContextBuilderImpl.java | 9 +- .../org/apache/bval/jsr/ParameterAccess.java | 9 +- .../bval/jsr/ParameterDescriptorImpl.java | 4 +- .../apache/bval/jsr/ProcedureDescriptor.java | 1 - .../bval/jsr/ReturnValueDescriptorImpl.java | 3 +- .../java/org/apache/bval/jsr/groups/Group.java | 10 +- .../java/org/apache/bval/jsr/groups/Groups.java | 15 +- .../apache/bval/jsr/groups/GroupsComputer.java | 8 +- .../resolver/CachingTraversableResolver.java | 50 +- .../resolver/DefaultTraversableResolver.java | 40 +- .../jsr/resolver/JPATraversableResolver.java | 15 +- .../jsr/resolver/SimpleTraversableResolver.java | 12 +- .../main/java/org/apache/bval/jsr/util/IOs.java | 20 +- .../LeafNodeBuilderCustomizableContextImpl.java | 12 +- .../util/LeafNodeBuilderDefinedContextImpl.java | 6 +- .../NodeBuilderCustomizableContextImpl.java | 12 +- .../jsr/util/NodeBuilderDefinedContextImpl.java | 9 +- .../bval/jsr/util/NodeContextBuilderImpl.java | 21 +- .../java/org/apache/bval/jsr/util/NodeImpl.java | 2 +- .../apache/bval/jsr/util/PathNavigation.java | 14 +- .../java/org/apache/bval/jsr/util/Proxies.java | 2 +- .../jsr/util/ValidationContextTraversal.java | 12 +- .../apache/bval/jsr/xml/AnnotationIgnores.java | 14 +- .../apache/bval/jsr/xml/AnnotationProxy.java | 3 +- .../org/apache/bval/jsr/xml/MetaConstraint.java | 1 - .../bval/jsr/xml/ValidationMappingParser.java | 194 +++---- .../constraints/AssertFalseValidatorTest.java | 10 +- .../constraints/AssertTrueValidatorTest.java | 10 +- .../bval/constraints/AuthorAddressKnown.java | 4 +- .../apache/bval/constraints/CompanyEmail.java | 17 +- .../bval/constraints/DigitsValidatorTest.java | 2 +- .../apache/bval/constraints/FrenchZipCode.java | 11 +- .../org/apache/bval/constraints/HasValue.java | 6 +- .../bval/constraints/NotNullValidatorTest.java | 8 +- .../bval/constraints/NullValidatorTest.java | 8 +- .../org/apache/bval/constraints/Password.java | 2 +- .../bval/constraints/ZipCodeCityCoherence.java | 8 +- .../ZipCodeCityCoherenceValidator.java | 7 +- .../org/apache/bval/jsr/BeanDescriptorTest.java | 19 +- .../java/org/apache/bval/jsr/BootstrapTest.java | 2 +- .../bval/jsr/ComposedConstraintsTest.java | 3 +- .../bval/jsr/ConstraintCompositionTest.java | 20 +- .../bval/jsr/ConstraintDefinitionsTest.java | 18 +- .../jsr/ConstraintValidatorContextTest.java | 9 +- .../ContextConstraintValidatorFactoryTest.java | 64 +-- .../CustomConstraintValidatorFactoryTest.java | 4 +- .../bval/jsr/CustomValidatorFactoryTest.java | 4 +- .../jsr/DefaultMessageInterpolatorTest.java | 12 +- .../java/org/apache/bval/jsr/Jsr303Test.java | 5 +- .../org/apache/bval/jsr/TckReproducerTest.java | 5 +- .../org/apache/bval/jsr/ValidationTest.java | 43 +- .../bval/jsr/ValidatorResolutionTest.java | 3 +- .../jsr/example/AccessTestBusinessObject.java | 4 +- .../org/apache/bval/jsr/example/Address.java | 3 +- .../org/apache/bval/jsr/example/Author.java | 3 +- .../java/org/apache/bval/jsr/example/Book.java | 5 +- .../org/apache/bval/jsr/example/Continent.java | 4 +- .../org/apache/bval/jsr/example/Country.java | 1 - .../org/apache/bval/jsr/example/Customer.java | 1 - .../org/apache/bval/jsr/example/Employee.java | 2 +- .../org/apache/bval/jsr/example/Engine.java | 7 +- .../bval/jsr/example/NoValidatorTestEntity.java | 2 +- .../apache/bval/jsr/example/RecursiveFoo.java | 1 - .../apache/bval/jsr/example/SizeTestEntity.java | 28 +- .../bval/jsr/example/ZipCodeCityCarrier.java | 1 + .../jsr/extensions/ExampleMethodService.java | 23 +- .../jsr/extensions/MethodValidatorImplTest.java | 15 +- .../apache/bval/jsr/groups/BillableUser.java | 2 +- .../bval/jsr/groups/CyclicGroupSequence2.java | 2 +- .../jsr/groups/DefaultGroupSequenceTest.java | 2 - .../org/apache/bval/jsr/groups/GClass2.java | 2 +- .../org/apache/bval/jsr/groups/GClass3.java | 2 +- .../jsr/groups/GroupSequenceIsolationTest.java | 14 +- .../bval/jsr/groups/GroupSequenceTest.java | 21 +- .../bval/jsr/groups/GroupsComputerTest.java | 1 - .../bval/jsr/groups/implicit/Auditable.java | 12 +- .../apache/bval/jsr/groups/implicit/Order.java | 2 +- .../jsr/groups/inheritance/BillableUser.java | 3 +- .../jsr/groups/inheritance/BuyInOneClick.java | 1 - .../inheritance/GroupInheritanceTest.java | 3 +- .../bval/jsr/groups/redefining/Address.java | 17 +- .../InvalidRedefinedDefaultGroupAddress.java | 6 +- .../redefining/RedefiningDefaultGroupTest.java | 4 +- .../org/apache/bval/jsr/util/TestUtils.java | 3 +- .../bval/jsr/xml/ValidationParserTest.java | 6 +- .../org/apache/bval/arquillian/EJBEnricher.java | 3 +- .../bval/arquillian/jndi/BValJndiFactory.java | 23 +- .../apache/bval/routines/EMailValidation.java | 4 +- .../bval/routines/StandardValidation.java | 41 +- .../org/apache/bval/xml/MetaBeanEnricher.java | 1 - .../org/apache/bval/xml/XMLFeaturesCapable.java | 12 +- .../java/org/apache/bval/xml/XMLMapper.java | 7 +- .../java/org/apache/bval/xml/XMLMetaBean.java | 19 +- .../org/apache/bval/xml/XMLMetaBeanFactory.java | 48 +- .../org/apache/bval/xml/XMLMetaBeanInfos.java | 21 +- .../bval/xml/XMLMetaBeanManagerFactory.java | 10 +- .../apache/bval/xml/XMLMetaBeanReference.java | 2 +- .../apache/bval/xml/XMLMetaBeanURLLoader.java | 6 +- .../org/apache/bval/xml/XMLMetaFeature.java | 1 - .../org/apache/bval/xml/XMLMetaProperty.java | 3 +- .../org/apache/bval/xml/XMLMetaValidator.java | 2 +- .../org/apache/bval/example/BusinessEnum.java | 2 +- .../bval/example/BusinessObjectBeanInfo.java | 8 +- .../bval/routines/StandardValidationTest.java | 4 +- .../org/apache/bval/xml/BeanValidatorTest.java | 24 +- .../apache/bval/xml/XMLMetaBeanInfosTest.java | 20 +- .../apache/bval/xml/XMLMetaBeanManagerTest.java | 5 +- 223 files changed, 1729 insertions(+), 1764 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java b/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java index fc913d1..b0e386b 100644 --- a/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java +++ b/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java @@ -36,8 +36,7 @@ import java.util.Map; * validation * processing per thread.<br/></b> */ -public class BeanValidationContext<T extends ValidationListener> - implements ValidationContext<T> { +public class BeanValidationContext<T extends ValidationListener> implements ValidationContext<T> { /** represent an unknown propertyValue. */ private static final Object UNKNOWN = new Object() { @Override http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/BeanValidator.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/BeanValidator.java b/bval-core/src/main/java/org/apache/bval/BeanValidator.java index 0c8d85d..d4b44b6 100644 --- a/bval-core/src/main/java/org/apache/bval/BeanValidator.java +++ b/bval-core/src/main/java/org/apache/bval/BeanValidator.java @@ -213,7 +213,8 @@ public class BeanValidator<T extends ValidationListener> { * @param context * @param prop */ - protected <VL extends ValidationListener> void validateRelatedBean(ValidationContext<VL> context, MetaProperty prop) { + protected <VL extends ValidationListener> void validateRelatedBean(ValidationContext<VL> context, + MetaProperty prop) { AccessStrategy[] access = prop.getFeature(Features.Property.REF_CASCADE); if (access == null && prop.getMetaBean() != null) { // single property access strategy // save old values from context http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java b/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java index ae4cca5..2c9de93 100644 --- a/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java +++ b/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class MetaBeanBuilder { - private static final Logger log = Logger.getLogger(MetaBeanBuilder.class.getName()); + private static final Logger log = Logger.getLogger(MetaBeanBuilder.class.getName()); /** * here you can install different kinds of factories to create MetaBeans http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/MetaBeanFinder.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/MetaBeanFinder.java b/bval-core/src/main/java/org/apache/bval/MetaBeanFinder.java index 1caa97e..3d0846b 100644 --- a/bval-core/src/main/java/org/apache/bval/MetaBeanFinder.java +++ b/bval-core/src/main/java/org/apache/bval/MetaBeanFinder.java @@ -16,7 +16,6 @@ */ package org.apache.bval; - import org.apache.bval.model.MetaBean; /** http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/MetaBeanManagerFactory.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/MetaBeanManagerFactory.java b/bval-core/src/main/java/org/apache/bval/MetaBeanManagerFactory.java index f2cd8da..85d49b8 100644 --- a/bval-core/src/main/java/org/apache/bval/MetaBeanManagerFactory.java +++ b/bval-core/src/main/java/org/apache/bval/MetaBeanManagerFactory.java @@ -34,7 +34,6 @@ public class MetaBeanManagerFactory { return manager; } - /** * set global meta bean manager, that is responsible * for finding, caching, xml registry and enrichment algorithm. http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/Validate.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/Validate.java b/bval-core/src/main/java/org/apache/bval/Validate.java index 7b432bf..ad895a4 100644 --- a/bval-core/src/main/java/org/apache/bval/Validate.java +++ b/bval-core/src/main/java/org/apache/bval/Validate.java @@ -29,7 +29,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: Annotate an element (parameter) to be validated. * <br> */ -@Target({METHOD, FIELD, CONSTRUCTOR, PARAMETER}) +@Target({ METHOD, FIELD, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) public @interface Validate { /** http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/ValidationResults.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/ValidationResults.java b/bval-core/src/main/java/org/apache/bval/ValidationResults.java index 7ed3102..2ad46f6 100644 --- a/bval-core/src/main/java/org/apache/bval/ValidationResults.java +++ b/bval-core/src/main/java/org/apache/bval/ValidationResults.java @@ -16,7 +16,6 @@ */ package org.apache.bval; - import org.apache.bval.model.ValidationContext; import org.apache.bval.model.ValidationListener; @@ -37,7 +36,6 @@ public class ValidationResults implements ValidationListener, Serializable { private Map<String, List<Error>> errorsByReason; private Map<Object, Map<String, List<Error>>> errorsByOwner; - /** * API to add an error to the validation results. * @@ -51,12 +49,11 @@ public class ValidationResults implements ValidationListener, Serializable { addError(error, context); } - - /** + /** * API to add an error to the validation results. * * @param error - holding the description of reason and object to describe - * the validation error + * the validation error * @param context - null or the context to provide additional information */ @Override http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/model/DynaTypeEnum.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/model/DynaTypeEnum.java b/bval-core/src/main/java/org/apache/bval/model/DynaTypeEnum.java index e4c506c..247678d 100644 --- a/bval-core/src/main/java/org/apache/bval/model/DynaTypeEnum.java +++ b/bval-core/src/main/java/org/apache/bval/model/DynaTypeEnum.java @@ -16,7 +16,6 @@ */ package org.apache.bval.model; - /** * Description: ("artificial" enum with custom values).<br/> */ http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/model/MetaAnnotated.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/model/MetaAnnotated.java b/bval-core/src/main/java/org/apache/bval/model/MetaAnnotated.java index af9a331..e2ab2f9 100755 --- a/bval-core/src/main/java/org/apache/bval/model/MetaAnnotated.java +++ b/bval-core/src/main/java/org/apache/bval/model/MetaAnnotated.java @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.bval.util.ObjectUtils; - public abstract class MetaAnnotated extends Meta { private static final long serialVersionUID = 1L; @@ -31,7 +30,8 @@ public abstract class MetaAnnotated extends Meta { public Annotation[] getAnnotations() { if (annArray == null) { - annArray = annotations.isEmpty() ? ObjectUtils.EMPTY_ANNOTATION_ARRAY : annotations.toArray(new Annotation[annotations.size()]); + annArray = annotations.isEmpty() ? ObjectUtils.EMPTY_ANNOTATION_ARRAY + : annotations.toArray(new Annotation[annotations.size()]); } return annArray; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/model/MetaBean.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/model/MetaBean.java b/bval-core/src/main/java/org/apache/bval/model/MetaBean.java index 8d2cb58..9738f23 100644 --- a/bval-core/src/main/java/org/apache/bval/model/MetaBean.java +++ b/bval-core/src/main/java/org/apache/bval/model/MetaBean.java @@ -214,7 +214,7 @@ public class MetaBean extends FeaturesCapable implements Cloneable, Features.Bea } if (property == null) { this.properties.remove(name); - } else { + } else { property.setParentMetaBean(this); this.properties.put(name, property); } @@ -236,7 +236,7 @@ public class MetaBean extends FeaturesCapable implements Cloneable, Features.Bea super.copyInto(target); final MetaBean copy = (MetaBean) target; if (properties != null) { - copy.properties = new TreeMap<String, MetaProperty>(); + copy.properties = new TreeMap<String, MetaProperty>(); for (Map.Entry<String, MetaProperty> entry : properties.entrySet()) { copy.properties.put(entry.getKey(), (MetaProperty) entry.getValue().copy()); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java b/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java index 8f61c7e..76e4fab 100644 --- a/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java +++ b/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java @@ -16,10 +16,8 @@ */ package org.apache.bval.model; - import java.io.Serializable; - /** * Description: The interface to collect errors found during validation<br/> */ @@ -95,8 +93,7 @@ public interface ValidationListener { */ @Override public String toString() { - return "Error{" + "reason='" + reason + '\'' + ", propertyName='" + - propertyName + '\'' + '}'; + return "Error{" + "reason='" + reason + '\'' + ", propertyName='" + propertyName + '\'' + '}'; } } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/BValVersion.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/BValVersion.java b/bval-core/src/main/java/org/apache/bval/util/BValVersion.java index 06ba3b3..b0c451f 100644 --- a/bval-core/src/main/java/org/apache/bval/util/BValVersion.java +++ b/bval-core/src/main/java/org/apache/bval/util/BValVersion.java @@ -152,7 +152,7 @@ public class BValVersion { * Main method of this class that prints the {@link #toString()} to <code>System.out</code>. * @param args ignored */ - public static void main(String [] args) { + public static void main(String[] args) { System.out.println(new BValVersion().toString()); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/BeanUtilsPropertyAccess.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/BeanUtilsPropertyAccess.java b/bval-core/src/main/java/org/apache/bval/util/BeanUtilsPropertyAccess.java index ba9bed1..c189e72 100755 --- a/bval-core/src/main/java/org/apache/bval/util/BeanUtilsPropertyAccess.java +++ b/bval-core/src/main/java/org/apache/bval/util/BeanUtilsPropertyAccess.java @@ -34,8 +34,7 @@ class BeanUtilsPropertyAccess extends PropertyAccess { @Override protected Object getPublicProperty(Object bean) - throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { if (bean instanceof DynaBean) { return PropertyUtils.getSimpleProperty(bean, getPropertyName()); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java b/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java index 8f33466..ab6a937 100644 --- a/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java +++ b/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java @@ -16,7 +16,6 @@ */ package org.apache.bval.util; - import java.lang.annotation.ElementType; import java.lang.reflect.Array; import java.lang.reflect.Type; @@ -29,7 +28,7 @@ import org.apache.bval.util.reflection.TypeUtils; /** * {@link AccessStrategy} to get an indexed member of an {@link Iterable} or * array object. - */ + */ public class IndexedAccess extends AccessStrategy { private static final TypeVariable<?> ITERABLE_TYPE = Iterable.class.getTypeParameters()[0]; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/PropertyAccess.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/PropertyAccess.java b/bval-core/src/main/java/org/apache/bval/util/PropertyAccess.java index fe690ea..481df3c 100644 --- a/bval-core/src/main/java/org/apache/bval/util/PropertyAccess.java +++ b/bval-core/src/main/java/org/apache/bval/util/PropertyAccess.java @@ -46,11 +46,9 @@ import java.util.logging.Logger; */ @Privilizing(@CallTo(Reflection.class)) public class PropertyAccess extends AccessStrategy { - private static final Logger log = Logger.getLogger(PropertyAccess.class.getName()); - private static final String BEANUTILS = - "org.apache.commons.beanutils.BeanUtils"; - private static final String BEANUTILS_PROPERTY_ACCESS = - "org.apache.bval.util.BeanUtilsPropertyAccess"; + private static final Logger log = Logger.getLogger(PropertyAccess.class.getName()); + private static final String BEANUTILS = "org.apache.commons.beanutils.BeanUtils"; + private static final String BEANUTILS_PROPERTY_ACCESS = "org.apache.bval.util.BeanUtilsPropertyAccess"; private static final Constructor<? extends PropertyAccess> BEANUTILS_PROPERTY_ACCESS_CTOR; private static final ConcurrentMap<Class<?>, Map<String, PropertyDescriptor>> PROPERTY_DESCRIPTORS = new ConcurrentHashMap<Class<?>, Map<String, PropertyDescriptor>>(); @@ -67,11 +65,9 @@ public class PropertyAccess extends AccessStrategy { Constructor<? extends PropertyAccess> ctor; if (useBeanUtils) { try { - final Class<?> beanUtilsPropertyAccess = - Reflection.toClass(BEANUTILS_PROPERTY_ACCESS, cl); + final Class<?> beanUtilsPropertyAccess = Reflection.toClass(BEANUTILS_PROPERTY_ACCESS, cl); - ctor = Reflection.getDeclaredConstructor( - beanUtilsPropertyAccess.asSubclass(PropertyAccess.class), + ctor = Reflection.getDeclaredConstructor(beanUtilsPropertyAccess.asSubclass(PropertyAccess.class), Class.class, String.class); } catch (Exception e) { @@ -90,18 +86,13 @@ public class PropertyAccess extends AccessStrategy { * @return PropertyAccess * @since 1.1.2 */ - public static PropertyAccess getInstance(Class<?> clazz, - String propertyName) { + public static PropertyAccess getInstance(Class<?> clazz, String propertyName) { if (BEANUTILS_PROPERTY_ACCESS_CTOR != null) { try { - return BEANUTILS_PROPERTY_ACCESS_CTOR.newInstance(clazz, - propertyName); + return BEANUTILS_PROPERTY_ACCESS_CTOR.newInstance(clazz, propertyName); } catch (Exception e) { - log.log(Level.WARNING, - String.format( - "Exception encountered attempting to instantiate %s(%s, %s)", - BEANUTILS_PROPERTY_ACCESS_CTOR, clazz, propertyName), - e); + log.log(Level.WARNING, String.format("Exception encountered attempting to instantiate %s(%s, %s)", + BEANUTILS_PROPERTY_ACCESS_CTOR, clazz, propertyName), e); } } return new PropertyAccess(clazz, propertyName); @@ -132,13 +123,12 @@ public class PropertyAccess extends AccessStrategy { return rememberField != null ? ElementType.FIELD : ElementType.METHOD; } - protected Object getPublicProperty(Object bean) throws InvocationTargetException, - NoSuchMethodException, IllegalAccessException { + protected Object getPublicProperty(Object bean) + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { if (bean instanceof Map<?, ?>) { return ((Map<?, ?>) bean).get(propertyName); } - final Method readMethod = - getPropertyReadMethod(propertyName, bean.getClass()); + final Method readMethod = getPropertyReadMethod(propertyName, bean.getClass()); if (readMethod == null) { throw new NoSuchMethodException(toString()); } @@ -163,8 +153,7 @@ public class PropertyAccess extends AccessStrategy { * @throws IllegalAccessException */ public static Object getProperty(Object bean, String propertyName) - throws InvocationTargetException, NoSuchMethodException, - IllegalAccessException { + throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { return getInstance(bean.getClass(), propertyName).get(bean); } @@ -215,10 +204,8 @@ public class PropertyAccess extends AccessStrategy { return null; } - private static Method getPropertyReadMethod(String propertyName, - Class<?> beanClass) { - final Map<String, PropertyDescriptor> propertyDescriptors = - getPropertyDescriptors(beanClass); + private static Method getPropertyReadMethod(String propertyName, Class<?> beanClass) { + final Map<String, PropertyDescriptor> propertyDescriptors = getPropertyDescriptors(beanClass); if (propertyDescriptors.containsKey(propertyName)) { return propertyDescriptors.get(propertyName).getReadMethod(); } @@ -323,7 +310,7 @@ public class PropertyAccess extends AccessStrategy { result = 31 * result + propertyName.hashCode(); return result; } - + private static Map<String, PropertyDescriptor> getPropertyDescriptors(Class<?> type) { if (PROPERTY_DESCRIPTORS.containsKey(type)) { return PROPERTY_DESCRIPTORS.get(type); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/StringUtils.java b/bval-core/src/main/java/org/apache/bval/util/StringUtils.java index 3ac7ed9..f7add27 100644 --- a/bval-core/src/main/java/org/apache/bval/util/StringUtils.java +++ b/bval-core/src/main/java/org/apache/bval/util/StringUtils.java @@ -163,8 +163,7 @@ public final class StringUtils { ret.add(sb.toString()); sb.setLength(0); // reset the string } - } - else { + } else { sb.append(c); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/Validate.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/Validate.java b/bval-core/src/main/java/org/apache/bval/util/Validate.java index 12aca54..f0e0611 100644 --- a/bval-core/src/main/java/org/apache/bval/util/Validate.java +++ b/bval-core/src/main/java/org/apache/bval/util/Validate.java @@ -16,7 +16,6 @@ */ package org.apache.bval.util; - /** * Some used Validate from commons. * @@ -36,7 +35,6 @@ public final class Validate { return object; } - public static void isTrue(final boolean expression, final String message, final Object... values) { if (expression == false) { throw new IllegalArgumentException(String.format(message, values)); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java b/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java index 8fa1894..16438ae 100644 --- a/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java +++ b/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java @@ -58,7 +58,7 @@ public class ValidationHelper { * @param context * The current validation context. */ - static public void validateContext(ValidationContext<?> context, ValidateCallback s, boolean treatMapsLikeBeans) { + public static void validateContext(ValidationContext<?> context, ValidateCallback s, boolean treatMapsLikeBeans) { if (context.getBean() != null) { if (!treatMapsLikeBeans && context.getBean() instanceof Map<?, ?>) { validateMapInContext(context, s); @@ -81,7 +81,8 @@ public class ValidationHelper { * object. * @param s */ - static protected <VL extends ValidationListener> void validateBeanInContext(ValidationContext<VL> context, ValidateCallback s) { + protected static <VL extends ValidationListener> void validateBeanInContext(ValidationContext<VL> context, + ValidateCallback s) { if (getDynamicMetaBean(context) != null) { context.setMetaBean(getDynamicMetaBean(context).resolveMetaBean(context.getBean())); } @@ -96,7 +97,8 @@ public class ValidationHelper { * @param context * The validation context, its current bean must be an array. */ - static protected <VL extends ValidationListener> void validateArrayInContext(ValidationContext<VL> context, ValidateCallback s) { + protected static <VL extends ValidationListener> void validateArrayInContext(ValidationContext<VL> context, + ValidateCallback s) { int index = 0; DynamicMetaBean dyn = getDynamicMetaBean(context); Object[] array = (Object[]) context.getBean(); @@ -130,7 +132,8 @@ public class ValidationHelper { * The validation context, its current bean must implement * {@link Iterable}. */ - static protected <VL extends ValidationListener> void validateIterableInContext(ValidationContext<VL> context, ValidateCallback s) { + protected static <VL extends ValidationListener> void validateIterableInContext(ValidationContext<VL> context, + ValidateCallback s) { final boolean positional = context.getBean() instanceof List<?>; int index = 0; @@ -169,7 +172,8 @@ public class ValidationHelper { * The validation context, its current bean must implement * {@link Map}. */ - static protected <VL extends ValidationListener> void validateMapInContext(ValidationContext<VL> context, ValidateCallback s) { + protected static <VL extends ValidationListener> void validateMapInContext(ValidationContext<VL> context, + ValidateCallback s) { // jsr303 spec: For Map, the value of each Map.Entry is validated (key // is not validated). Map<?, ?> currentBean = (Map<?, ?>) context.getBean(); @@ -202,15 +206,14 @@ public class ValidationHelper { * @return the current {@link DynamicMetaBean} in context, or * <code>null</code> if the current meta bean is not dynamic. */ - static private <VL extends ValidationListener> DynamicMetaBean getDynamicMetaBean(ValidationContext<VL> context) { + private static <VL extends ValidationListener> DynamicMetaBean getDynamicMetaBean(ValidationContext<VL> context) { return context.getMetaBean() instanceof DynamicMetaBean ? (DynamicMetaBean) context.getMetaBean() : null; } - /** * Validate a single bean only, no related beans will be validated. */ - static public <VL extends ValidationListener> void validateBean(ValidationContext<VL> context) { + public static <VL extends ValidationListener> void validateBean(ValidationContext<VL> context) { // execute all property level validations for (MetaProperty prop : context.getMetaBean().getProperties()) { context.setMetaProperty(prop); @@ -224,12 +227,11 @@ public class ValidationHelper { } } - /** * Validate a single property only. Performs all validations * for this property. */ - static public <VL extends ValidationListener> void validateProperty(ValidationContext<VL> context) { + public static <VL extends ValidationListener> void validateProperty(ValidationContext<VL> context) { for (Validation validation : context.getMetaProperty().getValidations()) { validation.validate(context); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/main/java/org/apache/bval/util/reflection/TypeUtils.java ---------------------------------------------------------------------- diff --git a/bval-core/src/main/java/org/apache/bval/util/reflection/TypeUtils.java b/bval-core/src/main/java/org/apache/bval/util/reflection/TypeUtils.java index 3c28837..4734906 100644 --- a/bval-core/src/main/java/org/apache/bval/util/reflection/TypeUtils.java +++ b/bval-core/src/main/java/org/apache/bval/util/reflection/TypeUtils.java @@ -38,13 +38,12 @@ import org.apache.bval.util.Validate; * <p> Utility methods focusing on type inspection, particularly with regard to * generics. </p> * - * @since 3.0 + * @since 1.1.2 */ public class TypeUtils { /** * {@link WildcardType} builder. - * @since 3.2 */ public static class WildcardTypeBuilder { /** @@ -86,7 +85,6 @@ public class TypeUtils { /** * ParameterizedType implementation class. - * @since 3.2 */ private static final class ParameterizedTypeImpl implements ParameterizedType { private final Class<?> raw; @@ -148,7 +146,6 @@ public class TypeUtils { /** * {@inheritDoc} */ - @SuppressWarnings( "deprecation" ) // ObjectUtils.hashCode(Object) has been deprecated in 3.2 @Override public int hashCode() { int result = 71 << 4; @@ -163,7 +160,6 @@ public class TypeUtils { /** * WildcardType implementation class. - * @since 3.2 */ private static final class WildcardTypeImpl implements WildcardType { private static final Type[] EMPTY_BOUNDS = new Type[0]; @@ -423,15 +419,15 @@ public class TypeUtils { } - /** - * <p>Checks if the subject type may be implicitly cast to the target - * parameterized type following the Java generics rules.</p> - * - * @param type the subject type to be assigned to the target type - * @param toParameterizedType the target parameterized type - * @param typeVarAssigns a map with type variables - * @return {@code true} if {@code type} is assignable to {@code toType}. - */ + /** + * <p>Checks if the subject type may be implicitly cast to the target + * parameterized type following the Java generics rules.</p> + * + * @param type the subject type to be assigned to the target type + * @param toParameterizedType the target parameterized type + * @param typeVarAssigns a map with type variables + * @return {@code true} if {@code type} is assignable to {@code toType}. + */ private static boolean isAssignable(final Type type, final ParameterizedType toParameterizedType, final Map<TypeVariable<?>, Type> typeVarAssigns) { if (type == null) { @@ -499,7 +495,6 @@ public class TypeUtils { * @param var the type variable to look up * @param typeVarAssigns the map used for the look up * @return Type or {@code null} if some variable was not in the map - * @since 3.2 */ private static Type unrollVariableAssignments(TypeVariable<?> var, final Map<TypeVariable<?>, Type> typeVarAssigns) { Type result; @@ -1233,7 +1228,6 @@ public class TypeUtils { * @param typeArguments as from {@link TypeUtils#getTypeArguments(Type, Class)} * @param type the type to unroll variable assignments for * @return Type - * @since 3.2 */ public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments, final Type type) { if (typeArguments == null) { @@ -1276,7 +1270,6 @@ public class TypeUtils { * @param typeArguments assignments {@link Map} * @param bounds in which to expand variables * @return {@code bounds} with any variables reassigned - * @since 3.2 */ private static Type[] unrollBounds(final Map<TypeVariable<?>, Type> typeArguments, final Type[] bounds) { Type[] result = bounds; @@ -1299,7 +1292,6 @@ public class TypeUtils { * * @param type the type to check for type variables * @return boolean - * @since 3.2 */ public static boolean containsTypeVariables(final Type type) { if (type instanceof TypeVariable<?>) { @@ -1333,7 +1325,6 @@ public class TypeUtils { * @param typeArguments the types used for parameterization * * @return {@link ParameterizedType} - * @since 3.2 */ public static final ParameterizedType parameterizeWithOwner(final Type owner, final Class<?> raw, final Type... typeArguments) { @@ -1359,7 +1350,6 @@ public class TypeUtils { /** * Get a {@link WildcardTypeBuilder}. * @return {@link WildcardTypeBuilder} - * @since 3.2 */ public static WildcardTypeBuilder wildcardType() { return new WildcardTypeBuilder(); @@ -1371,9 +1361,7 @@ public class TypeUtils { * @param t1 the first type * @param t2 the second type * @return boolean - * @since 3.2 */ - @SuppressWarnings( "deprecation" ) // ObjectUtils.equals(Object, Object) has been deprecated in 3.2 public static boolean equals(final Type t1, final Type t2) { if (t1 == t2) { return true; @@ -1402,7 +1390,6 @@ public class TypeUtils { * @param p LHS * @param t RHS * @return boolean - * @since 3.2 */ private static boolean equals(final ParameterizedType p, final Type t) { if (t instanceof ParameterizedType) { @@ -1419,7 +1406,6 @@ public class TypeUtils { * @param a LHS * @param t RHS * @return boolean - * @since 3.2 */ private static boolean equals(final GenericArrayType a, final Type t) { return t instanceof GenericArrayType @@ -1431,7 +1417,6 @@ public class TypeUtils { * @param w LHS * @param t RHS * @return boolean - * @since 3.2 */ private static boolean equals(final WildcardType w, final Type t) { if (t instanceof WildcardType) { @@ -1447,7 +1432,6 @@ public class TypeUtils { * @param t1 LHS * @param t2 RHS * @return boolean - * @since 3.2 */ private static boolean equals(final Type[] t1, final Type[] t2) { if (t1.length == t2.length) { @@ -1466,7 +1450,6 @@ public class TypeUtils { * * @param type the type to create a String representation for, not {@code null} * @return String - * @since 3.2 */ public static String toString(final Type type) { Validate.notNull(type); @@ -1493,7 +1476,6 @@ public class TypeUtils { * Format a {@link Class} as a {@link String}. * @param c {@code Class} to format * @return String - * @since 3.2 */ private static String classToString(final Class<?> c) { final StringBuilder buf = new StringBuilder(); @@ -1515,7 +1497,6 @@ public class TypeUtils { * Format a {@link TypeVariable} as a {@link String}. * @param v {@code TypeVariable} to format * @return String - * @since 3.2 */ private static String typeVariableToString(final TypeVariable<?> v) { final StringBuilder buf = new StringBuilder(v.getName()); @@ -1531,7 +1512,6 @@ public class TypeUtils { * Format a {@link ParameterizedType} as a {@link String}. * @param p {@code ParameterizedType} to format * @return String - * @since 3.2 */ private static String parameterizedTypeToString(final ParameterizedType p) { final StringBuilder buf = new StringBuilder(); @@ -1558,7 +1538,6 @@ public class TypeUtils { * Format a {@link WildcardType} as a {@link String}. * @param w {@code WildcardType} to format * @return String - * @since 3.2 */ private static String wildcardTypeToString(final WildcardType w) { final StringBuilder buf = new StringBuilder().append('?'); @@ -1576,7 +1555,6 @@ public class TypeUtils { * Format a {@link GenericArrayType} as a {@link String}. * @param g {@code GenericArrayType} to format * @return String - * @since 3.2 */ private static String genericArrayTypeToString(final GenericArrayType g) { return String.format("%s[]", toString(g.getGenericComponentType())); @@ -1588,7 +1566,6 @@ public class TypeUtils { * @param sep separator * @param types to append * @return {@code buf} - * @since 3.2 */ private static StringBuilder appendAllTo(final StringBuilder buf, final String sep, final Type... types) { if (types.length > 0) { http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/test/java/org/apache/bval/model/MetaPropertyTest.java ---------------------------------------------------------------------- diff --git a/bval-core/src/test/java/org/apache/bval/model/MetaPropertyTest.java b/bval-core/src/test/java/org/apache/bval/model/MetaPropertyTest.java index e883e7c..88a34ba 100644 --- a/bval-core/src/test/java/org/apache/bval/model/MetaPropertyTest.java +++ b/bval-core/src/test/java/org/apache/bval/model/MetaPropertyTest.java @@ -35,10 +35,9 @@ public class MetaPropertyTest { prop.setType(String.class); assertEquals(String.class, prop.getTypeClass()); assertEquals(String.class, prop.getType()); - prop.setType(new DynaTypeEnum(ExampleEnum.class, ExampleEnum.VALUE1.name(), - ExampleEnum.VALUE3.name())); + prop.setType(new DynaTypeEnum(ExampleEnum.class, ExampleEnum.VALUE1.name(), ExampleEnum.VALUE3.name())); assertEquals(ExampleEnum.class, prop.getTypeClass()); - assertEquals(2, ((DynaTypeEnum)prop.getType()).getEnumConstants().length); + assertEquals(2, ((DynaTypeEnum) prop.getType()).getEnumConstants().length); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-core/src/test/java/org/apache/bval/util/StringUtilsTest.java ---------------------------------------------------------------------- diff --git a/bval-core/src/test/java/org/apache/bval/util/StringUtilsTest.java b/bval-core/src/test/java/org/apache/bval/util/StringUtilsTest.java index 7688592..1939081 100644 --- a/bval-core/src/test/java/org/apache/bval/util/StringUtilsTest.java +++ b/bval-core/src/test/java/org/apache/bval/util/StringUtilsTest.java @@ -27,6 +27,6 @@ public class StringUtilsTest { Assert.assertArrayEquals(new String[0], StringUtils.split("")); Assert.assertArrayEquals(new String[0], StringUtils.split(" ")); Assert.assertArrayEquals(new String[0], StringUtils.split(" \n ")); - Assert.assertArrayEquals(new String[]{"a", "bbb", "cccc"}, StringUtils.split(" a bbb cccc")); + Assert.assertArrayEquals(new String[] { "a", "bbb", "cccc" }, StringUtils.split(" a bbb cccc")); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java index d3c7e4f..921ffbc 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as ABANumber<br/> */ @Documented -@Constraint( validatedBy = ABANumberValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = ABANumberValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface ABANumber { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidator.java index 4eed858..ec18902 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidator.java @@ -38,11 +38,10 @@ package org.apache.bval.extras.constraints.checkdigit; * <a href="http://en.wikipedia.org/wiki/Routing_transit_number";>Wikipedia - * Routing transit number</a>. */ -public final class ABANumberValidator - extends ModulusValidator<ABANumber> { +public final class ABANumberValidator extends ModulusValidator<ABANumber> { /** weighting given to digits depending on their right position */ - private static final int[] POSITION_WEIGHT = new int[] {3, 1, 7}; + private static final int[] POSITION_WEIGHT = new int[] { 3, 1, 7 }; public ABANumberValidator() { super(10); @@ -61,8 +60,7 @@ public final class ABANumberValidator * {@inheritDoc} */ @Override - protected int weightedValue( int charValue, int leftPos, int rightPos ) - throws Exception { + protected int weightedValue(int charValue, int leftPos, int rightPos) throws Exception { int weight = POSITION_WEIGHT[rightPos % 3]; return (charValue * weight); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java index 876466a..85e84fd 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as CUSIP<br/> */ @Documented -@Constraint( validatedBy = CUSIPValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = CUSIPValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface CUSIP { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidator.java index 82e8c29..2a4aa5f 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidator.java @@ -37,11 +37,10 @@ import static java.lang.Character.getNumericValue; * See <a href="http://en.wikipedia.org/wiki/CUSIP";>Wikipedia - CUSIP</a> * for more details. */ -public final class CUSIPValidator - extends ModulusValidator<CUSIP> { +public final class CUSIPValidator extends ModulusValidator<CUSIP> { /** weighting given to digits depending on their right position */ - private static final int[] POSITION_WEIGHT = new int[] {2, 1}; + private static final int[] POSITION_WEIGHT = new int[] { 2, 1 }; public CUSIPValidator() { super(10); @@ -60,8 +59,7 @@ public final class CUSIPValidator * {@inheritDoc} */ @Override - protected int weightedValue( int charValue, int leftPos, int rightPos ) - throws Exception { + protected int weightedValue(int charValue, int leftPos, int rightPos) throws Exception { int weight = POSITION_WEIGHT[rightPos % 2]; int weightedValue = (charValue * weight); return sumDigits(weightedValue); @@ -74,11 +72,7 @@ public final class CUSIPValidator protected int toInt(char character, int leftPos, int rightPos) { int charValue = getNumericValue(character); if (charValue < 0 || charValue > 35) { - throw new IllegalArgumentException("Invalid Character[" - + leftPos - + "] = '" - + charValue - + "'"); + throw new IllegalArgumentException("Invalid Character[" + leftPos + "] = '" + charValue + "'"); } return charValue; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java index 11c84bf..4f835f6 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as EAN13<br/> */ @Documented -@Constraint( validatedBy = EAN13Validator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = EAN13Validator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface EAN13 { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13Validator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13Validator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13Validator.java index 4270394..9cac77e 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13Validator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13Validator.java @@ -39,11 +39,10 @@ package org.apache.bval.extras.constraints.checkdigit; * Standard Book Number (ISBN)</a>.</li> * </ul> */ -public final class EAN13Validator - extends ModulusValidator<EAN13> { +public final class EAN13Validator extends ModulusValidator<EAN13> { /** weighting given to digits depending on their right position */ - private static final int[] POSITION_WEIGHT = new int[] {3, 1}; + private static final int[] POSITION_WEIGHT = new int[] { 3, 1 }; public EAN13Validator() { super(10); @@ -60,8 +59,7 @@ public final class EAN13Validator * {@inheritDoc} */ @Override - protected int weightedValue( int charValue, int leftPos, int rightPos ) - throws Exception { + protected int weightedValue(int charValue, int leftPos, int rightPos) throws Exception { int weight = POSITION_WEIGHT[rightPos % 2]; return (charValue * weight); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java index e96e04b..f0685c0 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as IBAN<br/> */ @Documented -@Constraint( validatedBy = IBANValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = IBANValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface IBAN { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java index ff9bdc0..38eace6 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java @@ -40,8 +40,7 @@ import static java.lang.Character.getNumericValue; * <a href="http://en.wikipedia.org/wiki/International_Bank_Account_Number";>Wikipedia - * IBAN number</a>. */ -public final class IBANValidator - implements ConstraintValidator<IBAN, String> { +public final class IBANValidator implements ConstraintValidator<IBAN, String> { private static final long MAX = 999999999; @@ -76,7 +75,7 @@ public final class IBANValidator * {@inheritDoc} */ @Override - public void initialize( IBAN iban ) { + public void initialize(IBAN iban) { // not needed } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java index e3ae433..a3a1bc3 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as ISBN10<br/> */ @Documented -@Constraint( validatedBy = ISBN10Validator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = ISBN10Validator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface ISBN10 { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10Validator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10Validator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10Validator.java index 7210062..141beee 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10Validator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10Validator.java @@ -41,8 +41,7 @@ package org.apache.bval.extras.constraints.checkdigit; * Transition details</a>.</li> * </ul> */ -public final class ISBN10Validator - extends ModulusValidator<ISBN10> { +public final class ISBN10Validator extends ModulusValidator<ISBN10> { public ISBN10Validator() { super(11); @@ -58,8 +57,7 @@ public final class ISBN10Validator * {@inheritDoc} */ @Override - protected int weightedValue( int charValue, int leftPos, int rightPos ) - throws Exception { + protected int weightedValue(int charValue, int leftPos, int rightPos) throws Exception { return (charValue * rightPos); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java index bc84aa7..3bc186e 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as Luhn<br/> */ @Documented -@Constraint( validatedBy = LuhnValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = LuhnValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Luhn { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/LuhnValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/LuhnValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/LuhnValidator.java index 030fe3c..cb66248 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/LuhnValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/LuhnValidator.java @@ -34,11 +34,10 @@ package org.apache.bval.extras.constraints.checkdigit; * See <a href="http://en.wikipedia.org/wiki/Luhn_algorithm";>Wikipedia</a> * for more details. */ -public final class LuhnValidator - extends ModulusValidator<Luhn> { +public final class LuhnValidator extends ModulusValidator<Luhn> { /** weighting given to digits depending on their right position */ - private static final int[] POSITION_WEIGHT = new int[] {2, 1}; + private static final int[] POSITION_WEIGHT = new int[] { 2, 1 }; public LuhnValidator() { super(10); @@ -55,8 +54,7 @@ public final class LuhnValidator * {@inheritDoc} */ @Override - protected int weightedValue( int charValue, int leftPos, int rightPos ) - throws Exception { + protected int weightedValue(int charValue, int leftPos, int rightPos) throws Exception { int weight = POSITION_WEIGHT[rightPos % 2]; int weightedValue = (charValue * weight); return (weightedValue > 9 ? (weightedValue - 9) : weightedValue); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java index 3f84eb2..f25bea4 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java @@ -38,8 +38,7 @@ import static java.lang.Character.isDigit; * * @param <A> */ -abstract class ModulusValidator<A extends Annotation> - implements ConstraintValidator<A, String> { +abstract class ModulusValidator<A extends Annotation> implements ConstraintValidator<A, String> { private final int modulus; @@ -66,7 +65,7 @@ abstract class ModulusValidator<A extends Annotation> int total = 0; for (int i = 0; i < code.length(); i++) { int lth = code.length(); - int leftPos = i + 1; + int leftPos = i + 1; int rightPos = lth - i; try { int charValue = toInt(code.charAt(i), leftPos, rightPos); @@ -96,8 +95,7 @@ abstract class ModulusValidator<A extends Annotation> * @param rightPos The position of the character in the code, counting from right to left * @return The weighted value of the character */ - protected abstract int weightedValue(int charValue, int leftPos, int rightPos) - throws Exception; + protected abstract int weightedValue(int charValue, int leftPos, int rightPos) throws Exception; /** * Convert a character at a specified position to an integer value. @@ -115,11 +113,7 @@ abstract class ModulusValidator<A extends Annotation> if (isDigit(character)) { return getNumericValue(character); } - throw new IllegalArgumentException("Invalid Character[" - + leftPos - + "] = '" - + character - + "'"); + throw new IllegalArgumentException("Invalid Character[" + leftPos + "] = '" + character + "'"); } /** @@ -133,7 +127,7 @@ abstract class ModulusValidator<A extends Annotation> int todo = number; while (todo > 0) { total += todo % 10; - todo = todo / 10; + todo = todo / 10; } return total; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java index aa86533..e69947c 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as Sedol<br/> */ @Documented -@Constraint( validatedBy = SedolValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = SedolValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Sedol { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/SedolValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/SedolValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/SedolValidator.java index 4476084..c28fd48 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/SedolValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/SedolValidator.java @@ -37,11 +37,10 @@ import static java.lang.Character.getNumericValue; * See <a href="http://en.wikipedia.org/wiki/SEDOL";>Wikipedia - SEDOL</a> * for more details. */ -public final class SedolValidator - extends ModulusValidator<Sedol> { +public final class SedolValidator extends ModulusValidator<Sedol> { /** weighting given to digits depending on their right position */ - private static final int[] POSITION_WEIGHT = new int[] {1, 3, 1, 7, 3, 9, 1}; + private static final int[] POSITION_WEIGHT = new int[] { 1, 3, 1, 7, 3, 9, 1 }; public SedolValidator() { super(10); @@ -51,8 +50,7 @@ public final class SedolValidator * {@inheritDoc} */ @Override - protected int weightedValue( int charValue, int leftPos, int rightPos ) - throws Exception { + protected int weightedValue(int charValue, int leftPos, int rightPos) throws Exception { return (charValue * POSITION_WEIGHT[leftPos - 1]); } @@ -60,14 +58,10 @@ public final class SedolValidator * {@inheritDoc} */ @Override - protected int toInt( char character, int leftPos, int rightPos ) { + protected int toInt(char character, int leftPos, int rightPos) { int charValue = getNumericValue(character); if (charValue < 0 || charValue > 35) { - throw new IllegalArgumentException("Invalid Character[" - + leftPos - + "] = '" - + charValue - + "'"); + throw new IllegalArgumentException("Invalid Character[" + leftPos + "] = '" + charValue + "'"); } return charValue; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java index ea5bf94..e051a39 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate as Verhoeff<br/> */ @Documented -@Constraint( validatedBy = VerhoeffValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = VerhoeffValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Verhoeff { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java index bd0d4eb..5a7d76b 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java @@ -33,9 +33,9 @@ import static java.lang.Character.getNumericValue; * See <a href="http://en.wikipedia.org/wiki/Verhoeff_algorithm";>Wikipedia * - Verhoeff algorithm</a> for more details. */ -public final class VerhoeffValidator - implements ConstraintValidator<Verhoeff, String> { +public final class VerhoeffValidator implements ConstraintValidator<Verhoeff, String> { + //@formatter:off /** D - multiplication table */ private static final int[][] D_TABLE = new int[][] { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, @@ -59,6 +59,7 @@ public final class VerhoeffValidator {4, 2, 8, 6, 5, 7, 3, 9, 0, 1}, {2, 7, 9, 3, 8, 0, 6, 4, 1, 5}, {7, 0, 4, 6, 9, 1, 3, 2, 5, 8}}; + //@formatter:on /** * {@inheritDoc} http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java index c507e55..3d08d19 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java @@ -43,10 +43,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; */ @Documented @Luhn -@Pattern(regexp="^(3[47]\\d{13})$") -@Constraint(validatedBy={}) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Pattern(regexp = "^(3[47]\\d{13})$") +@Constraint(validatedBy = {}) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface AmericanExpress { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java index a32786b..de6fd35 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java @@ -43,10 +43,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; */ @Documented @Luhn -@Pattern(regexp="^(30[0-5]\\d{11}|3095\\d{10}|36\\d{12}|3[8-9]\\d{12})$") -@Constraint(validatedBy={}) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Pattern(regexp = "^(30[0-5]\\d{11}|3095\\d{10}|36\\d{12}|3[8-9]\\d{12})$") +@Constraint(validatedBy = {}) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Diners { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java index 10da629..c445837 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java @@ -43,10 +43,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; */ @Documented @Luhn -@Pattern(regexp="^((6011\\d{12})|(64[4-9]\\d{13})|(65\\d{14}))$") -@Constraint(validatedBy={}) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Pattern(regexp = "^((6011\\d{12})|(64[4-9]\\d{13})|(65\\d{14}))$") +@Constraint(validatedBy = {}) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Discover { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java index 6061414..f30482e 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java @@ -43,10 +43,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; */ @Documented @Luhn -@Pattern(regexp="^(5[1-5]\\d{14})$") -@Constraint(validatedBy={}) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Pattern(regexp = "^(5[1-5]\\d{14})$") +@Constraint(validatedBy = {}) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Mastercard { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java index 1829db0..2177f4a 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java @@ -43,10 +43,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; */ @Documented @Luhn -@Pattern(regexp="^(4)(\\d{12}|\\d{15})$") -@Constraint(validatedBy={}) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Pattern(regexp = "^(4)(\\d{12}|\\d{15})$") +@Constraint(validatedBy = {}) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Visa { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java index bafa8e9..9604fab 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate a java.io.File is a directory<br/> */ @Documented -@Constraint( validatedBy = DirectoryValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = DirectoryValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Directory { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java index ffc2980..a95ebde 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java @@ -22,7 +22,6 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.io.File; - /** * Description: <br/> */ http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java index cff6864..a3b85a2 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate a java.io.File is not a directory<br/> */ @Documented -@Constraint( validatedBy = DirectoryValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = DirectoryValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface NotDirectory { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java index c2d1d7c..026f29a 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java @@ -22,7 +22,6 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.io.File; - /** * Description: <br/> */ http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java index 10cc22e..8be6687 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate a java.io.File is a symbolic link<br/> */ @Documented -@Constraint( validatedBy = SymlinkValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = SymlinkValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Symlink { Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java index 1aa7810..6ed85fd 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java @@ -23,7 +23,6 @@ import javax.validation.ConstraintValidatorContext; import java.io.File; import java.io.IOException; - /** * Description: <br/> */ http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java ---------------------------------------------------------------------- diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java index 2810462..6f3aa97 100644 --- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java +++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java @@ -39,9 +39,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Description: annotation to validate a java.io.File is a directory<br/> */ @Documented -@Constraint( validatedBy = DomainValidator.class ) -@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } ) -@Retention( RUNTIME ) +@Constraint(validatedBy = DomainValidator.class) +@Target({ FIELD, ANNOTATION_TYPE, PARAMETER }) +@Retention(RUNTIME) public @interface Domain { Class<?>[] groups() default {};
