Return-Path: X-Original-To: apmail-bval-commits-archive@www.apache.org Delivered-To: apmail-bval-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6055810CA2 for ; Fri, 16 Aug 2013 15:35:44 +0000 (UTC) Received: (qmail 64972 invoked by uid 500); 16 Aug 2013 15:35:44 -0000 Delivered-To: apmail-bval-commits-archive@bval.apache.org Received: (qmail 64891 invoked by uid 500); 16 Aug 2013 15:35:44 -0000 Mailing-List: contact commits-help@bval.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@bval.apache.org Delivered-To: mailing list commits@bval.apache.org Received: (qmail 64862 invoked by uid 99); 16 Aug 2013 15:35:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Aug 2013 15:35:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Aug 2013 15:35:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EBD952388860; Fri, 16 Aug 2013 15:35:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1514750 [1/2] - in /bval/branches/bval-11: bval-core/src/main/java/org/apache/bval/ bval-core/src/main/java/org/apache/bval/model/ bval-core/src/main/java/org/apache/bval/util/ bval-extras/src/main/java/org/apache/bval/extras/constraints/c... Date: Fri, 16 Aug 2013 15:35:11 -0000 To: commits@bval.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130816153514.EBD952388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Fri Aug 16 15:35:08 2013 New Revision: 1514750 URL: http://svn.apache.org/r1514750 Log: imports + getting rid of a helper class Removed: bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/util/ConstraintDefinitionValidator.java Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidator.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/IntrospectorMetaBeanFactory.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanCache.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/Validate.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/KeyedAccess.java bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ConfigurationStateProvider.java bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/GuiceAwareConstraintValidatorFactory.java bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/Validate.java bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidateMethodInterceptor.java bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidatorFactoryProvider.java bval/branches/bval-11/bval-guice/src/test/java/org/apache/bval/guice/GuiceAwareValidationTestCase.java bval/branches/bval-11/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/BValExtension.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/Email.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmpty.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationProcessor.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheValidationProvider.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/CascadingPropertyValidator.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintAnnotationAttributes.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintFinderImpl.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidatorContextImpl.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/ElementDescriptorImpl.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/Jsr303MetaBeanFactory.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/NodeContextBuilderImpl.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/PropertyDescriptorImpl.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/Group.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/groups/GroupsComputer.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/util/NodeBuilderDefinedContextImpl.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/util/NodeContextBuilderImpl.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/util/PathNavigation.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/util/ValidationContextTraversal.java bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/MetaConstraint.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/constraints/CompanyEmail.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/constraints/FrenchZipCode.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/constraints/HasValue.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/BeanDescriptorTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/BootstrapTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/CircularReferencesTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/ComposedConstraintsTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/ConstraintCompositionTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/ConstraintDefinitionsTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/ContextConstraintValidatorFactoryTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/CustomConstraintValidatorFactoryTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/CustomValidatorFactoryTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/PayloadTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/TckReproducerTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/ValidationTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/ValidatorResolutionTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/example/Library.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/CollectionValidationTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/GroupSequenceIsolationTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/groups/GroupSequenceTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/PathImplTest.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/util/TestUtils.java bval/branches/bval-11/bval-jsr303/src/test/java/org/apache/bval/jsr303/xml/ValidationParserTest.java bval/branches/bval-11/bval-tck11/work-tests-suite.xml bval/branches/bval-11/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java bval/branches/bval-11/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java bval/branches/bval-11/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanInfos.java bval/branches/bval-11/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaElement.java bval/branches/bval-11/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaProperty.java Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidationContext.java Fri Aug 16 15:35:08 2013 @@ -16,7 +16,11 @@ */ package org.apache.bval; -import org.apache.bval.model.*; +import org.apache.bval.model.FeaturesCapable; +import org.apache.bval.model.MetaBean; +import org.apache.bval.model.MetaProperty; +import org.apache.bval.model.ValidationContext; +import org.apache.bval.model.ValidationListener; import org.apache.bval.util.AccessStrategy; import org.apache.bval.util.PropertyAccess; Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidator.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/BeanValidator.java Fri Aug 16 15:35:08 2013 @@ -16,10 +16,6 @@ */ package org.apache.bval; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Collection; - import org.apache.bval.model.Features; import org.apache.bval.model.MetaBean; import org.apache.bval.model.MetaProperty; @@ -29,6 +25,10 @@ import org.apache.bval.util.AccessStrate import org.apache.bval.util.PropertyAccess; import org.apache.bval.util.ValidationHelper; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; + // TODO: centralize treatMapsLikeBeans /** Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/IntrospectorMetaBeanFactory.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/IntrospectorMetaBeanFactory.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/IntrospectorMetaBeanFactory.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/IntrospectorMetaBeanFactory.java Fri Aug 16 15:35:08 2013 @@ -27,7 +27,9 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Enumeration; -import static org.apache.bval.model.Features.Property.*; +import static org.apache.bval.model.Features.Property.HIDDEN; +import static org.apache.bval.model.Features.Property.PREFERRED; +import static org.apache.bval.model.Features.Property.READONLY; /** * Description: use information from java.beans.Introspector in MetaBeans. The PropertyDescriptor can contain info about Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanBuilder.java Fri Aug 16 15:35:08 2013 @@ -20,11 +20,10 @@ import org.apache.bval.model.MetaBean; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ClassUtils; -import java.util.logging.Level; -import java.util.logging.Logger; - import java.util.HashMap; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Description: internal implementation class to construct metabeans with Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanCache.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanCache.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanCache.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/MetaBeanCache.java Fri Aug 16 15:35:08 2013 @@ -16,13 +16,13 @@ */ package org.apache.bval; +import org.apache.bval.model.MetaBean; + import java.io.Serializable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.bval.model.MetaBean; - /** * Description: a cache to hold metabeans by id and by class.
*/ Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/Validate.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/Validate.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/Validate.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/Validate.java Fri Aug 16 15:35:08 2013 @@ -19,7 +19,10 @@ package org.apache.bval; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/model/ValidationListener.java Fri Aug 16 15:35:08 2013 @@ -17,8 +17,6 @@ package org.apache.bval.model; -import org.apache.bval.model.ValidationContext; - import java.io.Serializable; Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/IndexedAccess.java Fri Aug 16 15:35:08 2013 @@ -16,6 +16,8 @@ */ package org.apache.bval.util; +import org.apache.commons.lang3.reflect.TypeUtils; + import java.lang.annotation.ElementType; import java.lang.reflect.Array; import java.lang.reflect.Type; @@ -23,8 +25,6 @@ import java.lang.reflect.TypeVariable; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.reflect.TypeUtils; - /** * {@link AccessStrategy} to get an indexed member of an {@link Iterable} or * array object. Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/KeyedAccess.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/KeyedAccess.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/KeyedAccess.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/KeyedAccess.java Fri Aug 16 15:35:08 2013 @@ -16,13 +16,13 @@ */ package org.apache.bval.util; +import org.apache.commons.lang3.reflect.TypeUtils; + import java.lang.annotation.ElementType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.Map; -import org.apache.commons.lang3.reflect.TypeUtils; - /** * {@link AccessStrategy} to get a keyed value from a {@link Map}. Contains * special handling when a string key is used against a container type whose key Modified: bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java (original) +++ bval/branches/bval-11/bval-core/src/main/java/org/apache/bval/util/ValidationHelper.java Fri Aug 16 15:35:08 2013 @@ -18,8 +18,6 @@ */ package org.apache.bval.util; -import java.util.List; -import java.util.Map; import org.apache.bval.DynamicMetaBean; import org.apache.bval.model.MetaBean; import org.apache.bval.model.MetaProperty; @@ -27,6 +25,9 @@ import org.apache.bval.model.Validation; import org.apache.bval.model.ValidationContext; import org.apache.bval.model.ValidationListener; +import java.util.List; +import java.util.Map; + /** * Stateless helper methods used by the validators. Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java Fri Aug 16 15:35:08 2013 @@ -18,11 +18,11 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.Character.getNumericValue; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import static java.lang.Character.getNumericValue; + /** * IBAN (International Bank Account Number) Check Digit calculation/validation. *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java Fri Aug 16 15:35:08 2013 @@ -18,13 +18,12 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.Character.getNumericValue; -import static java.lang.Character.isDigit; - -import java.lang.annotation.Annotation; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import java.lang.annotation.Annotation; + +import static java.lang.Character.getNumericValue; +import static java.lang.Character.isDigit; /** * Abstract Modulus Check digit calculation/validation. Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java Fri Aug 16 15:35:08 2013 @@ -18,17 +18,16 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java Fri Aug 16 15:35:08 2013 @@ -18,11 +18,11 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static java.lang.Character.getNumericValue; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import static java.lang.Character.getNumericValue; + /** * Verhoeff (Dihedral) Check Digit calculation/validation. *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java Fri Aug 16 15:35:08 2013 @@ -18,20 +18,19 @@ */ package org.apache.bval.extras.constraints.creditcard; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; +import org.apache.bval.extras.constraints.checkdigit.Luhn; import javax.validation.Constraint; import javax.validation.Payload; import javax.validation.constraints.Pattern; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; -import org.apache.bval.extras.constraints.checkdigit.Luhn; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java Fri Aug 16 15:35:08 2013 @@ -18,20 +18,19 @@ */ package org.apache.bval.extras.constraints.creditcard; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; +import org.apache.bval.extras.constraints.checkdigit.Luhn; import javax.validation.Constraint; import javax.validation.Payload; import javax.validation.constraints.Pattern; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; -import org.apache.bval.extras.constraints.checkdigit.Luhn; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java Fri Aug 16 15:35:08 2013 @@ -18,20 +18,19 @@ */ package org.apache.bval.extras.constraints.creditcard; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; +import org.apache.bval.extras.constraints.checkdigit.Luhn; import javax.validation.Constraint; import javax.validation.Payload; import javax.validation.constraints.Pattern; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; -import org.apache.bval.extras.constraints.checkdigit.Luhn; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java Fri Aug 16 15:35:08 2013 @@ -18,20 +18,19 @@ */ package org.apache.bval.extras.constraints.creditcard; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; +import org.apache.bval.extras.constraints.checkdigit.Luhn; import javax.validation.Constraint; import javax.validation.Payload; import javax.validation.constraints.Pattern; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; -import org.apache.bval.extras.constraints.checkdigit.Luhn; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java Fri Aug 16 15:35:08 2013 @@ -18,20 +18,19 @@ */ package org.apache.bval.extras.constraints.creditcard; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; +import org.apache.bval.extras.constraints.checkdigit.Luhn; import javax.validation.Constraint; import javax.validation.Payload; import javax.validation.constraints.Pattern; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; -import org.apache.bval.extras.constraints.checkdigit.Luhn; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** *

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java Fri Aug 16 15:35:08 2013 @@ -24,7 +24,9 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java Fri Aug 16 15:35:08 2013 @@ -18,10 +18,9 @@ */ package org.apache.bval.extras.constraints.file; -import java.io.File; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import java.io.File; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java Fri Aug 16 15:35:08 2013 @@ -24,7 +24,9 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java Fri Aug 16 15:35:08 2013 @@ -18,10 +18,9 @@ */ package org.apache.bval.extras.constraints.file; -import java.io.File; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import java.io.File; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java Fri Aug 16 15:35:08 2013 @@ -24,7 +24,9 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java Fri Aug 16 15:35:08 2013 @@ -18,11 +18,10 @@ */ package org.apache.bval.extras.constraints.file; -import java.io.File; -import java.io.IOException; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import java.io.File; +import java.io.IOException; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java Fri Aug 16 15:35:08 2013 @@ -24,7 +24,9 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java Fri Aug 16 15:35:08 2013 @@ -18,14 +18,13 @@ */ package org.apache.bval.extras.constraints.net; -import static java.util.Arrays.asList; - +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import static java.util.Arrays.asList; /** *

Domain name validation routines.

Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java Fri Aug 16 15:35:08 2013 @@ -24,7 +24,9 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java (original) +++ bval/branches/bval-11/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java Fri Aug 16 15:35:08 2013 @@ -18,10 +18,9 @@ */ package org.apache.bval.extras.constraints.net; -import java.util.regex.Pattern; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import java.util.regex.Pattern; /** *

InetAddress validation and conversion routines (java.net.InetAddress).

Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java Fri Aug 16 15:35:08 2013 @@ -16,9 +16,8 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import java.lang.annotation.Annotation; - import javax.validation.ConstraintValidator; +import java.lang.annotation.Annotation; /** * ABA Number Validator Test. Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java Fri Aug 16 15:35:08 2013 @@ -16,18 +16,17 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import javax.validation.ConstraintValidator; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.List; -import javax.validation.ConstraintValidator; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java Fri Aug 16 15:35:08 2013 @@ -16,9 +16,8 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import java.lang.annotation.Annotation; - import javax.validation.ConstraintValidator; +import java.lang.annotation.Annotation; /** * CUSIP Check Digit Test. Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java Fri Aug 16 15:35:08 2013 @@ -16,9 +16,8 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import java.lang.annotation.Annotation; - import javax.validation.ConstraintValidator; +import java.lang.annotation.Annotation; /** * EAN-13 Check Digit Test. Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java Fri Aug 16 15:35:08 2013 @@ -16,15 +16,14 @@ */ package org.apache.bval.extras.constraints.checkdigit; +import org.junit.Ignore; +import org.junit.Test; + +import javax.validation.ConstraintValidator; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.List; -import javax.validation.ConstraintValidator; - -import org.junit.Ignore; -import org.junit.Test; - /** * IVAN Check Digit Test. */ Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java Fri Aug 16 15:35:08 2013 @@ -16,9 +16,8 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import java.lang.annotation.Annotation; - import javax.validation.ConstraintValidator; +import java.lang.annotation.Annotation; /** * ISBN-10 Check Digit Test. Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java Fri Aug 16 15:35:08 2013 @@ -16,9 +16,8 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import java.lang.annotation.Annotation; - import javax.validation.ConstraintValidator; +import java.lang.annotation.Annotation; /** * Luhn Check Digit Test. Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java Fri Aug 16 15:35:08 2013 @@ -16,9 +16,8 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import java.lang.annotation.Annotation; - import javax.validation.ConstraintValidator; +import java.lang.annotation.Annotation; /** * Sedol Check Digit Test. Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java Fri Aug 16 15:35:08 2013 @@ -16,13 +16,12 @@ */ package org.apache.bval.extras.constraints.checkdigit; -import java.lang.annotation.Annotation; - -import javax.validation.ConstraintValidator; - import org.junit.Ignore; import org.junit.Test; +import javax.validation.ConstraintValidator; +import java.lang.annotation.Annotation; + /** * Verhoeff Check Digit Test. */ Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java Fri Aug 16 15:35:08 2013 @@ -16,18 +16,14 @@ */ package org.apache.bval.extras.constraints.net; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.lang.annotation.Annotation; +import org.junit.Before; +import org.junit.Test; import javax.validation.Payload; +import java.lang.annotation.Annotation; -import org.apache.bval.extras.constraints.net.Domain; -import org.apache.bval.extras.constraints.net.DomainValidator; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * Tests for the DomainValidator. Modified: bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java (original) +++ bval/branches/bval-11/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java Fri Aug 16 15:35:08 2013 @@ -18,13 +18,12 @@ */ package org.apache.bval.extras.constraints.net; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.apache.bval.extras.constraints.net.InetAddressValidator; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Test cases for InetAddressValidator. * Modified: bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ConfigurationStateProvider.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ConfigurationStateProvider.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ConfigurationStateProvider.java (original) +++ bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ConfigurationStateProvider.java Fri Aug 16 15:35:08 2013 @@ -16,6 +16,8 @@ */ package org.apache.bval.guice; +import org.apache.bval.jsr303.ConfigurationImpl; + import javax.inject.Inject; import javax.inject.Provider; import javax.validation.ConstraintValidatorFactory; @@ -25,9 +27,6 @@ import javax.validation.executable.Execu import javax.validation.spi.BootstrapState; import javax.validation.spi.ConfigurationState; import javax.validation.spi.ValidationProvider; - -import org.apache.bval.jsr303.ConfigurationImpl; - import java.util.Collections; /** Modified: bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/GuiceAwareConstraintValidatorFactory.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/GuiceAwareConstraintValidatorFactory.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/GuiceAwareConstraintValidatorFactory.java (original) +++ bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/GuiceAwareConstraintValidatorFactory.java Fri Aug 16 15:35:08 2013 @@ -16,13 +16,13 @@ */ package org.apache.bval.guice; +import com.google.inject.Injector; + import javax.inject.Inject; import javax.inject.Singleton; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorFactory; -import com.google.inject.Injector; - /** * {@code javax.validation.ConstraintValidatorFactory} implementation that * relies on Google Guice. Modified: bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/Validate.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/Validate.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/Validate.java (original) +++ bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/Validate.java Fri Aug 16 15:35:08 2013 @@ -16,15 +16,14 @@ */ package org.apache.bval.guice; +import com.google.inject.BindingAnnotation; + +import javax.validation.ConstraintViolationException; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.ConstraintViolationException; - -import com.google.inject.BindingAnnotation; - /** * Marker for methods which arguments have to be validated. * Modified: bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidateMethodInterceptor.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidateMethodInterceptor.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidateMethodInterceptor.java (original) +++ bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidateMethodInterceptor.java Fri Aug 16 15:35:08 2013 @@ -16,11 +16,8 @@ */ package org.apache.bval.guice; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; import javax.inject.Inject; import javax.validation.ConstraintViolation; @@ -28,9 +25,11 @@ import javax.validation.ConstraintViolat import javax.validation.Validator; import javax.validation.ValidatorFactory; import javax.validation.executable.ExecutableValidator; - -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; /** * Method interceptor for {@link Validate} annotation. Modified: bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java (original) +++ bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java Fri Aug 16 15:35:08 2013 @@ -16,6 +16,15 @@ */ package org.apache.bval.guice; +import com.google.inject.AbstractModule; +import com.google.inject.Scopes; +import com.google.inject.TypeLiteral; +import com.google.inject.matcher.Matchers; +import org.aopalliance.intercept.MethodInterceptor; +import org.apache.bval.jsr303.ApacheValidationProvider; +import org.apache.bval.jsr303.DefaultMessageInterpolator; +import org.apache.bval.jsr303.resolver.DefaultTraversableResolver; + import javax.validation.ConstraintValidatorFactory; import javax.validation.MessageInterpolator; import javax.validation.TraversableResolver; @@ -24,16 +33,6 @@ import javax.validation.ValidatorFactory import javax.validation.spi.ConfigurationState; import javax.validation.spi.ValidationProvider; -import org.aopalliance.intercept.MethodInterceptor; -import org.apache.bval.jsr303.ApacheValidationProvider; -import org.apache.bval.jsr303.DefaultMessageInterpolator; -import org.apache.bval.jsr303.resolver.DefaultTraversableResolver; - -import com.google.inject.AbstractModule; -import com.google.inject.Scopes; -import com.google.inject.TypeLiteral; -import com.google.inject.matcher.Matchers; - /** * The Google-Guice module for Apache BVal. * Modified: bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidatorFactoryProvider.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidatorFactoryProvider.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidatorFactoryProvider.java (original) +++ bval/branches/bval-11/bval-guice/src/main/java/org/apache/bval/guice/ValidatorFactoryProvider.java Fri Aug 16 15:35:08 2013 @@ -16,14 +16,14 @@ */ package org.apache.bval.guice; +import org.apache.bval.jsr303.ApacheValidationProvider; + import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; import javax.validation.ValidatorFactory; import javax.validation.spi.ConfigurationState; -import org.apache.bval.jsr303.ApacheValidationProvider; - /** * Validator Factory guice provider implementation. * Modified: bval/branches/bval-11/bval-guice/src/test/java/org/apache/bval/guice/GuiceAwareValidationTestCase.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-guice/src/test/java/org/apache/bval/guice/GuiceAwareValidationTestCase.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-guice/src/test/java/org/apache/bval/guice/GuiceAwareValidationTestCase.java (original) +++ bval/branches/bval-11/bval-guice/src/test/java/org/apache/bval/guice/GuiceAwareValidationTestCase.java Fri Aug 16 15:35:08 2013 @@ -16,16 +16,14 @@ */ package org.apache.bval.guice; -import java.util.Set; +import com.google.inject.Guice; +import junit.framework.TestCase; import javax.inject.Inject; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.Validator; - -import junit.framework.TestCase; - -import com.google.inject.Guice; +import java.util.Set; /** * Modified: bval/branches/bval-11/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java (original) +++ bval/branches/bval-11/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java Fri Aug 16 15:35:08 2013 @@ -16,6 +16,11 @@ */ package org.apache.bval.json; +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateException; +import org.apache.bval.model.MetaBean; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -25,12 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.bval.model.MetaBean; - -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; - /** * Description: Generate a JSON String for a collection of {@link MetaBean}s. * This implementation uses a freemarker template to generate the output.
Modified: bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/BValExtension.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/BValExtension.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/BValExtension.java (original) +++ bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/BValExtension.java Fri Aug 16 15:35:08 2013 @@ -42,7 +42,6 @@ import javax.validation.executable.Execu import java.lang.reflect.Modifier; import java.lang.reflect.Type; import java.util.Collections; -import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; Modified: bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java (original) +++ bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java Fri Aug 16 15:35:08 2013 @@ -23,7 +23,6 @@ import javax.enterprise.context.spi.Crea import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.PassivationCapable; -import javax.validation.Validator; import javax.validation.ValidatorFactory; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/Email.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/Email.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/Email.java (original) +++ bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/Email.java Fri Aug 16 15:35:08 2013 @@ -24,7 +24,10 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmpty.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmpty.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmpty.java (original) +++ bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/constraints/NotEmpty.java Fri Aug 16 15:35:08 2013 @@ -24,7 +24,10 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Modified: bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java?rev=1514750&r1=1514749&r2=1514750&view=diff ============================================================================== --- bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java (original) +++ bval/branches/bval-11/bval-jsr303/src/main/java/org/apache/bval/jsr303/AnnotationConstraintBuilder.java Fri Aug 16 15:35:08 2013 @@ -21,6 +21,7 @@ package org.apache.bval.jsr303; import org.apache.bval.jsr303.groups.GroupsComputer; import org.apache.bval.jsr303.xml.AnnotationProxyBuilder; import org.apache.bval.util.AccessStrategy; +import org.apache.commons.lang3.reflect.TypeUtils; import javax.validation.Constraint; import javax.validation.ConstraintDeclarationException; @@ -95,6 +96,11 @@ final class AnnotationConstraintBuilder< private void doBuildFromAnnotations() { final Class annotationType = constraintValidation.getAnnotation().annotationType(); + boolean foundPayload = false; + boolean foundGroups = false; + Method validationAppliesTo = null; + boolean foundMessage = false; + for (final Method method : AnnotationProxyBuilder.findMethods(annotationType)) { // groups + payload must also appear in attributes (also // checked by TCK-Tests) @@ -103,13 +109,22 @@ final class AnnotationConstraintBuilder< final String name = method.getName(); if (ConstraintAnnotationAttributes.PAYLOAD.getAttributeName().equals(name)) { buildPayload(method); + foundPayload = true; } else if (ConstraintAnnotationAttributes.GROUPS.getAttributeName().equals(name)) { buildGroups(method); + foundGroups = true; } else if (ConstraintAnnotationAttributes.VALIDATION_APPLIES_TO.getAttributeName().equals(name)) { buildValidationAppliesTo(method); + validationAppliesTo = method; } else if (name.startsWith("valid")) { throw new ConstraintDefinitionException("constraints parameters can't start with valid: " + name); } else { + if (ConstraintAnnotationAttributes.MESSAGE.getAttributeName().equals(name)) { + foundMessage = true; + if (!TypeUtils.isAssignable(method.getReturnType(), ConstraintAnnotationAttributes.MESSAGE.getType())) { + throw new ConstraintDefinitionException("Return type for message() must be of type " + ConstraintAnnotationAttributes.MESSAGE.getType()); + } + } constraintValidation.getAttributes().put(name, method.invoke(constraintValidation.getAnnotation())); } } catch (final ConstraintDefinitionException cde) { @@ -120,6 +135,19 @@ final class AnnotationConstraintBuilder< } } + if (!foundMessage) { + throw new ConstraintDefinitionException("Annotation " + annotationType.getName() + " has no message method"); + } + if (!foundPayload) { + throw new ConstraintDefinitionException("Annotation " + annotationType.getName() + " has no payload method"); + } + if (!foundGroups) { + throw new ConstraintDefinitionException("Annotation " + annotationType.getName() + " has no groups method"); + } + if (validationAppliesTo != null && !ConstraintTarget.IMPLICIT.equals(validationAppliesTo.getDefaultValue())) { + throw new ConstraintDefinitionException("validationAppliesTo default value should be IMPLICIT"); + } + // valid validationAppliesTo final Constraint annotation = annotationType.getAnnotation(Constraint.class); if (annotation == null) { @@ -177,6 +205,9 @@ final class AnnotationConstraintBuilder< } private void buildValidationAppliesTo(final Method method) throws InvocationTargetException, IllegalAccessException { + if (!TypeUtils.isAssignable(method.getReturnType(), ConstraintAnnotationAttributes.VALIDATION_APPLIES_TO.getType())) { + throw new ConstraintDefinitionException("Return type for validationAppliesTo() must be of type " + ConstraintAnnotationAttributes.VALIDATION_APPLIES_TO.getType()); + } final Object validationAppliesTo = method.invoke(constraintValidation.getAnnotation()); if (ConstraintTarget.class.isInstance(validationAppliesTo)) { constraintValidation.setValidationAppliesTo(ConstraintTarget.class.cast(validationAppliesTo)); @@ -186,12 +217,19 @@ final class AnnotationConstraintBuilder< } private void buildGroups(final Method method) throws IllegalAccessException, InvocationTargetException { + if (!TypeUtils.isAssignable(method.getReturnType(), ConstraintAnnotationAttributes.GROUPS.getType())) { + throw new ConstraintDefinitionException("Return type for groups() must be of type " + ConstraintAnnotationAttributes.GROUPS.getType()); + } + final Object raw = method.invoke(constraintValidation.getAnnotation()); Class[] garr; if (raw instanceof Class) { garr = new Class[] { (Class) raw }; } else if (raw instanceof Class[]) { garr = (Class[]) raw; + if (Object[].class.cast(method.getDefaultValue()).length > 0) { + throw new ConstraintDefinitionException("Default value for groups() must be an empty array"); + } } else { garr = null; } @@ -203,7 +241,14 @@ final class AnnotationConstraintBuilder< } @SuppressWarnings("unchecked") - private void buildPayload(Method method) throws IllegalAccessException, InvocationTargetException { + private void buildPayload(final Method method) throws IllegalAccessException, InvocationTargetException { + if (!TypeUtils.isAssignable(method.getReturnType(), ConstraintAnnotationAttributes.PAYLOAD.getType())) { + throw new ConstraintDefinitionException("Return type for payload() must be of type " + ConstraintAnnotationAttributes.PAYLOAD.getType()); + } + if (Object[].class.cast(method.getDefaultValue()).length > 0) { + throw new ConstraintDefinitionException("Default value for payload() must be an empty array"); + } + Class[] payload_raw = (Class[]) method.invoke(constraintValidation.getAnnotation()); Set> payloadSet;