hibernate-commits August 2009

hibernate-commits@lists.jboss.org

2 participants
271 discussions

Hibernate SVN: r17427 - beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints and 22 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-08-27 05:47:28 -0400 (Thu, 27 Aug 2009) New Revision: 17427 Added: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java Removed: beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java Log: HV-215 - Rename ConstraintPayload to Payload Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,15 +0,0 @@ -package javax.validation; - -/** - * Payload type that can be attached to a given - * constraint declaration. - * Payloads are typically used to carry on metadata information - * consumed by a validation client. - * - * Use of payloads is not considered portable. - * - * @author Emmanuel Bernard - * @author Gerhard Petracek - */ -public interface ConstraintPayload { -} \ No newline at end of file Copied: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java (from rev 17330, beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintPayload.java) =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java (rev 0) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -0,0 +1,15 @@ +package javax.validation; + +/** + * Payload type that can be attached to a given + * constraint declaration. + * Payloads are typically used to carry on metadata information + * consumed by a validation client. + * + * Use of payloads is not considered portable. + * + * @author Emmanuel Bernard + * @author Gerhard Petracek + */ +public interface Payload { +} \ No newline at end of file Property changes on: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Payload.java ___________________________________________________________________ Name: svn:keywords + Id Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -27,7 +27,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be false. @@ -46,7 +46,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * Defines several @AssertFalse annotations on the same element Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be true. @@ -43,7 +43,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * Defines several @AssertTrue annotations on the same element Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be a number whose value must be lower or @@ -54,7 +54,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * The String representation of the max value according to the Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be a number whose value must be higher or @@ -54,7 +54,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * The String representation of the min value according to the Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be a number within accepted range @@ -50,7 +50,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * @return maximum number of integral digits accepted for this number. Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be a date in the future. @@ -51,7 +51,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * Defines several @Future annotations on the same element Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be a number whose value must be lower or @@ -53,7 +53,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * @return value the element must be lower or equal to Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be a number whose value must be higher or @@ -53,7 +53,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * @return value the element must be higher or equal to Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must not be <code>null</code>. @@ -41,7 +41,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * Defines several @NotNull annotations on the same element Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be null. @@ -41,7 +41,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * Defines several @Null annotations on the same element Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element must be a date in the past. @@ -51,7 +51,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * Defines several @Past annotations on the same element Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated String must match the following regular expression. @@ -63,7 +63,7 @@ /** * @return The payload associated to the constraint */ - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * Possible Regexp flags Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * The annotated element size must be between the specified boundaries (included). @@ -49,7 +49,7 @@ Class<?>[] groups() default {}; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; /** * @return size the element must be higher or equal to Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ConstraintDescriptor.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; import javax.validation.ConstraintValidator; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * Describes a single constraint and its composing constraints. @@ -55,7 +55,7 @@ * * @return payload classes hosted on the constraint or an empty set if none. */ - Set<Class<ConstraintPayload>> getPayload(); + Set<Class<Payload>> getPayload(); /** * Immutable list of the constraint validation implementation classes. Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -27,7 +27,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -41,7 +41,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; public class SecurityCheckValidator implements ConstraintValidator<SecurityCheck, Object> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; import javax.validation.ConstraintDefinitionException; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintViolation; import javax.validation.UnexpectedTypeException; import javax.validation.Validator; @@ -274,10 +274,10 @@ assertCorrectConstraintTypes( constraintViolations, NotNull.class ); ConstraintViolation<Friend> constraintViolation = constraintViolations.iterator().next(); - Set<Class<ConstraintPayload>> payloads = constraintViolation.getConstraintDescriptor().getPayload(); + Set<Class<Payload>> payloads = constraintViolation.getConstraintDescriptor().getPayload(); assertTrue( payloads.size() == 1, "There should be one payload in the set" ); - Class<ConstraintPayload> payload = payloads.iterator().next(); + Class<Payload> payload = payloads.iterator().next(); assertTrue( payload.getName().equals( Severity.Warn.class.getName() ), "Unexpected payload" ); } Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -26,7 +26,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.OverridesAttribute; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -47,7 +47,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; @OverridesAttribute.List({ @OverridesAttribute(constraint = Size.class, name = "min"), Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -26,7 +26,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.OverridesAttribute; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -47,7 +47,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; @OverridesAttribute.List({ @OverridesAttribute(constraint = Size.class, name = "min"), Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -28,7 +28,7 @@ import javax.validation.ReportAsSingleViolation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * Constraint used to test nested composing constraints. @@ -46,7 +46,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; public class GermanZipcodeConstraintValidator implements ConstraintValidator<GermanZipcode, String> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -43,5 +43,5 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -27,7 +27,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -45,7 +45,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default {}; + Class<? extends Payload>[] payload() default {}; public class NotEmptyValidator implements ConstraintValidator<NotEmpty, String> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -17,19 +17,19 @@ */ package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik */ public class Severity { - public static class Info implements ConstraintPayload { + public static class Info implements Payload { } - public static class Warn implements ConstraintPayload { + public static class Warn implements Payload { } - public static class Error implements ConstraintPayload { + public static class Error implements Payload { } } Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.Pattern; /** @@ -39,5 +39,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.FIELD; import javax.validation.constraints.Pattern; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ReportAsSingleViolation; /** @@ -41,5 +41,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -24,8 +24,7 @@ import static java.lang.annotation.ElementType.FIELD; import javax.validation.constraints.Pattern; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; -import javax.validation.ReportAsSingleViolation; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -40,5 +39,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.FIELD; import javax.validation.constraints.Pattern; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ReportAsSingleViolation; /** @@ -41,5 +41,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -24,8 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; -import javax.validation.ReportAsSingleViolation; +import javax.validation.Payload; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -42,5 +41,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ReportAsSingleViolation; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -43,5 +43,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -27,7 +27,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -43,7 +43,7 @@ public abstract boolean alwaysValid(); - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; public class StaticConstraintValidator implements ConstraintValidator<AlwaysValid, Object> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Emmanuel Bernard @@ -39,5 +39,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Emmanuel Bernard @@ -39,5 +39,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Emmanuel Bernard @@ -38,5 +38,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -27,7 +27,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -41,7 +41,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; public class IsAdultValidator implements ConstraintValidator<IsAdult, Integer> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -41,7 +41,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; public class SafeEncryptionValidator implements ConstraintValidator<SafeEncryption, String> { public void initialize(SafeEncryption parameters) { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -152,7 +152,7 @@ try { Validator validator = TestUtil.getValidatorUnderTest(); validator.validate( new DummyEntityInvalidPayloadClass() ); - fail( "The default payload parameter has to be of type Class<? extends ConstraintPayload>[]. The validation should have failed." ); + fail( "The default payload parameter has to be of type Class<? extends Payload>[]. The validation should have failed." ); } catch ( ConstraintDefinitionException e ) { // success Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.groups.Default; /** @@ -40,7 +40,7 @@ public abstract Class<?>[] groups() default Default.class; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; public class InvalidDefaultGroupValidator implements ConstraintValidator<InvalidDefaultGroup, Object> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -39,9 +39,9 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default DummyPayload.class; + public abstract Class<? extends Payload>[] payload() default DummyPayload.class; - public class DummyPayload implements ConstraintPayload { + public class DummyPayload implements Payload { } Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -37,7 +37,7 @@ public @interface NoGroups { String message() default "default message"; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; public class NoGroupsValidator implements ConstraintValidator<NoGroups, Object> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -37,7 +37,7 @@ public @interface NoMessage { Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; public class NoMessageValidator implements ConstraintValidator<NoMessage, Object> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -39,7 +39,7 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; int validLength() default 0; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambigious.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -28,7 +28,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * A test constraint which can lead to a error when trying to reslove the validator. @@ -46,7 +46,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; public class AmbigiousValidatorForBar implements ConstraintValidator<Ambigious, Bar> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -49,7 +49,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; public class ValidatorBaseClass implements ConstraintValidator<CustomConstraint, BaseClass> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/PostCodeList.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -28,7 +28,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * A test constraint which can lead to a error when trying to reslove the validator. @@ -46,7 +46,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; public class PostCodeListValidatorForNumber implements ConstraintValidator<PostCodeList, Collection<? extends Number>> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -40,5 +40,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; } Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.validation.groups.Default; @@ -153,7 +153,7 @@ @SpecAssertion(section = "5.5", id = "g") public void testPayload() { ConstraintDescriptor<?> descriptor = getConstraintDescriptor( Person.class, "firstName" ); - Set<Class<ConstraintPayload>> payload = descriptor.getPayload(); + Set<Class<Payload>> payload = descriptor.getPayload(); assertTrue( payload.size() == 1 ); assertEquals( payload.iterator().next(), Severity.Info.class, "Wrong payload" ); Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.OverridesAttribute; import javax.validation.ReportAsSingleViolation; import javax.validation.constraints.NotNull; @@ -45,7 +45,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; @OverridesAttribute(constraint = Size.class, name = "min") public abstract int min() default 5; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -17,11 +17,11 @@ */ package org.hibernate.jsr303.tck.tests.metadata; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Emmanuel Bernard */ public interface Severity { - interface Info extends ConstraintPayload {} + interface Info extends Payload {} } Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.OverridesAttribute; import javax.validation.ReportAsSingleViolation; import javax.validation.constraints.NotNull; @@ -45,7 +45,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; @OverridesAttribute(constraint = Size.class, name = "min") public abstract int min() default 5; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.ConstraintViolation; @@ -242,7 +242,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } public static class SpecialValidator implements ConstraintValidator<Special, VerySpecialClass> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -38,5 +38,5 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -39,5 +39,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default {}; + public abstract Class<? extends Payload>[] payload() default {}; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * @author Hardy Ferentschik @@ -39,5 +39,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.Max; import javax.validation.constraints.Pattern; @@ -42,7 +42,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; public abstract String stringParam() default ""; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -42,7 +42,7 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; public class ValidPackageValidator implements ConstraintValidator<ValidPackage, Package> { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java 2009-08-26 20:34:58 UTC (rev 17426) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** * Validate that the string is between min and max included @@ -46,5 +46,5 @@ public abstract Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java 2009-08-26 20:34:58 UTC (rev 17426) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -25,7 +25,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import org.hibernate.validator.constraints.impl.LengthValidator; @@ -48,5 +48,5 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java 2009-08-26 20:34:58 UTC (rev 17426) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ReportAsSingleViolation; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -44,5 +44,5 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java 2009-08-26 20:34:58 UTC (rev 17426) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -31,7 +31,7 @@ import java.util.Set; import javax.validation.Constraint; import javax.validation.ConstraintDefinitionException; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ConstraintValidator; import javax.validation.OverridesAttribute; import javax.validation.ReportAsSingleViolation; @@ -83,7 +83,7 @@ */ private final Map<String, Object> attributes; - private final Set<Class<ConstraintPayload>> payloads; + private final Set<Class<Payload>> payloads; /** * The composing constraints for this constraints. @@ -120,11 +120,11 @@ this( annotation, constraintHelper, null ); } - private Set<Class<ConstraintPayload>> buildPayloadSet(T annotation) { - Set<Class<ConstraintPayload>> payloadSet = new HashSet<Class<ConstraintPayload>>(); - Class<ConstraintPayload>[] payloadFromAnnotation; + private Set<Class<Payload>> buildPayloadSet(T annotation) { + Set<Class<Payload>> payloadSet = new HashSet<Class<Payload>>(); + Class<Payload>[] payloadFromAnnotation; try { - //TODO be extra safe and make sure this is an array of ConstraintPayload + //TODO be extra safe and make sure this is an array of Payload GetAnnotationParameter<Class[]> action = GetAnnotationParameter.action( annotation, PAYLOAD, Class[].class ); @@ -216,7 +216,7 @@ return groups; } - public Set<Class<ConstraintPayload>> getPayload() { + public Set<Class<Payload>> getPayload() { return payloads; } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java 2009-08-26 20:34:58 UTC (rev 17426) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; /** @@ -36,6 +36,6 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java 2009-08-26 20:34:58 UTC (rev 17426) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -43,5 +43,5 @@ public abstract Class<?>[] groups() default { }; - public abstract Class<? extends ConstraintPayload>[] payload() default { }; + public abstract Class<? extends Payload>[] payload() default { }; } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java 2009-08-26 20:34:58 UTC (rev 17426) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -23,7 +23,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ReportAsSingleViolation; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -45,5 +45,5 @@ Class<?>[] groups() default { }; - Class<? extends ConstraintPayload>[] payload() default { }; + Class<? extends Payload>[] payload() default { }; } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java 2009-08-26 20:34:58 UTC (rev 17426) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java 2009-08-27 09:47:28 UTC (rev 17427) @@ -27,7 +27,7 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeSet; -import javax.validation.ConstraintPayload; +import javax.validation.Payload; import javax.validation.ValidationException; import javax.validation.constraints.NotNull; import javax.validation.groups.Default; @@ -133,9 +133,9 @@ return new Class<?>[] { Default.class }; } - public Class<? extends ConstraintPayload>[] payload() { + public Class<? extends Payload>[] payload() { @SuppressWarnings("unchecked") - Class<? extends ConstraintPayload>[] classes = new Class[] { }; + Class<? extends Payload>[] classes = new Class[] { }; return classes; }

15 years, 4 months

1
0
0 / 0

Hibernate SVN: r17426 - in core/trunk: entitymanager/src/main/java/org/hibernate/ejb and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-08-26 16:34:58 -0400 (Wed, 26 Aug 2009) New Revision: 17426 Added: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java Modified: core/trunk/core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java Log: EJB-461 - Implement JPA 2.0 criteria apis (compiling) Modified: core/trunk/core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java 2009-08-26 14:40:41 UTC (rev 17425) +++ core/trunk/core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -116,6 +116,10 @@ this.parameterMetadata = parameterMetadata; } + public ParameterMetadata getParameterMetadata() { + return parameterMetadata; + } + public String toString() { return StringHelper.unqualify( getClass().getName() ) + '(' + queryString + ')'; } @@ -161,7 +165,13 @@ } public Query setMaxResults(int maxResults) { - selection.setMaxRows( new Integer(maxResults) ); + if ( maxResults < 0 ) { + // treat negatives specically as meaning no limit... + selection.setMaxRows( null ); + } + else { + selection.setMaxRows( new Integer(maxResults) ); + } return this; } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2009-08-26 14:40:41 UTC (rev 17425) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -80,6 +82,7 @@ /** * @author <a href="mailto:gavin@hibernate.org">Gavin King</a> * @author Emmanuel Bernard + * @author Steve Ebersole */ @SuppressWarnings("unchecked") public abstract class AbstractEntityManagerImpl implements HibernateEntityManagerImplementor, Serializable { @@ -115,19 +118,34 @@ this.properties = null; } - public Query createQuery(String ejbqlString) { - //adjustFlushMode(); + public Query createQuery(String jpaqlString) { try { - return new QueryImpl( getSession().createQuery( ejbqlString ), this ); + return new QueryImpl<Object>( getSession().createQuery( jpaqlString ), this ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + throw convert( he ); } } - public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) { - throw new UnsupportedOperationException( "Not yet implemented" ); + public <T> TypedQuery<T> createQuery(String jpaqlString, Class<T> resultClass) { + try { + org.hibernate.Query hqlQuery = getSession().createQuery( jpaqlString ); + if ( hqlQuery.getReturnTypes().length != 1 ) { + throw new IllegalArgumentException( "Cannot create TypedQuery for query with more than one return" ); + } + if ( ! resultClass.isAssignableFrom( hqlQuery.getReturnTypes()[0].getReturnedClass() ) ) { + throw new IllegalArgumentException( + "Type specified for TypedQuery [" + + resultClass.getName() + + "] is incompatible with query return type [" + + hqlQuery.getReturnTypes()[0].getReturnedClass() + "]" + ); + } + return new QueryImpl<T>( hqlQuery, this ); + } + catch ( HibernateException he ) { + throw convert( he ); + } } public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) { @@ -165,69 +183,81 @@ } public Query createNamedQuery(String name) { - //adjustFlushMode(); - org.hibernate.Query namedQuery; try { - namedQuery = getSession().getNamedQuery( name ); + org.hibernate.Query namedQuery = getSession().getNamedQuery( name ); + try { + return new QueryImpl( namedQuery, this ); + } + catch ( HibernateException he ) { + throw convert( he ); + } } catch ( MappingException e ) { throw new IllegalArgumentException( "Named query not found: " + name ); } + } + + public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) { try { - return new QueryImpl( namedQuery, this ); + org.hibernate.Query namedQuery = getSession().getNamedQuery( name ); + try { + if ( namedQuery.getReturnTypes().length != 1 ) { + throw new IllegalArgumentException( "Cannot create TypedQuery for query with more than one return" ); + } + if ( ! resultClass.isAssignableFrom( namedQuery.getReturnTypes()[0].getReturnedClass() ) ) { + throw new IllegalArgumentException( + "Type specified for TypedQuery [" + + resultClass.getName() + + "] is incompatible with query return type [" + + namedQuery.getReturnTypes()[0].getReturnedClass() + "]" + ); + } + return new QueryImpl<T>( namedQuery, this ); + } + catch ( HibernateException he ) { + throw convert( he ); + } } - catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + catch ( MappingException e ) { + throw new IllegalArgumentException( "Named query not found: " + name ); } } - public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) { - throw new UnsupportedOperationException( "Not yet implemented" ); - } - public Query createNativeQuery(String sqlString) { - //adjustFlushMode(); try { SQLQuery q = getSession().createSQLQuery( sqlString ); return new QueryImpl( q, this ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + throw convert( he ); } } public Query createNativeQuery(String sqlString, Class resultClass) { - //adjustFlushMode(); try { SQLQuery q = getSession().createSQLQuery( sqlString ); q.addEntity( "alias1", resultClass.getName(), LockMode.READ ); return new QueryImpl( q, this ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + throw convert( he ); } } public Query createNativeQuery(String sqlString, String resultSetMapping) { - //adjustFlushMode(); try { SQLQuery q = getSession().createSQLQuery( sqlString ); q.setResultSetMapping( resultSetMapping ); return new QueryImpl( q, this ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + throw convert( he ); } } @SuppressWarnings("unchecked") public <T> T getReference(Class<T> entityClass, Object primaryKey) { - //adjustFlushMode(); try { return ( T ) getSession().load( entityClass, ( Serializable ) primaryKey ); } @@ -241,14 +271,12 @@ throw new IllegalArgumentException( e.getMessage(), e ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + throw convert( he ); } } @SuppressWarnings("unchecked") public <A> A find(Class<A> entityClass, Object primaryKey) { - //adjustFlushMode(); try { return ( A ) getSession().get( entityClass, ( Serializable ) primaryKey ); } @@ -270,8 +298,7 @@ throw new IllegalArgumentException( e.getMessage(), e ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + throw convert( he ); } } @@ -301,7 +328,6 @@ public void persist(Object entity) { checkTransactionNeeded(); - //adjustFlushMode(); try { getSession().persist( entity ); } @@ -309,14 +335,13 @@ throw new IllegalArgumentException( e.getMessage() ); } catch ( HibernateException he ) { - throwPersistenceException( he ); + throw convert( he ); } } @SuppressWarnings("unchecked") public <A> A merge(A entity) { checkTransactionNeeded(); - //adjustFlushMode(); try { return ( A ) getSession().merge( entity ); } @@ -327,14 +352,12 @@ throw new IllegalArgumentException( e.getMessage(), e ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return null; + throw convert( he ); } } public void remove(Object entity) { checkTransactionNeeded(); - //adjustFlushMode(); try { getSession().delete( entity ); } @@ -342,13 +365,12 @@ throw new IllegalArgumentException( e.getMessage(), e ); } catch ( HibernateException he ) { - throwPersistenceException( he ); + throw convert( he ); } } public void refresh(Object entity) { checkTransactionNeeded(); - //adjustFlushMode(); try { if ( !getSession().contains( entity ) ) { throw new IllegalArgumentException( "Entity not managed" ); @@ -359,7 +381,7 @@ throw new IllegalArgumentException( e.getMessage(), e ); } catch ( HibernateException he ) { - throwPersistenceException( he ); + throw convert( he ); } } @@ -391,8 +413,7 @@ throw new IllegalArgumentException( e.getMessage(), e ); } catch ( HibernateException he ) { - throwPersistenceException( he ); - return false; + throw convert( he ); } } @@ -425,7 +446,7 @@ getSession().flush(); } catch ( HibernateException he ) { - throwPersistenceException( he ); + throw convert( he ); } } @@ -490,7 +511,7 @@ getSession().clear(); } catch ( HibernateException he ) { - throwPersistenceException( he ); + throw convert( he ); } } @@ -499,7 +520,7 @@ getSession().evict( entity ); } catch ( HibernateException he ) { - throwPersistenceException( he ); + throw convert( he ); } } @@ -672,14 +693,17 @@ log.trace( "skipping managed flushing" ); } } + catch ( HibernateException he ) { + throw convert( he ); + } + catch( PersistenceException pe ) { + handlePersistenceException( pe ); + throw pe; + } catch ( RuntimeException re ) { - //throwPersistenceException will mark the transaction as rollbacked - if ( re instanceof HibernateException ) { - throwPersistenceException( ( HibernateException ) re ); - } - else { - throwPersistenceException( new PersistenceException( re ) ); - } + PersistenceException wrapped = new PersistenceException( re ); + handlePersistenceException( wrapped ); + throw wrapped; } } @@ -698,7 +722,7 @@ } } catch ( HibernateException e ) { - throwPersistenceException( e ); + throw convert( e ); } } } @@ -709,7 +733,7 @@ } } catch ( HibernateException he ) { - throwPersistenceException( he ); + throw convert( he ); } } else { @@ -735,35 +759,60 @@ tx = new TransactionImpl( this ); } + /** + * {@inheritDoc} + */ + public void handlePersistenceException(PersistenceException e) { + if ( e instanceof NoResultException ) { + return; + } + if ( e instanceof NonUniqueResultException ) { + return; + } + + try { + markAsRollback(); + } + catch ( Exception ne ) { + //we do not want the subsequent exception to swallow the original one + log.error( "Unable to mark for rollback on PersistenceException: ", ne ); + } + } + + /** + * {@inheritDoc} + */ public void throwPersistenceException(PersistenceException e) { - if ( !( e instanceof NoResultException || e instanceof NonUniqueResultException ) ) { - try { - markAsRollback(); - } - catch ( Exception ne ) { - //we do not want the subsequent exception to swallow the original one - log.error( "Unable to mark for rollback on PersistenceException: ", ne ); - } - } + handlePersistenceException( e ); throw e; } - public void throwPersistenceException(HibernateException e) { + /** + * {@inheritDoc} + */ + public RuntimeException convert(HibernateException e) { if ( e instanceof StaleStateException ) { - PersistenceException pe = wrapStaleStateException( ( StaleStateException ) e ); - throwPersistenceException( pe ); + PersistenceException converted = wrapStaleStateException( ( StaleStateException ) e ); + handlePersistenceException( converted ); + return converted; } else if ( e instanceof ObjectNotFoundException ) { - throwPersistenceException( new EntityNotFoundException( e.getMessage() ) ); + EntityNotFoundException converted = new EntityNotFoundException( e.getMessage() ); + handlePersistenceException( converted ); + return converted; } else if ( e instanceof org.hibernate.NonUniqueResultException ) { - throwPersistenceException( new NonUniqueResultException( e.getMessage() ) ); + NonUniqueResultException converted = new NonUniqueResultException( e.getMessage() ); + handlePersistenceException( converted ); + return converted; } else if ( e instanceof UnresolvableObjectException ) { - throwPersistenceException( new EntityNotFoundException( e.getMessage() ) ); + EntityNotFoundException converted = new EntityNotFoundException( e.getMessage() ); + handlePersistenceException( converted ); + return converted; } else if ( e instanceof QueryException ) { - throw new IllegalArgumentException( e ); + return new IllegalArgumentException( e ); } else if ( e instanceof TransientObjectException ) { try { @@ -773,13 +822,25 @@ //we do not want the subsequent exception to swallow the original one log.error( "Unable to mark for rollback on TransientObjectException: ", ne ); } - throw new IllegalStateException( e ); //Spec 3.2.3 Synchronization rules + return new IllegalStateException( e ); //Spec 3.2.3 Synchronization rules } else { - throwPersistenceException( new PersistenceException( e ) ); + PersistenceException converted = new PersistenceException( e ); + handlePersistenceException( converted ); + return converted; } } + /** + * {@inheritDoc} + */ + public void throwPersistenceException(HibernateException e) { + throw convert( e ); + } + + /** + * {@inheritDoc} + */ public PersistenceException wrapStaleStateException(StaleStateException e) { PersistenceException pe; if ( e instanceof StaleObjectStateException ) { Added: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java (rev 0) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -0,0 +1,352 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.ejb; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import javax.persistence.FlushModeType; +import javax.persistence.Parameter; +import javax.persistence.TransactionRequiredException; +import javax.persistence.TypedQuery; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.hibernate.CacheMode; +import org.hibernate.FlushMode; +import org.hibernate.HibernateException; +import org.hibernate.TypeMismatchException; +import static org.hibernate.ejb.QueryHints.HINT_CACHEABLE; +import static org.hibernate.ejb.QueryHints.HINT_CACHE_MODE; +import static org.hibernate.ejb.QueryHints.HINT_CACHE_REGION; +import static org.hibernate.ejb.QueryHints.HINT_COMMENT; +import static org.hibernate.ejb.QueryHints.HINT_FETCH_SIZE; +import static org.hibernate.ejb.QueryHints.HINT_FLUSH_MODE; +import static org.hibernate.ejb.QueryHints.HINT_READONLY; +import static org.hibernate.ejb.QueryHints.HINT_TIMEOUT; +import org.hibernate.ejb.util.ConfigurationHelper; +import org.hibernate.hql.QueryExecutionRequestException; + +/** + * Intended as a base class providing convenience in implementing both {@link javax.persistence.Query} and + * {@link javax.persistence.TypedQuery}. + * + * IMPL NOTE : This issue, and the reason for this distinction, is that criteria and hl.sql queries share no + * commonality currently in Hibernate internals. + * + * @author Steve Ebersole + */ +public abstract class AbstractQueryImpl<X> implements TypedQuery<X> { + private static final Logger log = LoggerFactory.getLogger( AbstractQueryImpl.class ); + + private final HibernateEntityManagerImplementor entityManager; + + public AbstractQueryImpl(HibernateEntityManagerImplementor entityManager) { + this.entityManager = entityManager; + } + + protected HibernateEntityManagerImplementor getEntityManager() { + return entityManager; + } + + /** + * Actually execute the update; all pre-requisites have been checked. + * + * @return The number of "affected rows". + */ + protected abstract int internalExecuteUpdate(); + + /** + * {@inheritDoc} + */ + @SuppressWarnings({ "ThrowableInstanceNeverThrown" }) + public int executeUpdate() { + try { + if ( ! entityManager.isTransactionInProgress() ) { + entityManager.throwPersistenceException( new TransactionRequiredException( "Executing an update/delete query" ) ); + return 0; + } + return internalExecuteUpdate(); + } + catch ( QueryExecutionRequestException he) { + throw new IllegalStateException(he); + } + catch( TypeMismatchException e ) { + throw new IllegalArgumentException(e); + } + catch ( HibernateException he) { + entityManager.throwPersistenceException( he ); + return 0; + } + } + + private int maxResults = -1; + + /** + * Apply the given max results value. + * + * @param maxResults The specified max results + */ + protected abstract void applyMaxResults(int maxResults); + + /** + * {@inheritDoc} + */ + public TypedQuery<X> setMaxResults(int maxResult) { + if ( maxResult < 0 ) { + throw new IllegalArgumentException( + "Negative value (" + maxResult + ") passed to setMaxResults" + ); + } + this.maxResults = maxResult; + applyMaxResults( maxResult ); + return this; + } + + public int getSpecifiedMaxResults() { + return maxResults; + } + + public int getMaxResults() { + return maxResults == -1 + ? Integer.MAX_VALUE // stupid spec... MAX_VALUE?? + : maxResults; + } + + private int firstResult; + + /** + * Apply the given first-result value. + * + * @param firstResult The specified first-result value. + */ + protected abstract void applyFirstResult(int firstResult); + + public TypedQuery<X> setFirstResult(int firstResult) { + if ( firstResult < 0 ) { + throw new IllegalArgumentException( + "Negative value (" + firstResult + ") passed to setFirstResult" + ); + } + this.firstResult = firstResult; + applyFirstResult( firstResult ); + return this; + } + + public int getFirstResult() { + return firstResult; + } + + private Map<String, Object> hints; + + /** + * {@inheritDoc} + */ + public Map<String, Object> getHints() { + return hints; + } + + protected abstract void applyTimeout(int timeout); + + protected abstract void applyComment(String comment); + + protected abstract void applyFetchSize(int fetchSize); + + protected abstract void applyCacheable(boolean isCacheable); + + protected abstract void applyCacheRegion(String regionName); + + protected abstract void applyReadOnly(boolean isReadOnly); + + protected abstract void applyCacheMode(CacheMode cacheMode); + + protected abstract void applyFlushMode(FlushMode flushMode); + + /** + * {@inheritDoc} + */ + public TypedQuery<X> setHint(String hintName, Object value) { + boolean skipped = false; + try { + if ( HINT_TIMEOUT.equals( hintName ) ) { + applyTimeout( ConfigurationHelper.getInteger( value ) ); + } + else if ( HINT_COMMENT.equals( hintName ) ) { + applyComment( (String) value ); + } + else if ( HINT_FETCH_SIZE.equals( hintName ) ) { + applyFetchSize( ConfigurationHelper.getInteger( value ) ); + } + else if ( HINT_CACHEABLE.equals( hintName ) ) { + applyCacheable( ConfigurationHelper.getBoolean( value ) ); + } + else if ( HINT_CACHE_REGION.equals( hintName ) ) { + applyCacheRegion( (String) value ); + } + else if ( HINT_READONLY.equals( hintName ) ) { + applyReadOnly( ConfigurationHelper.getBoolean( value ) ); + } + else if ( HINT_CACHE_MODE.equals( hintName ) ) { + applyCacheMode( ConfigurationHelper.getCacheMode( value ) ); + } + else if ( HINT_FLUSH_MODE.equals( hintName ) ) { + applyFlushMode( ConfigurationHelper.getFlushMode( value ) ); + } + /* TODO: + else if ( "org.hibernate.lockMode".equals( hintName ) ) { + query.setLockMode( alias, lockMode ); + }*/ + else { + skipped = true; + log.info( "Ignoring unrecognized query hint [" + hintName + "]" ); + } + } + catch ( ClassCastException e ) { + throw new IllegalArgumentException( "Value for hint" ); + } + + if ( !skipped ) { + if ( hints == null ) { + hints = new HashMap<String,Object>(); + } + hints.put( hintName, value ); + } + + return this; + } + + public Set<String> getSupportedHints() { + return QueryHints.getDefinedHints(); + } + + private FlushModeType jpaFlushMode; + + public TypedQuery<X> setFlushMode(FlushModeType jpaFlushMode) { + this.jpaFlushMode = jpaFlushMode; + // TODO : treat as hint? + if ( jpaFlushMode == FlushModeType.AUTO ) { + applyFlushMode( FlushMode.AUTO ); + } + else if ( jpaFlushMode == FlushModeType.COMMIT ) { + applyFlushMode( FlushMode.COMMIT ); + } + return this; + } + + protected FlushModeType getSpecifiedFlushMode() { + return jpaFlushMode; + } + + public FlushModeType getFlushMode() { + return jpaFlushMode != null + ? jpaFlushMode + : entityManager.getFlushMode(); + } + + private Map parameterBindings; + + protected void registerParameterBinding(Parameter parameter, Object value) { + if ( value != null && parameter.getJavaType() != null ) { + if ( Collection.class.isInstance( value ) ) { + final Collection collection = (Collection) value; + // validate the elements... + for ( Object element : collection ) { + if ( ! parameter.getJavaType().isInstance( element ) ) { + throw new IllegalArgumentException( + "Parameter value [" + element + "] was not matching type [" + + parameter.getJavaType().getName() + "]" + ); + } + } + } + else if ( value.getClass().isArray() ) { + final Object[] array = (Object[]) value; + for ( Object element : array ) { + if ( ! parameter.getJavaType().isInstance( element ) ) { + throw new IllegalArgumentException( + "Parameter value [" + element + "] was not matching type [" + + parameter.getJavaType().getName() + "]" + ); + } + } + } + else { + if ( ! parameter.getJavaType().isInstance( value ) ) { + throw new IllegalArgumentException( + "Parameter value [" + value + "] was not matching type [" + + parameter.getJavaType().getName() + "]" + ); + } + } + } + + if ( parameterBindings == null ) { + parameterBindings = new HashMap(); + } + parameterBindings.put( parameter, value ); + } + + /** + * {@inheritDoc} + */ + public boolean isBound(Parameter<?> param) { + return parameterBindings != null && parameterBindings.containsKey( param ); + } + + /** + * {@inheritDoc} + */ + @SuppressWarnings({ "unchecked" }) + public <T> T getParameterValue(Parameter<T> param) { + if ( parameterBindings == null ) { + throw new IllegalStateException( "No parameters have been bound" ); + } + try { + T value = (T) parameterBindings.get( param ); + if ( value == null ) { + throw new IllegalStateException( "Parameter has not been bound" ); + } + return value; + } + catch ( ClassCastException cce ) { + throw new IllegalStateException( "Encountered a parameter value type exception" ); + } + } + + /** + * {@inheritDoc} + */ + public Object getParameterValue(String name) { + return getParameterValue( getParameter( name ) ); + } + + /** + * {@inheritDoc} + */ + public Object getParameterValue(int position) { + return getParameterValue( getParameter( position ) ); + } +} Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java 2009-08-26 14:40:41 UTC (rev 17425) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -19,8 +21,6 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ - -//$Id$ package org.hibernate.ejb; import javax.persistence.PersistenceException; @@ -29,13 +29,50 @@ import org.hibernate.StaleStateException; /** + * Additional internal contracts for the Hibernate {@link javax.persistence.EntityManager} implementation. + * * @author Emmanuel Bernard + * @author Steve Ebersole */ public interface HibernateEntityManagerImplementor extends HibernateEntityManager { + /** + * Provides access to whether a transaction is currently in progress. + * + * @return True if a transaction is considered currently in progress; false otherwise. + */ boolean isTransactionInProgress(); + /** + * Handles marking for rollback and other such operations that need to occur depending on the type of + * exception being handled. + * + * @param e The exception being handled. + */ + public void handlePersistenceException(PersistenceException e); + + /** + * Delegates to {@link #handlePersistenceException} and then throws the given exception. + * + * @param e The exception being handled and finally thrown. + */ public void throwPersistenceException(PersistenceException e); + /** + * Converts a Hibernate-specific exception into a JPA-specified exception; note that the JPA sepcification makes use + * of exceptions outside its exception hierarchy, though they are all runtime exceptions. + * + * Any appropriate/needed calls to {@link #handlePersistenceException} are also made. + * + * @param e The Hibernate excepton. + * @return The JPA-specified exception + */ + public RuntimeException convert(HibernateException e); + + /** + * Delegates to {@link #convert} and then throws the given exception. + * + * @param e The exception being handled and finally thrown. + */ public void throwPersistenceException(HibernateException e); public PersistenceException wrapStaleStateException(StaleStateException e); Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java 2009-08-26 14:40:41 UTC (rev 17425) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -17,31 +19,16 @@ * along with this distribution; if not, write to: * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA + * Boston, MA 02110-1301 USA\ */ - -//$Id$ package org.hibernate.ejb; import java.util.Map; -import java.lang.reflect.Field; -import java.lang.reflect.Member; -import java.lang.reflect.Modifier; -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.LoadState; +import javax.persistence.spi.PersistenceUnitInfo; -import org.hibernate.Hibernate; import org.hibernate.ejb.util.PersistenceUtilHelper; -import org.hibernate.intercept.FieldInterceptionHelper; -import org.hibernate.intercept.FieldInterceptor; -import org.hibernate.collection.PersistentCollection; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.proxy.LazyInitializer; /** * Hibernate EJB3 persistence provider implementation Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java 2009-08-26 14:40:41 UTC (rev 17425) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -17,10 +19,8 @@ * along with this distribution; if not, write to: * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA + * Boston, MA 02110-1301 USA\ */ - -//$Id$ package org.hibernate.ejb; import javax.persistence.Query; Added: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java (rev 0) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -0,0 +1,62 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA\ + */ +package org.hibernate.ejb; + +import java.util.Set; +import java.util.HashSet; + +/** + * TODO : javadoc + * + * @author Steve Ebersole + */ +public class QueryHints { + public static final String HINT_TIMEOUT = "org.hibernate.timeout"; + public static final String HINT_COMMENT = "org.hibernate.comment"; + public static final String HINT_FETCH_SIZE = "org.hibernate.fetchSize"; + public static final String HINT_CACHE_REGION = "org.hibernate.cacheRegion"; + public static final String HINT_CACHEABLE = "org.hibernate.cacheable"; + public static final String HINT_READONLY = "org.hibernate.readOnly"; + public static final String HINT_CACHE_MODE = "org.hibernate.cacheMode"; + public static final String HINT_FLUSH_MODE = "org.hibernate.flushMode"; + + private static final Set<String> HINTS = buildHintsSet(); + + private static Set<String> buildHintsSet() { + HashSet<String> hints = new HashSet<String>(); + hints.add( HINT_TIMEOUT ); + hints.add( HINT_COMMENT ); + hints.add( HINT_FETCH_SIZE ); + hints.add( HINT_CACHE_REGION ); + hints.add( HINT_CACHEABLE ); + hints.add( HINT_READONLY ); + hints.add( HINT_CACHE_MODE ); + hints.add( HINT_FLUSH_MODE ); + return java.util.Collections.unmodifiableSet( hints ); + } + + public static Set<String> getDefinedHints() { + return HINTS; + } +} Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java 2009-08-26 14:40:41 UTC (rev 17425) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java 2009-08-26 20:34:58 UTC (rev 17426) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -26,71 +28,187 @@ import java.util.Calendar; import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; -import java.util.HashSet; import java.util.Set; -import java.util.Map; -import javax.persistence.FlushModeType; +import javax.persistence.LockModeType; import javax.persistence.NoResultException; import javax.persistence.NonUniqueResultException; +import javax.persistence.Parameter; import javax.persistence.Query; import javax.persistence.TemporalType; -import static javax.persistence.TemporalType.*; -import javax.persistence.TransactionRequiredException; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; +import static javax.persistence.TemporalType.DATE; +import static javax.persistence.TemporalType.TIME; +import static javax.persistence.TemporalType.TIMESTAMP; +import javax.persistence.TypedQuery; +import javax.persistence.PersistenceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.QueryParameterException; import org.hibernate.TypeMismatchException; +import org.hibernate.engine.query.NamedParameterDescriptor; +import org.hibernate.engine.query.OrdinalParameterDescriptor; +import org.hibernate.hql.QueryExecutionRequestException; import org.hibernate.impl.AbstractQueryImpl; -import org.hibernate.ejb.util.ConfigurationHelper; -import org.hibernate.hql.QueryExecutionRequestException; /** + * Hibernate implementation of both the {@link Query} and {@link TypedQuery} contracts. + * * @author <a href="mailto:gavin@hibernate.org">Gavin King</a> * @author Emmanuel Bernard + * @author Steve Ebersole */ -public class QueryImpl implements Query, HibernateQuery { +public class QueryImpl<X> extends org.hibernate.ejb.AbstractQueryImpl<X> implements TypedQuery<X>, HibernateQuery { + private static final Logger log = LoggerFactory.getLogger( QueryImpl.class ); + private org.hibernate.Query query; - private HibernateEntityManagerImplementor em; - private Boolean isPositional = null; - private int maxResults = -1; - private int firstResult; + private Set<Integer> jpaPositionalIndices; + private Set<Parameter<?>> parameters; public QueryImpl(org.hibernate.Query query, AbstractEntityManagerImpl em) { + super( em ); this.query = query; - this.em = em; + extractParameterInfo(); } - public org.hibernate.Query getHibernateQuery() { - return query; - } + @SuppressWarnings({ "unchecked" }) + private void extractParameterInfo() { + if ( ! AbstractQueryImpl.class.isInstance( query ) ) { + throw new IllegalStateException( "Unknown query type for parameter extraction" ); + } - public int executeUpdate() { - try { - if ( ! em.isTransactionInProgress() ) { - em.throwPersistenceException( new TransactionRequiredException( "Executing an update/delete query" ) ); - return 0; + HashSet<Parameter<?>> parameters = new HashSet<Parameter<?>>(); + AbstractQueryImpl queryImpl = AbstractQueryImpl.class.cast( query ); + + // extract named params + for ( String name : (Set<String>) queryImpl.getParameterMetadata().getNamedParameterNames() ) { + final NamedParameterDescriptor descriptor = + queryImpl.getParameterMetadata().getNamedParameterDescriptor( name ); + final ParameterImpl parameter = new ParameterImpl( + name, + descriptor.getExpectedType() == null + ? null + : descriptor.getExpectedType().getReturnedClass() + ); + parameters.add( parameter ); + if ( descriptor.isJpaStyle() ) { + if ( jpaPositionalIndices == null ) { + jpaPositionalIndices = new HashSet<Integer>(); + } + jpaPositionalIndices.add( Integer.valueOf( name ) ); } - return query.executeUpdate(); } - catch (QueryExecutionRequestException he) { - throw new IllegalStateException(he); + + // extract positional parameters + for ( int i = 0, max = queryImpl.getParameterMetadata().getOrdinalParameterCount(); i < max; i++ ) { + final OrdinalParameterDescriptor descriptor = + queryImpl.getParameterMetadata().getOrdinalParameterDescriptor( i+1 ); + ParameterImpl parameter = new ParameterImpl( + descriptor.getOrdinalPosition() + 1, + descriptor.getExpectedType() == null + ? null + : descriptor.getExpectedType().getReturnedClass() + ); + parameters.add( parameter ); + Integer position = descriptor.getOrdinalPosition(); + if ( jpaPositionalIndices != null && jpaPositionalIndices.contains( position ) ) { + log.warn( "Parameter position [" + position + "] occurred as both JPA and Hibernate positional parameter" ); + } } - catch( TypeMismatchException e ) { - throw new IllegalArgumentException(e); + + this.parameters = java.util.Collections.unmodifiableSet( parameters ); + } + + private static class ParameterImpl implements Parameter { + private final String name; + private final Integer position; + private final Class javaType; + + private ParameterImpl(String name, Class javaType) { + this.name = name; + this.javaType = javaType; + this.position = null; } - catch (HibernateException he) { - em.throwPersistenceException( he ); - return 0; + + private ParameterImpl(Integer position, Class javaType) { + this.position = position; + this.javaType = javaType; + this.name = null; } + + public String getName() { + return name; + } + + public Integer getPosition() { + return position; + } + + public Class getJavaType() { + return javaType; + } } - public List getResultList() { + public org.hibernate.Query getHibernateQuery() { + return query; + } + + protected int internalExecuteUpdate() { + return query.executeUpdate(); + } + + protected void applyMaxResults(int maxResults) { + query.setMaxResults( maxResults ); + } + + protected void applyFirstResult(int firstResult) { + query.setFirstResult( firstResult ); + } + + protected void applyTimeout(int timeout) { + query.setTimeout( timeout ); + } + + protected void applyComment(String comment) { + query.setComment( comment ); + } + + protected void applyFetchSize(int fetchSize) { + query.setFetchSize( fetchSize ); + } + + protected void applyCacheable(boolean isCacheable) { + query.setCacheable( isCacheable ); + } + + protected void applyCacheRegion(String regionName) { + query.setCacheRegion( regionName ); + } + + protected void applyReadOnly(boolean isReadOnly) { + query.setReadOnly( isReadOnly ); + } + + protected void applyCacheMode(CacheMode cacheMode) { + query.setCacheMode( cacheMode ); + } + + protected void applyFlushMode(FlushMode flushMode) { + query.setFlushMode( flushMode ); + } + + /** + * {@inheritDoc} + */ + @SuppressWarnings({ "unchecked" }) + public List<X> getResultList() { try { - return query.list(); + return (List<X>) query.list(); } catch (QueryExecutionRequestException he) { throw new IllegalStateException(he); @@ -99,40 +217,39 @@ throw new IllegalArgumentException(e); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - public Object getSingleResult() { + /** + * {@inheritDoc} + */ + @SuppressWarnings({ "unchecked" }) + public X getSingleResult() { try { - List result; - /* Avoid OOME if the list() is huge (user faulty query) by limiting the query to 2 elements max */ - //FIXME: get rid of this impl binding (HHH-3432) - if ( query instanceof AbstractQueryImpl ) { - if (maxResults != 1) query.setMaxResults( 2 ); //avoid OOME if the list is huge - result = query.list(); - if ( maxResults != -1 ) { - query.setMaxResults( maxResults ); //put back the original value - } - else { - AbstractQueryImpl queryImpl = AbstractQueryImpl.class.cast( query ); - queryImpl.getSelection().setMaxRows( null ); - } + boolean mucked = false; + // IMPL NOTE : the mucking with max results here is attempting to help the user from shooting themselves + // in the foot in the case where they have a large query by limiting the query results to 2 max + if ( getSpecifiedMaxResults() != 1 ) { + mucked = true; + query.setMaxResults( 2 ); //avoid OOME if the list is huge } - else { - //we can't do much because we cannot reset the maxResults => do the full list call - //Not tremendously bad as the user is doing a fault here anyway by calling getSingleREsults on a big list - result = query.list(); + List<X> result = (List<X>) query.list(); + if ( mucked ) { + query.setMaxResults( getSpecifiedMaxResults() ); } if ( result.size() == 0 ) { - em.throwPersistenceException( new NoResultException( "No entity found for query" ) ); + NoResultException nre = new NoResultException( "No entity found for query" ); + getEntityManager().handlePersistenceException( nre ); + throw nre; } else if ( result.size() > 1 ) { - Set uniqueResult = new HashSet(result); + Set<X> uniqueResult = new HashSet<X>(result); if ( uniqueResult.size() > 1 ) { - em.throwPersistenceException( new NonUniqueResultException( "result returns more than one elements") ); + NonUniqueResultException nure = new NonUniqueResultException( "result returns more than one elements" ); + getEntityManager().handlePersistenceException( nure ); + throw nure; } else { return uniqueResult.iterator().next(); @@ -140,9 +257,8 @@ } else { - return result.get(0); + return result.get( 0 ); } - return null; //should never happen } catch (QueryExecutionRequestException he) { throw new IllegalStateException(he); @@ -151,93 +267,56 @@ throw new IllegalArgumentException(e); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - public Query setMaxResults(int maxResult) { - if ( maxResult < 0 ) { - throw new IllegalArgumentException( - "Negative (" - + maxResult - + ") parameter passed in to setMaxResults" - ); + public <T> TypedQuery<X> setParameter(Parameter<T> param, T value) { + if ( ! parameters.contains( param ) ) { + throw new IllegalArgumentException( "Specified parameter was not found in query" ); } - this.maxResults = maxResult; - query.setMaxResults( maxResult ); + if ( param.getName() != null ) { + // a named param, for not delegate out. Eventually delegate *into* this method... + setParameter( param.getName(), value ); + } + else { + setParameter( param.getPosition(), value ); + } return this; } - public int getMaxResults() { - return maxResults == -1 ? Integer.MAX_VALUE : maxResults; //stupid spec MAX_VALUE?? - } - - public Query setFirstResult(int firstResult) { - if ( firstResult < 0 ) { - throw new IllegalArgumentException( - "Negative (" - + firstResult - + ") parameter passed in to setFirstResult" - ); + public TypedQuery<X> setParameter(Parameter<Date> param, Date value, TemporalType temporalType) { + if ( ! parameters.contains( param ) ) { + throw new IllegalArgumentException( "Specified parameter was not found in query" ); } - query.setFirstResult( firstResult ); - this.firstResult = firstResult; + if ( param.getName() != null ) { + // a named param, for not delegate out. Eventually delegate *into* this method... + setParameter( param.getName(), value, temporalType ); + } + else { + setParameter( param.getPosition(), value, temporalType ); + } return this; } - public int getFirstResult() { - return firstResult; - } - - public Query setHint(String hintName, Object value) { - try { - if ( "org.hibernate.timeout".equals( hintName ) ) { - query.setTimeout( ConfigurationHelper.getInteger( value ) ); - } - else if ( "org.hibernate.comment".equals( hintName ) ) { - query.setComment( (String) value ); - } - else if ( "org.hibernate.fetchSize".equals( hintName ) ) { - query.setFetchSize( ConfigurationHelper.getInteger( value ) ); - } - else if ( "org.hibernate.cacheRegion".equals( hintName ) ) { - query.setCacheRegion( (String) value ); - } - else if ( "org.hibernate.cacheable".equals( hintName ) ) { - query.setCacheable( ConfigurationHelper.getBoolean( value ) ); - } - else if ( "org.hibernate.readOnly".equals( hintName ) ) { - query.setReadOnly( ConfigurationHelper.getBoolean( value ) ); - } - else if ( "org.hibernate.cacheMode".equals( hintName ) ) { - query.setCacheMode( ConfigurationHelper.getCacheMode( value ) ); - } - else if ( "org.hibernate.flushMode".equals( hintName ) ) { - query.setFlushMode( ConfigurationHelper.getFlushMode( value ) ); - } - //TODO: - /*else if ( "org.hibernate.lockMode".equals( hintName ) ) { - query.setLockMode( alias, lockMode ); - }*/ + public TypedQuery<X> setParameter(Parameter<Calendar> param, Calendar value, TemporalType temporalType) { + if ( ! parameters.contains( param ) ) { + throw new IllegalArgumentException( "Specified parameter was not found in query" ); } - catch (ClassCastException e) { - throw new IllegalArgumentException( "Value for hint" ); + if ( param.getName() != null ) { + // a named param, for not delegate out. Eventually delegate *into* this method... + setParameter( param.getName(), value, temporalType ); } + else { + setParameter( param.getPosition(), value, temporalType ); + } return this; } - public Map<String, Object> getHints() { - //FIXME - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - public Set<String> getSupportedHints() { - //FIXME - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - public Query setParameter(String name, Object value) { + /** + * {@inheritDoc} + */ + public TypedQuery<X> setParameter(String name, Object value) { try { if ( value instanceof Collection ) { query.setParameterList( name, (Collection) value ); @@ -245,18 +324,21 @@ else { query.setParameter( name, value ); } + registerParameterBinding( getParameter( name ), value ); return this; } catch (QueryParameterException e) { throw new IllegalArgumentException( e ); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - public Query setParameter(String name, Date value, TemporalType temporalType) { + /** + * {@inheritDoc} + */ + public TypedQuery<X> setParameter(String name, Date value, TemporalType temporalType) { try { if ( temporalType == DATE ) { query.setDate( name, value ); @@ -267,18 +349,21 @@ else if ( temporalType == TIMESTAMP ) { query.setTimestamp( name, value ); } + registerParameterBinding( getParameter( name ), value ); return this; } catch (QueryParameterException e) { throw new IllegalArgumentException( e ); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - public Query setParameter(String name, Calendar value, TemporalType temporalType) { + /** + * {@inheritDoc} + */ + public TypedQuery<X> setParameter(String name, Calendar value, TemporalType temporalType) { try { if ( temporalType == DATE ) { query.setCalendarDate( name, value ); @@ -289,24 +374,28 @@ else if ( temporalType == TIMESTAMP ) { query.setCalendar( name, value ); } + registerParameterBinding( getParameter(name), value ); return this; } catch (QueryParameterException e) { throw new IllegalArgumentException( e ); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - public Query setParameter(int position, Object value) { + /** + * {@inheritDoc} + */ + public TypedQuery<X> setParameter(int position, Object value) { try { - if ( isPositionalParameter() ) { + if ( isJpaPositionalParameter( position ) ) { this.setParameter( Integer.toString( position ), value ); } else { query.setParameter( position - 1, value ); + registerParameterBinding( getParameter( position ), value ); } return this; } @@ -314,35 +403,20 @@ throw new IllegalArgumentException( e ); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - private boolean isPositionalParameter() { - if (isPositional == null) { - //compute it - String queryString = query.getQueryString(); - int index = queryString.indexOf( '?' ); - //there is a ? and the following char is a digit - if (index == -1) { - //no ? - isPositional = true; - } - else if ( index == queryString.length() - 1 ) { - // "... ?" - isPositional = false; - } - else { - isPositional = Character.isDigit( queryString.charAt( index + 1 ) ); - } - } - return isPositional; + private boolean isJpaPositionalParameter(int position) { + return jpaPositionalIndices != null && jpaPositionalIndices.contains( position ); } - public Query setParameter(int position, Date value, TemporalType temporalType) { + /** + * {@inheritDoc} + */ + public TypedQuery<X> setParameter(int position, Date value, TemporalType temporalType) { try { - if ( isPositionalParameter() ) { + if ( isJpaPositionalParameter( position ) ) { String name = Integer.toString( position ); this.setParameter( name, value, temporalType ); } @@ -356,6 +430,7 @@ else if ( temporalType == TIMESTAMP ) { query.setTimestamp( position - 1, value ); } + registerParameterBinding( getParameter( position ), value ); } return this; } @@ -363,14 +438,16 @@ throw new IllegalArgumentException( e ); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - public Query setParameter(int position, Calendar value, TemporalType temporalType) { + /** + * {@inheritDoc} + */ + public TypedQuery<X> setParameter(int position, Calendar value, TemporalType temporalType) { try { - if ( isPositionalParameter() ) { + if ( isJpaPositionalParameter( position ) ) { String name = Integer.toString( position ); this.setParameter( name, value, temporalType ); } @@ -384,6 +461,7 @@ else if ( temporalType == TIMESTAMP ) { query.setCalendar( position - 1, value ); } + registerParameterBinding( getParameter( position ), value ); } return this; } @@ -391,83 +469,117 @@ throw new IllegalArgumentException( e ); } catch (HibernateException he) { - em.throwPersistenceException( he ); - return null; + throw getEntityManager().convert( he ); } } - //FIXME + /** + * {@inheritDoc} + */ public Set<Parameter<?>> getParameters() { - return null; //To change body of implemented methods use File | Settings | File Templates. + return parameters; } - //FIXME + /** + * {@inheritDoc} + */ public Parameter<?> getParameter(String name) { - return null; //To change body of implemented methods use File | Settings | File Templates. + if ( name == null ) { + throw new IllegalArgumentException( "Name of parameter to locate cannot be null" ); + } + for ( Parameter parameter : parameters ) { + if ( name.equals( parameter.getName() ) ) { + return parameter; + } + } + throw new IllegalArgumentException( "Unable to locate parameter named [" + name + "]" ); } - //FIXME + /** + * {@inheritDoc} + */ public Parameter<?> getParameter(int position) { - return null; //To change body of implemented methods use File | Settings | File Templates. + if ( isJpaPositionalParameter( position ) ) { + return getParameter( Integer.toString( position ) ); + } + else { + for ( Parameter parameter : parameters ) { + if ( parameter.getPosition() != null && position == parameter.getPosition() ) { + return parameter; + } + } + throw new IllegalArgumentException( "Unable to locate parameter with position [" + position + "]" ); + } } - //FIXME + /** + * {@inheritDoc} + */ + @SuppressWarnings({ "unchecked" }) public <T> Parameter<T> getParameter(String name, Class<T> type) { - return null; //To change body of implemented methods use File | Settings | File Templates. + Parameter param = getParameter( name ); + if ( param.getJavaType() != null ) { + // we were able to determine the expected type during analysis, so validate it here + throw new IllegalArgumentException( + "Parameter type [" + param.getJavaType().getName() + + "] is not assignment compatible with requested type [" + + type.getName() + "]" + ); + } + return param; } - //FIXME + /** + * {@inheritDoc} + */ + @SuppressWarnings({ "unchecked" }) public <T> Parameter<T> getParameter(int position, Class<T> type) { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - //FIXME - public boolean isBound(Parameter<?> param) { - return false; //To change body of implemented methods use File | Settings | File Templates. - } - - //FIXME - public <T> T getParameterValue(Parameter<T> param) { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - //FIXME - public Object getParameterValue(String name) { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - //FIXME - public Object getParameterValue(int position) { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - public Query setFlushMode(FlushModeType flushMode) { - if ( flushMode == FlushModeType.AUTO ) { - query.setFlushMode( FlushMode.AUTO ); + Parameter param = getParameter( position ); + if ( param.getJavaType() != null ) { + // we were able to determine the expected type during analysis, so validate it here + throw new IllegalArgumentException( + "Parameter type [" + param.getJavaType().getName() + + "] is not assignment compatible with requested type [" + + type.getName() + "]" + ); } - else if ( flushMode == FlushModeType.COMMIT ) { - query.setFlushMode( FlushMode.COMMIT ); - } - return this; + return param; } - public FlushModeType getFlushMode() { - //FIXME - return null; //To change body of implemented methods use File | Settings | File Templates. + /** + * {@inheritDoc} + */ + public TypedQuery<X> setLockMode(LockModeType lockModeType) { + // TODO : aye aye aye + throw new UnsupportedOperationException( "Not yet implemented" ); } - public Query setLockMode(LockModeType lockModeType) { - //FIXME - return null; //To change body of implemented methods use File | Settings | File Templates. - } - + /** + * {@inheritDoc} + */ public LockModeType getLockMode() { - //FIXME - return null; //To change body of implemented methods use File | Settings | File Templates. + return LockModeType.NONE; } + /** + * {@inheritDoc} + */ + @SuppressWarnings({ "unchecked" }) public <T> T unwrap(Class<T> tClass) { - //FIXME - return null; //To change body of implemented methods use File | Settings | File Templates. + if ( org.hibernate.Query.class.isAssignableFrom( tClass ) ) { + return (T) query; + } + else { + try { + return (T) this; + } + catch ( ClassCastException cce ) { + PersistenceException pe = new PersistenceException( + "Unsupported unwrap target type [" + tClass.getName() + "]" + ); + getEntityManager().handlePersistenceException( pe ); + throw pe; + } + } } }

15 years, 4 months

1
0
0 / 0

Re: [hibernate-commits] Order status

by hibernate-commits＠lists.jboss.org

15 years, 4 months

1
0
0 / 0

Hibernate SVN: r17425 - validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-08-26 10:40:41 -0400 (Wed, 26 Aug 2009) New Revision: 17425 Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java Log: removed System.err call Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java 2009-08-26 14:29:30 UTC (rev 17424) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java 2009-08-26 14:40:41 UTC (rev 17425) @@ -47,13 +47,6 @@ final Set<ConstraintViolation<Customer>> violations = validator.validate( new Customer(), Default.class ); - for ( final ConstraintViolation<Customer> violation : violations ) { - System.err.println( - violation.getPropertyPath() + " " - + violation.getMessage() - ); - } - assertEquals( violations.size(), 1 ); } }

15 years, 4 months

1
0
0 / 0

Hibernate SVN: r17424 - validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validator/xml.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-08-26 10:29:30 -0400 (Wed, 26 Aug 2009) New Revision: 17424 Added: validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validator/xml/mapping.xml Log: HV-214 Added: validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validator/xml/mapping.xml =================================================================== --- validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validator/xml/mapping.xml (rev 0) +++ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validator/xml/mapping.xml 2009-08-26 14:29:30 UTC (rev 17424) @@ -0,0 +1,16 @@ +<constraint-mappings + xmlns="http://jboss.org/xml/ns/javax/validation/mapping" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation= + "http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"> + + <default-package>org.hibernate.validator.xml</default-package> + + <bean class="Person" ignore-annotations="false"> + <getter name="firstName"> + <constraint annotation="javax.validation.constraints.NotNull"/> + </getter> + </bean> + + <bean class="Customer" ignore-annotations="false"/> +</constraint-mappings> \ No newline at end of file

15 years, 4 months

1
0
0 / 0

Hibernate SVN: r17423 - in validator/trunk/hibernate-validator/src: main/java/org/hibernate/validator/metadata and 9 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-08-26 10:28:57 -0400 (Wed, 26 Aug 2009) New Revision: 17423 Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Customer.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Person.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java validator/trunk/hibernate-validator/src/test/resources/org/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validator/ validator/trunk/hibernate-validator/src/test/resources/org/hibernate/validator/xml/ Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/MetaConstraint.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml Log: HV-214 Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java 2009-08-26 12:38:04 UTC (rev 17422) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -20,6 +20,8 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Member; +import java.util.ArrayList; +import java.util.List; import java.util.Set; import javax.validation.ConstraintValidatorFactory; import javax.validation.MessageInterpolator; @@ -28,6 +30,7 @@ import javax.validation.Validator; import javax.validation.ValidatorContext; import javax.validation.ValidatorFactory; +import javax.validation.metadata.ConstraintDescriptor; import javax.validation.spi.ConfigurationState; import org.hibernate.validator.metadata.AnnotationIgnores; @@ -35,6 +38,7 @@ import org.hibernate.validator.metadata.BeanMetaDataImpl; import org.hibernate.validator.metadata.ConstraintHelper; import org.hibernate.validator.metadata.MetaConstraint; +import org.hibernate.validator.util.ReflectionHelper; import org.hibernate.validator.xml.XmlMappingParser; /** @@ -88,25 +92,54 @@ XmlMappingParser mappingParser = new XmlMappingParser( constraintHelper ); mappingParser.parse( mappingStreams ); + Set<Class<?>> processedClasses = mappingParser.getProcessedClasses(); AnnotationIgnores annotationIgnores = mappingParser.getAnnotationIgnores(); - for ( Class<?> clazz : mappingParser.getProcessedClasses() ) { + for ( Class<?> clazz : processedClasses ) { + @SuppressWarnings("unchecked") Class<T> beanClass = ( Class<T> ) clazz; BeanMetaDataImpl<T> metaData = new BeanMetaDataImpl<T>( beanClass, constraintHelper, annotationIgnores ); - for ( MetaConstraint<T, ? extends Annotation> constraint : mappingParser.getConstraintsForClass( beanClass ) ) { - metaData.addMetaConstraint( beanClass, constraint ); + List<Class<?>> classes = new ArrayList<Class<?>>(); + ReflectionHelper.computeClassHierarchy( beanClass, classes ); + for ( Class<?> classInHierarchy : classes ) { + if ( processedClasses.contains( classInHierarchy ) ) { + addXmlConfiguredConstraintToMetaData( mappingParser, beanClass, classInHierarchy, metaData ); + } } - for ( Member m : mappingParser.getCascadedMembersForClass( beanClass ) ) { - metaData.addCascadedMember( m ); - } - if ( !mappingParser.getDefaultSequenceForClass( beanClass ).isEmpty() ) { metaData.setDefaultGroupSequence( mappingParser.getDefaultSequenceForClass( beanClass ) ); } + beanMetaDataCache.addBeanMetaData( beanClass, metaData ); } } + + private <T, A extends Annotation> void addXmlConfiguredConstraintToMetaData(XmlMappingParser mappingParser, Class<T> rootClass, Class<?> hierarchyClass, BeanMetaDataImpl<T> metaData) { + for ( MetaConstraint<?, ? extends Annotation> constraint : mappingParser.getConstraintsForClass( hierarchyClass ) ) { + if ( hierarchyClass.equals( rootClass ) ) { + @SuppressWarnings("unchecked") // safe cast due to the class check + MetaConstraint<T, ? extends Annotation> castedConstrain = ( MetaConstraint<T, ? extends Annotation> ) constraint; + metaData.addMetaConstraint( hierarchyClass, castedConstrain ); + } + else { + MetaConstraint<T, A> newMetaConstraint; + @SuppressWarnings("unchecked") + ConstraintDescriptor<A> descriptor = ( ConstraintDescriptor<A> ) constraint.getDescriptor(); + if ( constraint.getMember() == null ) { + newMetaConstraint = new MetaConstraint<T, A>( rootClass, descriptor ); + } + else { + newMetaConstraint = new MetaConstraint<T, A>( constraint.getMember(), rootClass, descriptor ); + } + metaData.addMetaConstraint( hierarchyClass, newMetaConstraint ); + } + } + + for ( Member m : mappingParser.getCascadedMembersForClass( hierarchyClass ) ) { + metaData.addCascadedMember( m ); + } + } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java 2009-08-26 12:38:04 UTC (rev 17422) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -227,35 +227,14 @@ private void createMetaData(AnnotationIgnores annotationIgnores) { beanDescriptor = new BeanDescriptorImpl<T>( this ); initDefaultGroupSequence(); - List<Class> classes = new ArrayList<Class>(); - computeClassHierarchy( beanClass, classes ); - for ( Class current : classes ) { + List<Class<?>> classes = new ArrayList<Class<?>>(); + ReflectionHelper.computeClassHierarchy( beanClass, classes ); + for ( Class<?> current : classes ) { initClass( current, annotationIgnores ); } } - /** - * Get all superclasses and interfaces recursively. - * - * @param clazz The class to start the search with. - * @param classes List of classes to which to add all found super classes and interfaces. - */ - private void computeClassHierarchy(Class clazz, List<Class> classes) { - if ( log.isTraceEnabled() ) { - log.trace( "Processing: {}", clazz ); - } - for ( Class current = clazz; current != null; current = current.getSuperclass() ) { - if ( classes.contains( current ) ) { - return; - } - classes.add( current ); - for ( Class currentInterface : current.getInterfaces() ) { - computeClassHierarchy( currentInterface, classes ); - } - } - } - - private void initClass(Class clazz, AnnotationIgnores annotationIgnores) { + private void initClass(Class<?> clazz, AnnotationIgnores annotationIgnores) { initClassConstraints( clazz, annotationIgnores ); initMethodConstraints( clazz, annotationIgnores ); initFieldConstraints( clazz, annotationIgnores ); Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/MetaConstraint.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/MetaConstraint.java 2009-08-26 12:38:04 UTC (rev 17422) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/MetaConstraint.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -37,7 +37,7 @@ /** * Instances of this class abstract the constraint type (class, method or field constraint) and give access to - * meta data about the constraint. This allows a unified handling of constraints in the validator imlpementation. + * meta data about the constraint. This allows a unified handling of constraints in the validator implementation. * * @author Hardy Ferentschik */ @@ -108,7 +108,7 @@ return constraintTree.getDescriptor().getGroups(); } - public ConstraintDescriptor getDescriptor() { + public ConstraintDescriptor<A> getDescriptor() { return constraintTree.getDescriptor(); } @@ -132,15 +132,11 @@ return elementType; } - public ConstraintTree getConstraintTree() { - return constraintTree; - } - public <T, U, V> boolean validateConstraint(GlobalExecutionContext<T> executionContext, LocalExecutionContext<U, V> localExecutionContext) { List<ConstraintViolation<T>> constraintViolations = new ArrayList<ConstraintViolation<T>>(); localExecutionContext.setElementType( elementType ); constraintTree.validateConstraints( - typeOfAnnoatedElement(), executionContext, localExecutionContext, constraintViolations + typeOfAnnotatedElement(), executionContext, localExecutionContext, constraintViolations ); if ( constraintViolations.size() > 0 ) { executionContext.addConstraintFailures( constraintViolations ); @@ -166,7 +162,7 @@ } } - private Type typeOfAnnoatedElement() { + private Type typeOfAnnotatedElement() { Type t; switch ( elementType ) { case TYPE: { @@ -176,7 +172,7 @@ default: { t = ReflectionHelper.typeOf( member ); if ( t instanceof Class && ( ( Class ) t ).isPrimitive() ) { - t = ReflectionHelper.boxedTyp( t ); + t = ReflectionHelper.boxedType( t ); } } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java 2009-08-26 12:38:04 UTC (rev 17422) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -50,7 +50,7 @@ private ReflectionHelper() { } - //run client in priviledge block + //run client in privileged block @SuppressWarnings("unchecked") static <T> T getAnnotationParameter(Annotation annotation, String parameterName, Class<T> type) { try { @@ -126,29 +126,9 @@ } /** - * Returns the type of the field of return type of a method. - * - * @param member the member for which to get the type. - * - * @return Returns the type of the field of return type of a method. - */ - public static Class<?> getAnnotations(Member member) { - - Class<?> type = null; - if ( member instanceof Field ) { - type = ( ( Field ) member ).getType(); - } - - if ( member instanceof Method ) { - type = ( ( Method ) member ).getReturnType(); - } - return type; - } - - /** * @param member The <code>Member</code> instance for which to retrieve the type. * - * @return Retrurns the <code>Type</code> of the given <code>Field</code> or <code>Method</code>. + * @return Returns the <code>Type</code> of the given <code>Field</code> or <code>Method</code>. * * @throws IllegalArgumentException in case <code>member</code> is not a <code>Field</code> or <code>Method</code>. */ @@ -190,7 +170,7 @@ return value; } - //run client in priviledge block + //run client in privileged block static void setAccessibility(Member member) { if ( !Modifier.isPublic( member.getModifiers() ) ) { //Sun's ease of use, sigh... @@ -347,7 +327,7 @@ * * @return Returns the method with the specified name or <code>null</code> if it does not exist. */ - //run client in priviledge block + //run client in privileged block static Method getMethod(Class<?> clazz, String methodName) { try { char string[] = methodName.toCharArray(); @@ -374,7 +354,7 @@ * * @throws IllegalArgumentException in case the parameter {@code primitiveType} does not represent a primitive type. */ - public static Class<?> boxedTyp(Type primitiveType) { + public static Class<?> boxedType(Type primitiveType) { if ( !( primitiveType instanceof Class ) && !( ( Class ) primitiveType ).isPrimitive() ) { throw new IllegalArgumentException( primitiveType.getClass() + "has to be a primitive type" ); } @@ -414,7 +394,7 @@ * @param clazz The class to start the search with. * @param classes List of classes to which to add all found super classes and interfaces. */ - private static void computeClassHierarchy(Class<?> clazz, List<Class<?>> classes) { + public static void computeClassHierarchy(Class<?> clazz, List<Class<?>> classes) { for ( Class current = clazz; current != null; current = current.getSuperclass() ) { if ( classes.contains( current ) ) { return; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java 2009-08-26 12:38:04 UTC (rev 17422) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -120,7 +120,7 @@ if ( constraintMap.containsKey( beanClass ) ) { for ( MetaConstraint<?, ? extends Annotation> metaConstraint : constraintMap.get( beanClass ) ) { @SuppressWarnings("unchecked") // safe cast since the list of meta constraints is always specific to the bean type - MetaConstraint<T, ? extends Annotation> boundMetaConstraint = ( MetaConstraint<T, ? extends Annotation> ) metaConstraint; + MetaConstraint<T, ? extends Annotation> boundMetaConstraint = ( MetaConstraint<T, ? extends Annotation> ) metaConstraint; list.add( boundMetaConstraint ); } return list; Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Customer.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Customer.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Customer.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -0,0 +1,71 @@ +// $Id: Order.java 17421 2009-08-26 12:25:39Z hardy.ferentschik $ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validator.xml; + +/** + * @author Hardy Ferentschik + */ +public class Customer implements Person { + private String firstName; + private String middleName; + private String lastName; + + private String customerId; + + private String password; + + public String getFirstName() { + return this.firstName; + } + + public void setFirstName(final String firstName) { + this.firstName = firstName; + } + + public String getMiddleName() { + return this.middleName; + } + + public void setMiddleName(final String middleName) { + this.middleName = middleName; + } + + public String getLastName() { + return this.lastName; + } + + public void setLastName(final String lastName) { + this.lastName = lastName; + } + + public String getCustomerId() { + return this.customerId; + } + + public void setCustomerId(final String customerId) { + this.customerId = customerId; + } + + public String getPassword() { + return this.password; + } + + public void setPassword(final String password) { + this.password = password; + } +} \ No newline at end of file Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Person.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Person.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/Person.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -0,0 +1,30 @@ +// $Id: Order.java 17421 2009-08-26 12:25:39Z hardy.ferentschik $ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validator.xml; + +/** + * @author Hardy Ferentschik + */ +public interface Person { + + String getFirstName(); + + String getMiddleName(); + + String getLastName(); +} \ No newline at end of file Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/XmlMappingTest.java 2009-08-26 14:28:57 UTC (rev 17423) @@ -0,0 +1,59 @@ +// $Id: Order.java 17421 2009-08-26 12:25:39Z hardy.ferentschik $ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validator.xml; + +import java.util.Set; +import javax.validation.Configuration; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; +import javax.validation.groups.Default; + +import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +/** + * @author Hardy Ferentschik + */ +public class XmlMappingTest { + + @Test + /** + * HV-214 + */ + public void testConstraintInheritanceWithXmlConfiguration() { + + final Configuration<?> configuration = Validation.byDefaultProvider().configure(); + configuration.addMapping( XmlMappingTest.class.getResourceAsStream( "mapping.xml" ) ); + + final ValidatorFactory validatorFactory = configuration.buildValidatorFactory(); + final Validator validator = validatorFactory.getValidator(); + + final Set<ConstraintViolation<Customer>> violations = validator.validate( new Customer(), Default.class ); + + for ( final ConstraintViolation<Customer> violation : violations ) { + System.err.println( + violation.getPropertyPath() + " " + + violation.getMessage() + ); + } + + assertEquals( violations.size(), 1 ); + } +} Modified: validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml =================================================================== --- validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml 2009-08-26 12:38:04 UTC (rev 17422) +++ validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml 2009-08-26 14:28:57 UTC (rev 17423) @@ -11,8 +11,10 @@ <package name="org.hibernate.validator.engine.messageinterpolation"/> <package name="org.hibernate.validator.engine.groups"/> <package name="org.hibernate.validator.engine.traversableresolver"/> + <package name="org.hibernate.validator.metadata"/> <package name="org.hibernate.validator.util"/> <package name="org.hibernate.validator.util.annotationfactory"/> + <package name="org.hibernate.validator.xml"/> </packages> </test> </suite> \ No newline at end of file

15 years, 4 months

1
0
0 / 0

Hibernate SVN: r17422 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validator/constraints and 4 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-08-26 08:38:04 -0400 (Wed, 26 Aug 2009) New Revision: 17422 Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/ConstraintValidatorContextTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Interval.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Item.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEndImpl.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/CompositeConstraintTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/Person.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationTest.java Log: * Added license header * Enabled svn keyword substitution * Fixed some typos Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; @@ -2,4 +19,2 @@ -import org.hibernate.validator.util.ReflectionHelper; - /** Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.lang.annotation.Annotation; @@ -3,6 +20,4 @@ import java.security.PrivilegedAction; -import org.hibernate.validator.util.ReflectionHelper; - /** * @author Emmanuel Bernard Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.lang.reflect.Constructor; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,10 +1,25 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; +import java.lang.reflect.Field; import java.security.PrivilegedAction; -import java.lang.reflect.Field; -import org.hibernate.validator.util.ReflectionHelper; - /** * @author Emmanuel Bernard */ Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.lang.reflect.Method; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.lang.reflect.Method; @@ -3,6 +20,4 @@ import java.security.PrivilegedAction; -import org.hibernate.validator.util.ReflectionHelper; - /** * @author Emmanuel Bernard Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,4 +1,4 @@ -// $Id: ValidatorFactoryImpl.java 16960 2009-06-29 11:48:29Z hardy.ferentschik $ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.security.PrivilegedAction; @@ -24,13 +41,13 @@ return clazz.newInstance(); } catch ( InstantiationException e ) { - throw new ValidationException( "Unable to instanciate " + message + ": " + clazz, e ); + throw new ValidationException( "Unable to instantiate " + message + ": " + clazz, e ); } catch ( IllegalAccessException e ) { - throw new ValidationException( "Unable to instanciate " + clazz, e ); + throw new ValidationException( "Unable to instantiate " + clazz, e ); } catch ( RuntimeException e ) { - throw new ValidationException( "Unable to instanciate " + clazz, e ); + throw new ValidationException( "Unable to instantiate " + clazz, e ); } } } Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -1,3 +1,20 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.hibernate.validator.util; import java.lang.reflect.Member; @@ -3,6 +20,4 @@ import java.security.PrivilegedAction; -import org.hibernate.validator.util.ReflectionHelper; - /** * @author Emmanuel Bernard Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/ConstraintValidatorContextTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Interval.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Item.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEndImpl.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/CompositeConstraintTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/Person.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java ___________________________________________________________________ Name: svn:keywords + Id Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java 2009-08-26 12:25:39 UTC (rev 17421) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java 2009-08-26 12:38:04 UTC (rev 17422) @@ -31,7 +31,7 @@ */ public class GroupChainTest { @Test - public void testAssertDefaulGroupSequenceIsExpandableWithDefaultAtEndOfSequence() { + public void testAssertDefaultGroupSequenceIsExpandableWithDefaultAtEndOfSequence() { // create a dummy sequence Group a = new Group( GroupA.class, TestSequence.class ); Group b = new Group( GroupB.class, TestSequence.class ); Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java ___________________________________________________________________ Name: svn:keywords + Id Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationTest.java ___________________________________________________________________ Name: svn:keywords + Id

15 years, 4 months

1
0
0 / 0

Hibernate SVN: r17421 - in validator/trunk: hibernate-validator/src/main/docbook/en-US/modules and 30 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-08-26 08:25:39 -0400 (Wed, 26 Aug 2009) New Revision: 17421 Added: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/ Removed: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/ Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml validator/trunk/hibernate-validator/pom.xml validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/AssertFalseValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/AssertTrueValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/FutureValidatorForCalendar.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/FutureValidatorForDate.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LengthValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NotNullValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NullValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PastValidatorForCalendar.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PastValidatorForDate.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PatternValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArray.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfBoolean.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfByte.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfChar.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfDouble.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfFloat.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfInt.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfLong.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfPrimitives.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfShort.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForCollection.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForMap.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintTree.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorFactoryImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintViolationImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/GlobalExecutionContext.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/LocalExecutionContext.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/MessageInterpolatorContext.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/NodeImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/PathImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ResourceBundleMessageInterpolator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorContextImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/Group.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/GroupChain.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/GroupChainGenerator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/DefaultTraversableResolver.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/SingleThreadCachedTraversableResolver.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/AnnotationIgnores.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanDescriptorImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaData.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataCache.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintHelper.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ElementDescriptorImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/MetaConstraint.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/PropertyDescriptorImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/IdentitySet.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoggerFactory.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ValidatorTypeHelper.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/Version.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationDescriptor.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationFactory.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationProxy.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationBootstrapParameters.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages.properties validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/ValidationMessages.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/Customer.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/Order.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/ValidationTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/ConstraintValidatorContextTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Interval.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Item.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEndImpl.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/CompositeConstraintTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/Person.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/AssertFalseValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/AssertTrueValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DateHolder.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumberTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForStringTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorForCalendarTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorForDateTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/LengthValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumberTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForStringTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForNumberTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForStringTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/NotNullValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/NullValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PastValidatorForCalendarTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PastValidatorForDateTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PatternValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/SizeValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/PathImplTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Address.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence1.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence2.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/First.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainGeneratorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Last.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Second.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/ZipCodeCoherenceChecker.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/ZipCodeCoherenceValidator.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/CachedTraversableResolverTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Cloth.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Jacket.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Suit.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Trousers.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/ConstraintHelperTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Customer.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/ElementDescriptorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Engine.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Order.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Person.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/BoundariesConstraintValidator.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/IdentitySetTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/Positive.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/PositiveConstraintValidator.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/TestUtil.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ValidatorTypeTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/annotationfactory/AnnotationFactoryTest.java validator/trunk/hibernate-validator/src/test/resources/log4j.properties validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml Log: HV-185 Changed package name from org.hibernate.validation to org.hibernate.validator Modified: validator/trunk/hibernate-validator/pom.xml =================================================================== --- validator/trunk/hibernate-validator/pom.xml 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/pom.xml 2009-08-26 12:25:39 UTC (rev 17421) @@ -101,7 +101,7 @@ </execution> </executions> <configuration> - <packageName>org.hibernate.validation.xml</packageName> + <packageName>org.hibernate.validator.xml</packageName> <outputDirectory>${basedir}/target/generated-sources</outputDirectory> <extension>true</extension> </configuration> @@ -151,7 +151,7 @@ <relocations> <relocation> <pattern>com.googlecode.jtype</pattern> - <shadedPattern>org.hibernate.validation.jtype</shadedPattern> + <shadedPattern>org.hibernate.validator.jtype</shadedPattern> </relocation> </relocations> <transformers> Modified: validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml =================================================================== --- validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml 2009-08-26 12:25:39 UTC (rev 17421) @@ -293,7 +293,7 @@ cause each contained element to be validated, when the parent object is validated.</para> - <programlisting>package com.mycompany; + <programlisting><![CDATA[package com.mycompany; import java.util.ArrayList; import java.util.List; @@ -303,14 +303,14 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.hibernate.validation.constraints.NotEmpty; +import org.hibernate.validator.constraints.NotEmpty; public class Car { @NotNull @Valid private List<Person> passengers = new ArrayList<Person>(); - + public Car(List<Person> passengers) { this.passengers = passengers; @@ -318,7 +318,7 @@ //getters and setters ... -}</programlisting> +}]]></programlisting> <para>If a <classname>Car</classname> instance is validated now, a <classname>ConstraintValidation</classname> will be raised, if any of Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator (from rev 17420, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation) Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation; +package org.hibernate.validator; import javax.validation.Configuration; import javax.validation.ValidatorFactory; @@ -23,9 +23,9 @@ import javax.validation.spi.ConfigurationState; import javax.validation.spi.ValidationProvider; -import org.hibernate.validation.engine.ConfigurationImpl; -import org.hibernate.validation.engine.ValidatorConfiguration; -import org.hibernate.validation.engine.ValidatorFactoryImpl; +import org.hibernate.validator.engine.ConfigurationImpl; +import org.hibernate.validator.engine.ValidatorConfiguration; +import org.hibernate.validator.engine.ValidatorFactoryImpl; /** * Default implementation of <code>ValidationProvider</code> within Hibernate validator. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Length.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints; +package org.hibernate.validator.constraints; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; @@ -27,7 +27,7 @@ import javax.validation.Constraint; import javax.validation.ConstraintPayload; -import org.hibernate.validation.constraints.impl.LengthValidator; +import org.hibernate.validator.constraints.impl.LengthValidator; /** * Validate that the string is between min and max included @@ -44,7 +44,7 @@ int max() default Integer.MAX_VALUE; - String message() default "{org.hibernate.validation.constraints.Length.message}"; + String message() default "{org.hibernate.validator.constraints.Length.message}"; Class<?>[] groups() default { }; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints; +package org.hibernate.validator.constraints; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; @@ -40,7 +40,7 @@ @NotNull @Size(min = 1) public @interface NotEmpty { - String message() default "{org.hibernate.validation.constraints.NotEmpty.message}"; + String message() default "{org.hibernate.validator.constraints.NotEmpty.message}"; Class<?>[] groups() default { }; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/AssertFalseValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/AssertFalseValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/AssertFalseValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/AssertTrueValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/AssertTrueValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/AssertTrueValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/DecimalMaxValidatorForNumber.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import java.math.BigInteger; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/DecimalMaxValidatorForString.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import javax.validation.ConstraintDeclarationException; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/DecimalMinValidatorForNumber.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import java.math.BigInteger; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/DecimalMinValidatorForString.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import javax.validation.ConstraintDeclarationException; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/DigitsValidatorForNumber.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumber.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/DigitsValidatorForString.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForString.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/FutureValidatorForCalendar.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/FutureValidatorForCalendar.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/FutureValidatorForCalendar.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Calendar; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/FutureValidatorForDate.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/FutureValidatorForDate.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/FutureValidatorForDate.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Date; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LengthValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/LengthValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LengthValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.ValidationException; -import org.hibernate.validation.constraints.Length; +import org.hibernate.validator.constraints.Length; /** * Check that a string's length is between min and max. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/MaxValidatorForNumber.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumber.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import java.math.BigInteger; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/MaxValidatorForString.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForString.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/MinValidatorForNumber.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForNumber.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import java.math.BigInteger; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/MinValidatorForString.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForString.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NotNullValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/NotNullValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NotNullValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NullValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/NullValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NullValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PastValidatorForCalendar.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/PastValidatorForCalendar.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PastValidatorForCalendar.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Calendar; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PastValidatorForDate.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/PastValidatorForDate.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PastValidatorForDate.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Date; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PatternValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/PatternValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PatternValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.regex.Matcher; import java.util.regex.PatternSyntaxException; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArray.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArray.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArray.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfBoolean.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfBoolean.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfBoolean.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfByte.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfByte.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfByte.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfChar.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfChar.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfChar.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfDouble.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfDouble.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfDouble.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfFloat.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfFloat.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfFloat.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfInt.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfInt.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfInt.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfLong.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfLong.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfLong.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfPrimitives.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfPrimitives.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfPrimitives.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,11 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; -import java.lang.reflect.Array; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; import javax.validation.ValidationException; import javax.validation.constraints.Size; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfShort.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForArraysOfShort.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfShort.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForCollection.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForCollection.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForCollection.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Collection; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForMap.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForMap.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForMap.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Map; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/impl/SizeValidatorForString.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.io.InputStream; import java.util.List; @@ -33,11 +33,11 @@ import org.slf4j.Logger; -import org.hibernate.validation.engine.resolver.DefaultTraversableResolver; -import org.hibernate.validation.util.LoggerFactory; -import org.hibernate.validation.util.Version; -import org.hibernate.validation.xml.ValidationBootstrapParameters; -import org.hibernate.validation.xml.ValidationXmlParser; +import org.hibernate.validator.engine.resolver.DefaultTraversableResolver; +import org.hibernate.validator.util.LoggerFactory; +import org.hibernate.validator.util.Version; +import org.hibernate.validator.xml.ValidationBootstrapParameters; +import org.hibernate.validator.xml.ValidationXmlParser; /** * Hibernate specific <code>Configuration</code> implementation. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintTree.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintTree.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -34,8 +34,8 @@ import com.googlecode.jtype.TypeUtils; import org.slf4j.Logger; -import org.hibernate.validation.util.LoggerFactory; -import org.hibernate.validation.util.ValidatorTypeHelper; +import org.hibernate.validator.util.LoggerFactory; +import org.hibernate.validator.util.ValidatorTypeHelper; /** * Due to constraint composition a single constraint annotation can lead to a whole constraint tree being validated. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintValidatorContextImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.util.ArrayList; import java.util.List; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorFactoryImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintValidatorFactoryImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorFactoryImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.security.AccessController; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorFactory; -import org.hibernate.validation.util.NewInstance; +import org.hibernate.validator.util.NewInstance; /** * Default <code>ConstraintValidatorFactory</code> using a no-arg constructor. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintViolationImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintViolationImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.lang.annotation.ElementType; import javax.validation.ConstraintViolation; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/GlobalExecutionContext.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/GlobalExecutionContext.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/GlobalExecutionContext.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.util.ArrayList; import java.util.HashMap; @@ -30,7 +30,7 @@ import javax.validation.TraversableResolver; import javax.validation.metadata.ConstraintDescriptor; -import org.hibernate.validation.util.IdentitySet; +import org.hibernate.validator.util.IdentitySet; /** * Context object keeping track of all important data for a top level {@link javax.validation.Validator#validate(Object, Class[])} }, Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/LocalExecutionContext.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/LocalExecutionContext.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/LocalExecutionContext.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.lang.annotation.ElementType; import javax.validation.groups.Default; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/MessageInterpolatorContext.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MessageInterpolatorContext.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/MessageInterpolatorContext.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import javax.validation.metadata.ConstraintDescriptor; import javax.validation.MessageInterpolator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/NodeImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/NodeImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/NodeImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import javax.validation.Path; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/PathImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/PathImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/PathImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.util.ArrayList; import java.util.Iterator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ResourceBundleMessageInterpolator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ResourceBundleMessageInterpolator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ResourceBundleMessageInterpolator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.security.AccessController; import java.util.Locale; @@ -30,8 +30,8 @@ import org.slf4j.Logger; -import org.hibernate.validation.util.GetClassLoader; -import org.hibernate.validation.util.LoggerFactory; +import org.hibernate.validator.util.GetClassLoader; +import org.hibernate.validator.util.LoggerFactory; /** * Resource bundle backed message interpolator. @@ -40,7 +40,7 @@ * @author Hardy Ferentschik */ public class ResourceBundleMessageInterpolator implements MessageInterpolator { - private static final String DEFAULT_VALIDATION_MESSAGES = "org.hibernate.validation.ValidationMessages"; + private static final String DEFAULT_VALIDATION_MESSAGES = "org.hibernate.validator.ValidationMessages"; private static final String USER_VALIDATION_MESSAGES = "ValidationMessages"; private static final Logger log = LoggerFactory.make(); Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorConfiguration.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import javax.validation.Configuration; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorContextImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorContextImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorContextImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import javax.validation.ConstraintValidatorFactory; import javax.validation.MessageInterpolator; @@ -6,8 +6,8 @@ import javax.validation.Validator; import javax.validation.ValidatorContext; -import org.hibernate.validation.metadata.BeanMetaDataCache; -import org.hibernate.validation.metadata.ConstraintHelper; +import org.hibernate.validator.metadata.BeanMetaDataCache; +import org.hibernate.validator.metadata.ConstraintHelper; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorFactoryImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorFactoryImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.io.InputStream; import java.lang.annotation.Annotation; @@ -30,12 +30,12 @@ import javax.validation.ValidatorFactory; import javax.validation.spi.ConfigurationState; -import org.hibernate.validation.metadata.AnnotationIgnores; -import org.hibernate.validation.metadata.BeanMetaDataCache; -import org.hibernate.validation.metadata.BeanMetaDataImpl; -import org.hibernate.validation.metadata.ConstraintHelper; -import org.hibernate.validation.metadata.MetaConstraint; -import org.hibernate.validation.xml.XmlMappingParser; +import org.hibernate.validator.metadata.AnnotationIgnores; +import org.hibernate.validator.metadata.BeanMetaDataCache; +import org.hibernate.validator.metadata.BeanMetaDataImpl; +import org.hibernate.validator.metadata.ConstraintHelper; +import org.hibernate.validator.metadata.MetaConstraint; +import org.hibernate.validator.xml.XmlMappingParser; /** * Factory returning initialized <code>Validator</code> instances. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; @@ -42,16 +42,16 @@ import com.googlecode.jtype.TypeUtils; -import org.hibernate.validation.engine.groups.Group; -import org.hibernate.validation.engine.groups.GroupChain; -import org.hibernate.validation.engine.groups.GroupChainGenerator; -import org.hibernate.validation.engine.resolver.SingleThreadCachedTraversableResolver; -import org.hibernate.validation.metadata.BeanMetaData; -import org.hibernate.validation.metadata.BeanMetaDataCache; -import org.hibernate.validation.metadata.BeanMetaDataImpl; -import org.hibernate.validation.metadata.ConstraintHelper; -import org.hibernate.validation.metadata.MetaConstraint; -import org.hibernate.validation.util.ReflectionHelper; +import org.hibernate.validator.engine.groups.Group; +import org.hibernate.validator.engine.groups.GroupChain; +import org.hibernate.validator.engine.groups.GroupChainGenerator; +import org.hibernate.validator.engine.resolver.SingleThreadCachedTraversableResolver; +import org.hibernate.validator.metadata.BeanMetaData; +import org.hibernate.validator.metadata.BeanMetaDataCache; +import org.hibernate.validator.metadata.BeanMetaDataImpl; +import org.hibernate.validator.metadata.ConstraintHelper; +import org.hibernate.validator.metadata.MetaConstraint; +import org.hibernate.validator.util.ReflectionHelper; /** * The main Bean Validation class. This is the core processing class of Hibernate Validator. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/Group.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/groups/Group.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/Group.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import javax.validation.groups.Default; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/GroupChain.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/groups/GroupChain.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/GroupChain.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import java.util.ArrayList; import java.util.HashMap; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/GroupChainGenerator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/groups/GroupChainGenerator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/groups/GroupChainGenerator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import java.util.ArrayList; import java.util.Collection; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/DefaultTraversableResolver.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/resolver/DefaultTraversableResolver.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/DefaultTraversableResolver.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine.resolver; +package org.hibernate.validator.engine.resolver; import java.lang.annotation.ElementType; import java.security.AccessController; @@ -8,10 +8,9 @@ import org.slf4j.Logger; -import org.hibernate.validation.util.LoggerFactory; -import org.hibernate.validation.util.ReflectionHelper; -import org.hibernate.validation.util.NewInstance; -import org.hibernate.validation.util.LoadClass; +import org.hibernate.validator.util.LoggerFactory; +import org.hibernate.validator.util.NewInstance; +import org.hibernate.validator.util.LoadClass; /** * A JPA 2 aware <code>TraversableResolver</code>. @@ -31,7 +30,7 @@ /** * Class to instantiate in case JPA 2 is on the classpath. */ - private static final String JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME = "org.hibernate.validation.engine.resolver.JPATraversableResolver"; + private static final String JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME = "org.hibernate.validator.engine.resolver.JPATraversableResolver"; /** * A JPA 2 aware traversable resolver. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/resolver/JPATraversableResolver.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/JPATraversableResolver.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.resolver; +package org.hibernate.validator.engine.resolver; import java.lang.annotation.ElementType; import javax.persistence.Persistence; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/SingleThreadCachedTraversableResolver.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/resolver/SingleThreadCachedTraversableResolver.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resolver/SingleThreadCachedTraversableResolver.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.resolver; +package org.hibernate.validator.engine.resolver; import java.lang.annotation.ElementType; import java.util.HashMap; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/AnnotationIgnores.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/AnnotationIgnores.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/AnnotationIgnores.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.lang.reflect.Field; import java.lang.reflect.Member; @@ -26,7 +26,7 @@ import org.slf4j.Logger; -import org.hibernate.validation.util.LoggerFactory; +import org.hibernate.validator.util.LoggerFactory; /** * This class instantiated during the parsing of the XML configuration data and keeps Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanDescriptorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanDescriptorImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanDescriptorImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.util.Set; import javax.validation.metadata.BeanDescriptor; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaData.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaData.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaData.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.lang.annotation.Annotation; import java.lang.reflect.Member; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataCache.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataCache.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataCache.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; @@ -42,11 +42,11 @@ import org.slf4j.Logger; -import org.hibernate.validation.util.GetDeclaredFields; -import org.hibernate.validation.util.GetDeclaredMethods; -import org.hibernate.validation.util.LoggerFactory; -import org.hibernate.validation.util.ReflectionHelper; -import org.hibernate.validation.util.SetAccessibility; +import org.hibernate.validator.util.GetDeclaredFields; +import org.hibernate.validator.util.GetDeclaredMethods; +import org.hibernate.validator.util.LoggerFactory; +import org.hibernate.validator.util.ReflectionHelper; +import org.hibernate.validator.util.SetAccessibility; /** Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/ConstraintDescriptorImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintDescriptorImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; @@ -41,13 +41,13 @@ import org.slf4j.Logger; -import org.hibernate.validation.util.GetAnnotationParameter; -import org.hibernate.validation.util.GetDeclaredMethods; -import org.hibernate.validation.util.GetMethod; -import org.hibernate.validation.util.GetMethods; -import org.hibernate.validation.util.LoggerFactory; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.GetAnnotationParameter; +import org.hibernate.validator.util.GetDeclaredMethods; +import org.hibernate.validator.util.GetMethod; +import org.hibernate.validator.util.GetMethods; +import org.hibernate.validator.util.LoggerFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * Describe a single constraint (including it's composing constraints). Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintHelper.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/ConstraintHelper.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ConstraintHelper.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; @@ -42,39 +42,39 @@ import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import org.hibernate.validation.constraints.impl.AssertFalseValidator; -import org.hibernate.validation.constraints.impl.AssertTrueValidator; -import org.hibernate.validation.constraints.impl.DecimalMaxValidatorForNumber; -import org.hibernate.validation.constraints.impl.DecimalMaxValidatorForString; -import org.hibernate.validation.constraints.impl.DecimalMinValidatorForNumber; -import org.hibernate.validation.constraints.impl.DecimalMinValidatorForString; -import org.hibernate.validation.constraints.impl.DigitsValidatorForNumber; -import org.hibernate.validation.constraints.impl.DigitsValidatorForString; -import org.hibernate.validation.constraints.impl.FutureValidatorForCalendar; -import org.hibernate.validation.constraints.impl.FutureValidatorForDate; -import org.hibernate.validation.constraints.impl.MaxValidatorForNumber; -import org.hibernate.validation.constraints.impl.MaxValidatorForString; -import org.hibernate.validation.constraints.impl.MinValidatorForNumber; -import org.hibernate.validation.constraints.impl.MinValidatorForString; -import org.hibernate.validation.constraints.impl.NotNullValidator; -import org.hibernate.validation.constraints.impl.NullValidator; -import org.hibernate.validation.constraints.impl.PastValidatorForCalendar; -import org.hibernate.validation.constraints.impl.PastValidatorForDate; -import org.hibernate.validation.constraints.impl.PatternValidator; -import org.hibernate.validation.constraints.impl.SizeValidatorForArray; -import org.hibernate.validation.constraints.impl.SizeValidatorForArraysOfBoolean; -import org.hibernate.validation.constraints.impl.SizeValidatorForArraysOfByte; -import org.hibernate.validation.constraints.impl.SizeValidatorForArraysOfChar; -import org.hibernate.validation.constraints.impl.SizeValidatorForArraysOfDouble; -import org.hibernate.validation.constraints.impl.SizeValidatorForArraysOfFloat; -import org.hibernate.validation.constraints.impl.SizeValidatorForArraysOfInt; -import org.hibernate.validation.constraints.impl.SizeValidatorForArraysOfLong; -import org.hibernate.validation.constraints.impl.SizeValidatorForCollection; -import org.hibernate.validation.constraints.impl.SizeValidatorForMap; -import org.hibernate.validation.constraints.impl.SizeValidatorForString; -import org.hibernate.validation.util.GetMethods; -import org.hibernate.validation.util.GetMethod; -import org.hibernate.validation.util.GetAnnotationParameter; +import org.hibernate.validator.constraints.impl.AssertFalseValidator; +import org.hibernate.validator.constraints.impl.AssertTrueValidator; +import org.hibernate.validator.constraints.impl.DecimalMaxValidatorForNumber; +import org.hibernate.validator.constraints.impl.DecimalMaxValidatorForString; +import org.hibernate.validator.constraints.impl.DecimalMinValidatorForNumber; +import org.hibernate.validator.constraints.impl.DecimalMinValidatorForString; +import org.hibernate.validator.constraints.impl.DigitsValidatorForNumber; +import org.hibernate.validator.constraints.impl.DigitsValidatorForString; +import org.hibernate.validator.constraints.impl.FutureValidatorForCalendar; +import org.hibernate.validator.constraints.impl.FutureValidatorForDate; +import org.hibernate.validator.constraints.impl.MaxValidatorForNumber; +import org.hibernate.validator.constraints.impl.MaxValidatorForString; +import org.hibernate.validator.constraints.impl.MinValidatorForNumber; +import org.hibernate.validator.constraints.impl.MinValidatorForString; +import org.hibernate.validator.constraints.impl.NotNullValidator; +import org.hibernate.validator.constraints.impl.NullValidator; +import org.hibernate.validator.constraints.impl.PastValidatorForCalendar; +import org.hibernate.validator.constraints.impl.PastValidatorForDate; +import org.hibernate.validator.constraints.impl.PatternValidator; +import org.hibernate.validator.constraints.impl.SizeValidatorForArray; +import org.hibernate.validator.constraints.impl.SizeValidatorForArraysOfBoolean; +import org.hibernate.validator.constraints.impl.SizeValidatorForArraysOfByte; +import org.hibernate.validator.constraints.impl.SizeValidatorForArraysOfChar; +import org.hibernate.validator.constraints.impl.SizeValidatorForArraysOfDouble; +import org.hibernate.validator.constraints.impl.SizeValidatorForArraysOfFloat; +import org.hibernate.validator.constraints.impl.SizeValidatorForArraysOfInt; +import org.hibernate.validator.constraints.impl.SizeValidatorForArraysOfLong; +import org.hibernate.validator.constraints.impl.SizeValidatorForCollection; +import org.hibernate.validator.constraints.impl.SizeValidatorForMap; +import org.hibernate.validator.constraints.impl.SizeValidatorForString; +import org.hibernate.validator.util.GetMethods; +import org.hibernate.validator.util.GetMethod; +import org.hibernate.validator.util.GetAnnotationParameter; /** * Keeps track of builtin constraints and their validator implementations, as well as already resolved validator definitions. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ElementDescriptorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/ElementDescriptorImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ElementDescriptorImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.util.Arrays; import java.util.Collections; @@ -25,9 +25,9 @@ import javax.validation.metadata.ConstraintDescriptor; import javax.validation.metadata.ElementDescriptor; -import org.hibernate.validation.engine.groups.Group; -import org.hibernate.validation.engine.groups.GroupChain; -import org.hibernate.validation.engine.groups.GroupChainGenerator; +import org.hibernate.validator.engine.groups.Group; +import org.hibernate.validator.engine.groups.GroupChain; +import org.hibernate.validator.engine.groups.GroupChainGenerator; /** * Describe a validated element (class, field or property). Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/MetaConstraint.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/MetaConstraint.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; @@ -30,10 +30,10 @@ import javax.validation.ValidationException; import javax.validation.metadata.ConstraintDescriptor; -import org.hibernate.validation.engine.ConstraintTree; -import org.hibernate.validation.engine.GlobalExecutionContext; -import org.hibernate.validation.engine.LocalExecutionContext; -import org.hibernate.validation.util.ReflectionHelper; +import org.hibernate.validator.engine.ConstraintTree; +import org.hibernate.validator.engine.GlobalExecutionContext; +import org.hibernate.validator.engine.LocalExecutionContext; +import org.hibernate.validator.util.ReflectionHelper; /** * Instances of this class abstract the constraint type (class, method or field constraint) and give access to Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/PropertyDescriptorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/PropertyDescriptorImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/PropertyDescriptorImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import javax.validation.metadata.PropertyDescriptor; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ContainsField.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsField.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ContainsMethod.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ContainsMethod.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,8 +1,8 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; -import org.hibernate.validation.util.ReflectionHelper; +import org.hibernate.validator.util.ReflectionHelper; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetAnnotationParameter.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetAnnotationParameter.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,9 +1,9 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.annotation.Annotation; import java.security.PrivilegedAction; -import org.hibernate.validation.util.ReflectionHelper; +import org.hibernate.validator.util.ReflectionHelper; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetClassLoader.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetClassLoader.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetConstructor.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetConstructor.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.reflect.Constructor; import java.security.PrivilegedAction; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetDeclaredField.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredField.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,9 +1,9 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; import java.lang.reflect.Field; -import org.hibernate.validation.util.ReflectionHelper; +import org.hibernate.validator.util.ReflectionHelper; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetDeclaredFields.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredFields.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; import java.lang.reflect.Field; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetDeclaredMethods.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetDeclaredMethods.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; import java.lang.reflect.Method; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetMethod.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethod.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.reflect.Method; import java.security.PrivilegedAction; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetMethodFromPropertyName.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethodFromPropertyName.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,9 +1,9 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.reflect.Method; import java.security.PrivilegedAction; -import org.hibernate.validation.util.ReflectionHelper; +import org.hibernate.validator.util.ReflectionHelper; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/GetMethods.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/GetMethods.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; import java.lang.reflect.Method; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/IdentitySet.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/IdentitySet.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/IdentitySet.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.util.Collection; import java.util.IdentityHashMap; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/LazyValidatorFactory.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LazyValidatorFactory.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import javax.validation.ValidatorFactory; import javax.validation.Validator; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/LoadClass.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoadClass.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; import javax.validation.ValidationException; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoggerFactory.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/LoggerFactory.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/LoggerFactory.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import org.slf4j.Logger; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/NewInstance.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/NewInstance.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.security.PrivilegedAction; import javax.validation.ValidationException; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ReflectionHelper.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.beans.Introspector; import java.lang.annotation.Annotation; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/SetAccessibility.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/SetAccessibility.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,9 +1,9 @@ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.reflect.Member; import java.security.PrivilegedAction; -import org.hibernate.validation.util.ReflectionHelper; +import org.hibernate.validator.util.ReflectionHelper; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ValidatorTypeHelper.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ValidatorTypeHelper.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/ValidatorTypeHelper.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.annotation.Annotation; import java.lang.reflect.GenericArrayType; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/Version.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/Version.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/Version.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.net.URL; import java.util.jar.Attributes; @@ -27,7 +27,7 @@ * @author Hardy Ferentschik */ public class Version { - private static final Logger log = org.hibernate.validation.util.LoggerFactory.make(); + private static final Logger log = org.hibernate.validator.util.LoggerFactory.make(); static { Class clazz = Version.class; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationDescriptor.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/annotationfactory/AnnotationDescriptor.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationDescriptor.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util.annotationfactory; +package org.hibernate.validator.util.annotationfactory; import java.lang.annotation.Annotation; import java.util.HashMap; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationFactory.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/annotationfactory/AnnotationFactory.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationFactory.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util.annotationfactory; +package org.hibernate.validator.util.annotationfactory; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -24,8 +24,8 @@ import java.lang.reflect.Proxy; import java.security.AccessController; -import org.hibernate.validation.util.GetConstructor; -import org.hibernate.validation.util.GetClassLoader; +import org.hibernate.validator.util.GetConstructor; +import org.hibernate.validator.util.GetClassLoader; /** Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationProxy.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/annotationfactory/AnnotationProxy.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/annotationfactory/AnnotationProxy.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util.annotationfactory; +package org.hibernate.validator.util.annotationfactory; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; @@ -27,7 +27,7 @@ import java.util.TreeSet; import java.security.AccessController; -import org.hibernate.validation.util.GetDeclaredMethods; +import org.hibernate.validator.util.GetDeclaredMethods; /** * A concrete implementation of <code>Annotation</code> that pretends it is a Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationBootstrapParameters.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/xml/ValidationBootstrapParameters.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationBootstrapParameters.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.xml; +package org.hibernate.validator.xml; import java.io.InputStream; import java.util.HashMap; Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/xml/ValidationXmlParser.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/ValidationXmlParser.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.xml; +package org.hibernate.validator.xml; import java.io.InputStream; import java.net.URL; @@ -36,13 +36,12 @@ import org.slf4j.Logger; import org.xml.sax.SAXException; -import org.hibernate.validation.util.LoggerFactory; -import org.hibernate.validation.util.ReflectionHelper; -import org.hibernate.validation.util.NewInstance; -import org.hibernate.validation.util.GetClassLoader; -import org.hibernate.validation.util.LoadClass; -import org.hibernate.validation.xml.PropertyType; -import org.hibernate.validation.xml.ValidationConfigType; +import org.hibernate.validator.util.LoggerFactory; +import org.hibernate.validator.util.NewInstance; +import org.hibernate.validator.util.GetClassLoader; +import org.hibernate.validator.util.LoadClass; +import org.hibernate.validator.xml.PropertyType; +import org.hibernate.validator.xml.ValidationConfigType; /** * Parser for validation.xml using JAXB. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/xml/XmlMappingParser.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/xml/XmlMappingParser.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.xml; +package org.hibernate.validator.xml; import java.io.InputStream; import java.io.Serializable; @@ -47,20 +47,20 @@ import org.slf4j.Logger; import org.xml.sax.SAXException; -import org.hibernate.validation.metadata.AnnotationIgnores; -import org.hibernate.validation.metadata.ConstraintDescriptorImpl; -import org.hibernate.validation.metadata.ConstraintHelper; -import org.hibernate.validation.metadata.MetaConstraint; -import org.hibernate.validation.util.ContainsField; -import org.hibernate.validation.util.ContainsMethod; -import org.hibernate.validation.util.GetClassLoader; -import org.hibernate.validation.util.GetDeclaredField; -import org.hibernate.validation.util.GetMethod; -import org.hibernate.validation.util.GetMethodFromPropertyName; -import org.hibernate.validation.util.LoadClass; -import org.hibernate.validation.util.LoggerFactory; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.metadata.AnnotationIgnores; +import org.hibernate.validator.metadata.ConstraintDescriptorImpl; +import org.hibernate.validator.metadata.ConstraintHelper; +import org.hibernate.validator.metadata.MetaConstraint; +import org.hibernate.validator.util.ContainsField; +import org.hibernate.validator.util.ContainsMethod; +import org.hibernate.validator.util.GetClassLoader; +import org.hibernate.validator.util.GetDeclaredField; +import org.hibernate.validator.util.GetMethod; +import org.hibernate.validator.util.GetMethodFromPropertyName; +import org.hibernate.validator.util.LoadClass; +import org.hibernate.validator.util.LoggerFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider 2009-08-26 12:25:39 UTC (rev 17421) @@ -1 +1 @@ -org.hibernate.validation.HibernateValidator \ No newline at end of file +org.hibernate.validator.HibernateValidator \ No newline at end of file Copied: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator (from rev 17420, validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation) Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages.properties 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,8 +1,8 @@ # $Id$ javax.validation.constraints.NotNull.message=may not be null javax.validation.constraints.Size.message=size must be between {min} and {max} -org.hibernate.validation.constraints.Length.message=length must be between {min} and {max} -org.hibernate.validation.constraints.NotEmpty.message=may not be empty +org.hibernate.validator.constraints.Length.message=length must be between {min} and {max} +org.hibernate.validator.constraints.NotEmpty.message=may not be empty javax.validation.constraints.Pattern.message=must match "{regexp}" javax.validation.constraints.Min.message=must be greater than or equal to {value} javax.validation.constraints.Max.message=must be less than or equal to {value} Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_de.properties 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,8 +1,8 @@ # $Id$ javax.validation.constraints.NotNull.message=kann nicht null sein javax.validation.constraints.Size.message=muss zwischen {min} und {max} liegen -org.hibernate.validation.constraints.Length.message=muss zwischen {min} und {max} liegen -org.hibernate.validation.constraints.NotEmpty.message=kann nicht leer sein +org.hibernate.validator.constraints.Length.message=muss zwischen {min} und {max} liegen +org.hibernate.validator.constraints.NotEmpty.message=kann nicht leer sein javax.validation.constraints.Pattern.message=muss auf Ausdruck "{regexp}" passen javax.validation.constraints.Min.message=muss gr\u00F6ssergleich {value} sein javax.validation.constraints.Max.message=muss kleinergleich {value} sein Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties =================================================================== --- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages_fr.properties 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,8 +1,8 @@ # $Id$ javax.validation.constraints.NotNull.message=ne peut pas \u00EAtre nul javax.validation.constraints.Size.message=la taille doit \u00EAtre entre {min} et {max} -org.hibernate.validation.constraints.Length.message=length must be between {min} and {max} -org.hibernate.validation.constraints.NotEmpty.message=ne peut pas \u00EAtre vide +org.hibernate.validator.constraints.Length.message=length must be between {min} and {max} +org.hibernate.validator.constraints.NotEmpty.message=ne peut pas \u00EAtre vide javax.validation.constraints.Pattern.message=doit suivre "{regexp}" javax.validation.constraints.Min.message=doit \u00EAtre plus grand que {value} javax.validation.constraints.Max.message=doit \u00EAtre plus petit que {value} Copied: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator (from rev 17420, validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation) Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/ValidationMessages.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/ValidationMessages.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/ValidationMessages.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation; +package org.hibernate.validator; import java.io.IOException; import java.io.InputStream; @@ -27,7 +27,7 @@ import org.slf4j.Logger; -import org.hibernate.validation.util.LoggerFactory; +import org.hibernate.validator.util.LoggerFactory; /** * @author Hardy Ferentschik @@ -36,7 +36,7 @@ private static final Logger log = LoggerFactory.make(); - private static final String DEFAULT_PROPERTIES_FILE_NAME = "/org/hibernate/validation/ValidationMessages.properties"; + private static final String DEFAULT_PROPERTIES_FILE_NAME = "/org/hibernate/validator/ValidationMessages.properties"; private Map<String, String> messages = new HashMap<String, String>(); Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/Customer.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/Customer.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/Customer.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.bootstrap; +package org.hibernate.validator.bootstrap; import java.util.HashSet; import java.util.Set; import javax.validation.Valid; -import org.hibernate.validation.constraints.NotEmpty; +import org.hibernate.validator.constraints.NotEmpty; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/Order.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/Order.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/Order.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.bootstrap; +package org.hibernate.validator.bootstrap; import javax.validation.constraints.NotNull; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/ValidationTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/ValidationTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.bootstrap; +package org.hibernate.validator.bootstrap; import java.util.Set; import javax.validation.Configuration; @@ -32,12 +32,12 @@ import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; -import org.hibernate.validation.constraints.impl.NotNullValidator; -import org.hibernate.validation.engine.ConfigurationImpl; -import org.hibernate.validation.engine.ConstraintValidatorFactoryImpl; -import org.hibernate.validation.engine.ValidatorConfiguration; -import org.hibernate.validation.engine.ValidatorFactoryImpl; -import org.hibernate.validation.HibernateValidator; +import org.hibernate.validator.constraints.impl.NotNullValidator; +import org.hibernate.validator.engine.ConfigurationImpl; +import org.hibernate.validator.engine.ConstraintValidatorFactoryImpl; +import org.hibernate.validator.engine.ValidatorConfiguration; +import org.hibernate.validator.engine.ValidatorFactoryImpl; +import org.hibernate.validator.HibernateValidator; /** * Tests the Bean Validation bootstrapping. Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/ConstraintValidatorContextTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/ConstraintValidatorContextTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/ConstraintValidatorContextTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints; +package org.hibernate.validator.constraints; import java.util.Set; import javax.validation.ConstraintViolation; @@ -23,9 +23,9 @@ import org.testng.annotations.Test; -import org.hibernate.validation.util.TestUtil; -import static org.hibernate.validation.util.TestUtil.assertCorrectPropertyPaths; -import static org.hibernate.validation.util.TestUtil.assertNumberOfViolations; +import org.hibernate.validator.util.TestUtil; +import static org.hibernate.validator.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.validator.util.TestUtil.assertNumberOfViolations; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Interval.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/Interval.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Interval.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints; +package org.hibernate.validator.constraints; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Item.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/Item.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/Item.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints; +package org.hibernate.validator.constraints; import javax.validation.Valid; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/StartLessThanEnd.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEnd.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints; +package org.hibernate.validator.constraints; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEndImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/StartLessThanEndImpl.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/StartLessThanEndImpl.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints; +package org.hibernate.validator.constraints; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/CompositeConstraintTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/composition/CompositeConstraintTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/CompositeConstraintTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,9 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.composition; +package org.hibernate.validator.constraints.composition; -import java.lang.annotation.Annotation; import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validator; @@ -27,10 +26,10 @@ import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; -import org.hibernate.validation.util.TestUtil; -import static org.hibernate.validation.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.validation.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.validation.util.TestUtil.assertNumberOfViolations; +import org.hibernate.validator.util.TestUtil; +import static org.hibernate.validator.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.validator.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.validator.util.TestUtil.assertNumberOfViolations; /** * @author Gerhard Petracek Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/Person.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/composition/Person.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/Person.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.composition; +package org.hibernate.validator.constraints.composition; /** * Test mode for HV-182. Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/composition/ValidName.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidName.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.composition; +package org.hibernate.validator.constraints.composition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; @@ -24,7 +24,6 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.ConstraintPayload; -import javax.validation.ReportAsSingleViolation; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/composition/ValidNameSingleViolation.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/composition/ValidNameSingleViolation.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.composition; +package org.hibernate.validator.constraints.composition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/AssertFalseValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/AssertFalseValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/AssertFalseValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/AssertTrueValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/AssertTrueValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/AssertTrueValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DateHolder.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/DateHolder.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DateHolder.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Calendar; import java.util.Date; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumberTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/DigitsValidatorForNumberTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumberTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import javax.validation.ValidationException; @@ -25,8 +25,8 @@ import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Alaa Nassef Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForStringTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/DigitsValidatorForStringTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForStringTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ValidationException; import javax.validation.constraints.Digits; @@ -25,8 +25,8 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Alaa Nassef Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorForCalendarTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/FutureValidatorForCalendarTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorForCalendarTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Calendar; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorForDateTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/FutureValidatorForDateTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorForDateTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Date; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/FutureValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/FutureValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Set; import javax.validation.ConstraintViolation; @@ -24,7 +24,7 @@ import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; -import org.hibernate.validation.util.TestUtil; +import org.hibernate.validator.util.TestUtil; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/LengthValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/LengthValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/LengthValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ValidationException; @@ -23,9 +23,9 @@ import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; -import org.hibernate.validation.constraints.Length; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * Tests the <code>LengthConstraint</code>. Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumberTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/MaxValidatorForNumberTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumberTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import java.math.BigInteger; @@ -29,8 +29,8 @@ import static org.testng.Assert.fail; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Alaa Nassef Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForStringTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/MaxValidatorForStringTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForStringTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; @@ -27,8 +27,8 @@ import static org.testng.Assert.fail; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForNumberTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/MinValidatorForNumberTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForNumberTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; import java.math.BigInteger; @@ -29,8 +29,8 @@ import static org.testng.Assert.fail; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Alaa Nassef Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForStringTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/MinValidatorForStringTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForStringTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; @@ -27,8 +27,8 @@ import static org.testng.Assert.fail; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Alaa Nassef Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/NotNullValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/NotNullValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/NotNullValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/NullValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/NullValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/NullValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PastValidatorForCalendarTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/PastValidatorForCalendarTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PastValidatorForCalendarTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Calendar; @@ -24,7 +24,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.hibernate.validation.constraints.impl.PastValidatorForCalendar; +import org.hibernate.validator.constraints.impl.PastValidatorForCalendar; /** * @author Alaa Nassef Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PastValidatorForDateTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/PastValidatorForDateTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PastValidatorForDateTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.util.Date; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PatternValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/PatternValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PatternValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import javax.validation.ValidationException; import javax.validation.constraints.Pattern; @@ -24,8 +24,8 @@ import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/SizeValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/SizeValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/SizeValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.constraints.impl; +package org.hibernate.validator.constraints.impl; import java.lang.reflect.Array; import java.util.ArrayList; @@ -29,8 +29,8 @@ import static org.testng.AssertJUnit.assertFalse; import org.testng.annotations.Test; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * @author Alaa Nassef Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/PathImplTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/PathImplTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/PathImplTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.util.Iterator; import javax.validation.Path; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/ValidatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine; +package org.hibernate.validator.engine; import java.util.Set; import javax.validation.ConstraintViolation; @@ -24,9 +24,9 @@ import org.testng.annotations.Test; -import org.hibernate.validation.util.TestUtil; -import static org.hibernate.validation.util.TestUtil.assertCorrectPropertyPaths; -import static org.hibernate.validation.util.TestUtil.assertNumberOfViolations; +import org.hibernate.validator.util.TestUtil; +import static org.hibernate.validator.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.validator.util.TestUtil.assertNumberOfViolations; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Address.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/Address.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Address.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import javax.validation.GroupSequence; import javax.validation.constraints.NotNull; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/CyclicGroupSequence.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import javax.validation.GroupSequence; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence1.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/CyclicGroupSequence1.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence1.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import javax.validation.GroupSequence; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence2.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/CyclicGroupSequence2.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/CyclicGroupSequence2.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import javax.validation.GroupSequence; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/First.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/First.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/First.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; /** * Group executed first in the validation Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainGeneratorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/GroupChainGeneratorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainGeneratorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import java.util.HashSet; import java.util.Iterator; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/GroupChainTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/GroupChainTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import java.util.ArrayList; import java.util.List; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Last.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/Last.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Last.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; /** * Group executed Last in the validation Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Second.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/Second.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/Second.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; /** * Group executed second during the validation Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/ZipCodeCoherenceChecker.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/ZipCodeCoherenceChecker.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/ZipCodeCoherenceChecker.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/ZipCodeCoherenceValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/groups/ZipCodeCoherenceValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/groups/ZipCodeCoherenceValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.groups; +package org.hibernate.validator.engine.groups; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/messageinterpolation/MessageInterpolationTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.messageinterpolation; +package org.hibernate.validator.engine.messageinterpolation; import java.io.ByteArrayInputStream; import java.util.PropertyResourceBundle; @@ -32,7 +32,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.hibernate.validation.engine.ResourceBundleMessageInterpolator; +import org.hibernate.validator.engine.ResourceBundleMessageInterpolator; /** * Tests for HV-184 Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.messageinterpolation; +package org.hibernate.validator.engine.messageinterpolation; import java.util.Enumeration; import java.util.HashMap; @@ -33,12 +33,12 @@ import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import org.hibernate.validation.engine.MessageInterpolatorContext; -import org.hibernate.validation.engine.ResourceBundleMessageInterpolator; -import org.hibernate.validation.metadata.ConstraintDescriptorImpl; -import org.hibernate.validation.metadata.ConstraintHelper; -import org.hibernate.validation.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validation.util.annotationfactory.AnnotationFactory; +import org.hibernate.validator.engine.MessageInterpolatorContext; +import org.hibernate.validator.engine.ResourceBundleMessageInterpolator; +import org.hibernate.validator.metadata.ConstraintDescriptorImpl; +import org.hibernate.validator.metadata.ConstraintHelper; +import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; +import org.hibernate.validator.util.annotationfactory.AnnotationFactory; /** * Tests for message interpolation. Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/CachedTraversableResolverTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/traversableresolver/CachedTraversableResolverTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/CachedTraversableResolverTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.traversableresolver; +package org.hibernate.validator.engine.traversableresolver; import java.lang.annotation.ElementType; import java.util.HashSet; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Cloth.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/traversableresolver/Cloth.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Cloth.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.traversableresolver; +package org.hibernate.validator.engine.traversableresolver; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Jacket.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/traversableresolver/Jacket.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Jacket.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.traversableresolver; +package org.hibernate.validator.engine.traversableresolver; import javax.validation.constraints.Max; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Suit.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/traversableresolver/Suit.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Suit.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.traversableresolver; +package org.hibernate.validator.engine.traversableresolver; import javax.validation.constraints.Max; import javax.validation.constraints.Min; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Trousers.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/traversableresolver/Trousers.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/traversableresolver/Trousers.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.engine.traversableresolver; +package org.hibernate.validator.engine.traversableresolver; import javax.validation.constraints.Min; import javax.validation.constraints.Max; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/ConstraintHelperTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/metadata/ConstraintHelperTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/ConstraintHelperTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -29,8 +29,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.hibernate.validation.util.ReflectionHelper; -import org.hibernate.validation.util.SetAccessibility; +import org.hibernate.validator.util.SetAccessibility; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Customer.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/metadata/Customer.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Customer.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.util.ArrayList; import java.util.List; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/ElementDescriptorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/metadata/ElementDescriptorTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/ElementDescriptorTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import java.util.Set; import javax.validation.Validator; @@ -28,7 +28,7 @@ import static org.testng.Assert.fail; import org.testng.annotations.Test; -import org.hibernate.validation.util.TestUtil; +import org.hibernate.validator.util.TestUtil; /** Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Engine.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/metadata/Engine.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Engine.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import javax.validation.constraints.Pattern; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Order.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/metadata/Order.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Order.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; import javax.validation.constraints.NotNull; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Person.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/metadata/Person.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/metadata/Person.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.metadata; +package org.hibernate.validator.metadata; -import org.hibernate.validation.constraints.NotEmpty; +import org.hibernate.validator.constraints.NotEmpty; /** * @author Hardy Ferentschik Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/BoundariesConstraintValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/BoundariesConstraintValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/BoundariesConstraintValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.annotation.Annotation; import javax.validation.ConstraintValidator; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/IdentitySetTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/IdentitySetTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/IdentitySetTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.util.HashSet; import java.util.Set; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/Positive.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/Positive.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/Positive.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.annotation.Target; import java.lang.annotation.Retention; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/PositiveConstraintValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/PositiveConstraintValidator.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/PositiveConstraintValidator.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; /** * @author Emmanuel Bernard Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ReflectionHelperTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/TestUtil.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/TestUtil.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.io.InputStream; import java.lang.annotation.Annotation; @@ -36,9 +36,9 @@ import static org.testng.Assert.assertTrue; import static org.testng.FileAssert.fail; -import org.hibernate.validation.HibernateValidator; -import org.hibernate.validation.engine.ValidatorConfiguration; -import org.hibernate.validation.engine.PathImpl; +import org.hibernate.validator.HibernateValidator; +import org.hibernate.validator.engine.ValidatorConfiguration; +import org.hibernate.validator.engine.PathImpl; /** * Tests for the <code>ReflectionHelper</code>. Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ValidatorTypeTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ValidatorTypeTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ValidatorTypeTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util; +package org.hibernate.validator.util; import java.lang.reflect.Type; import java.util.ArrayList; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/annotationfactory/AnnotationFactoryTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/annotationfactory/AnnotationFactoryTest.java 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/annotationfactory/AnnotationFactoryTest.java 2009-08-26 12:25:39 UTC (rev 17421) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validation.util.annotationfactory; +package org.hibernate.validator.util.annotationfactory; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; Modified: validator/trunk/hibernate-validator/src/test/resources/log4j.properties =================================================================== --- validator/trunk/hibernate-validator/src/test/resources/log4j.properties 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/resources/log4j.properties 2009-08-26 12:25:39 UTC (rev 17421) @@ -20,6 +20,6 @@ ### set log levels - for more verbose logging change 'info' to 'debug' ### log4j.rootLogger=debug, stdout -log4j.logger.org.hibernate.validation.engine.ValidatorImpl=trace -#log4j.logger.org.hibernate.validation.engine.ConstraintTree=trace -log4j.logger.org.hibernate.validation.engine.ResourceBundleMessageInterpolator=info +log4j.logger.org.hibernate.validator.engine.ValidatorImpl=trace +#log4j.logger.org.hibernate.validatorengine.ConstraintTree=trace +log4j.logger.org.hibernate.validator.engine.ResourceBundleMessageInterpolator=info Modified: validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml =================================================================== --- validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml 2009-08-26 12:25:39 UTC (rev 17421) @@ -3,16 +3,16 @@ <suite name="Hibernate Validator Unit Tests" verbose="1"> <test name="Unit tests"> <packages> - <package name="org.hibernate.validation.bootstrap"/> - <package name="org.hibernate.validation.constraints"/> - <package name="org.hibernate.validation.constraints.impl"/> - <package name="org.hibernate.validation.constraints.composition"/> - <package name="org.hibernate.validation.engine"/> - <package name="org.hibernate.validation.engine.messageinterpolation"/> - <package name="org.hibernate.validation.engine.groups"/> - <package name="org.hibernate.validation.engine.traversableresolver"/> - <package name="org.hibernate.validation.util"/> - <package name="org.hibernate.validation.util.annotationfactory"/> + <package name="org.hibernate.validator.bootstrap"/> + <package name="org.hibernate.validator.constraints"/> + <package name="org.hibernate.validator.constraints.impl"/> + <package name="org.hibernate.validator.constraints.composition"/> + <package name="org.hibernate.validator.engine"/> + <package name="org.hibernate.validator.engine.messageinterpolation"/> + <package name="org.hibernate.validator.engine.groups"/> + <package name="org.hibernate.validator.engine.traversableresolver"/> + <package name="org.hibernate.validator.util"/> + <package name="org.hibernate.validator.util.annotationfactory"/> </packages> </test> </suite> \ No newline at end of file Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml =================================================================== --- validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-08-26 10:56:08 UTC (rev 17420) +++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-08-26 12:25:39 UTC (rev 17421) @@ -43,7 +43,7 @@ <properties> <jboss.home>/opt/java/jboss-5</jboss.home> - <validation.provider>org.hibernate.validation.HibernateValidator</validation.provider> + <validation.provider>org.hibernate.validator.HibernateValidator</validation.provider> <remote.debug /> </properties>

15 years, 4 months

1
0
0 / 0

Coach's site

by Noda Elise

15 years, 4 months

1
0
0 / 0

Hibernate SVN: r17420 - in validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation: metadata and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-08-26 06:56:08 -0400 (Wed, 26 Aug 2009) New Revision: 17420 Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanDescriptorImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaData.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java Log: Also fixed several typos in comments and method names Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java 2009-08-26 10:54:59 UTC (rev 17419) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java 2009-08-26 10:56:08 UTC (rev 17420) @@ -38,7 +38,7 @@ import org.hibernate.validation.util.ValidatorTypeHelper; /** - * Due to constraint conposition a single constraint annotation can lead to a whole constraint tree beeing validated. + * Due to constraint composition a single constraint annotation can lead to a whole constraint tree being validated. * This class encapsulates such a tree. * * @author Hardy Ferentschik @@ -116,7 +116,7 @@ descriptor ); } - ConstraintValidator<A, V> validator = getInitalizedValidator( + ConstraintValidator<A, V> validator = getInitializedValidator( localExecutionContext.getCurrentValidatedValue(), type, executionContext.getConstraintValidatorFactory() @@ -170,10 +170,10 @@ * @param type The type of the value to be validated (the type of the member/class the constraint was placed on). * @param constraintFactory constraint factory used to instantiate the constraint validator. * - * @return A initalized constraint validator matching the type of the value to be validated. + * @return A initialized constraint validator matching the type of the value to be validated. */ @SuppressWarnings("unchecked") - private <V> ConstraintValidator<A, V> getInitalizedValidator(V value, Type type, ConstraintValidatorFactory constraintFactory) { + private <V> ConstraintValidator<A, V> getInitializedValidator(V value, Type type, ConstraintValidatorFactory constraintFactory) { Class<? extends ConstraintValidator<?, ?>> validatorClass = findMatchingValidatorClass( value, type ); ConstraintValidator<A, V> constraintValidator; @@ -209,20 +209,20 @@ * @return The class of a matching validator. */ private Class<? extends ConstraintValidator<?, ?>> findMatchingValidatorClass(Object value, Type type) { - Map<Type, Class<? extends ConstraintValidator<?, ?>>> validatorsTypes = + Map<Type, Class<? extends ConstraintValidator<?, ?>>> validatorTypes = ValidatorTypeHelper.getValidatorsTypes( descriptor.getConstraintValidatorClasses() ); List<Type> suitableTypes = new ArrayList<Type>(); - findSuitableValidatorTypes( type, validatorsTypes, suitableTypes ); + findSuitableValidatorTypes( type, validatorTypes, suitableTypes ); if ( value != null ) { - findSuitableValidatorTypes( value.getClass(), validatorsTypes, suitableTypes ); + findSuitableValidatorTypes( value.getClass(), validatorTypes, suitableTypes ); } resolveAssignableTypes( suitableTypes ); verifyResolveWasUnique( type, suitableTypes ); - return validatorsTypes.get( suitableTypes.get( 0 ) ); + return validatorTypes.get( suitableTypes.get( 0 ) ); } private void verifyResolveWasUnique(Type valueClass, List<Type> assignableClasses) { @@ -231,7 +231,7 @@ } else if ( assignableClasses.size() > 1 ) { StringBuilder builder = new StringBuilder(); - builder.append( "There are multiple validators which could validate the type " ); + builder.append( "There are multiple validator classes which could validate the type " ); builder.append( valueClass ); builder.append( ". The validator classes are: " ); for ( Type clazz : assignableClasses ) { @@ -286,7 +286,7 @@ constraintValidator.initialize( descriptor.getAnnotation() ); } catch ( RuntimeException e ) { - throw new ValidationException( "Unable to intialize " + constraintValidator.getClass().getName(), e ); + throw new ValidationException( "Unable to initialize " + constraintValidator.getClass().getName(), e ); } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2009-08-26 10:54:59 UTC (rev 17419) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2009-08-26 10:56:08 UTC (rev 17420) @@ -184,8 +184,8 @@ * * @param value The value to validate. * @param context Global context. Used amongst others to collect all failing constraints. - * @param groupChain Contains the information which and in which oder groups have to be executed - * @param path The current path of the valiation. + * @param groupChain Contains the information which and in which order groups have to be executed + * @param path The current path of the validation. * @param <T> The root bean type. * @param <V> The type of the current object on the validation stack. * @@ -243,7 +243,7 @@ boolean validatingDefault = localExecutionContext.validatingDefault(); boolean validatedBeanRedefinesDefault = beanMetaData.defaultGroupSequenceIsRedefined(); - // if we are not validating the default group there is nothing slecial to consider + // if we are not validating the default group there is nothing special to consider if ( !validatingDefault ) { validateConstraintsForNonDefaultGroup( globalExecutionContext, localExecutionContext, path ); return; @@ -265,7 +265,7 @@ private <T, U, V> void validateConstraintsForRedefinedDefaultGroup(GlobalExecutionContext<T> globalExecutionContext, LocalExecutionContext<U, V> localExecutionContext, PathImpl path, BeanMetaData beanMetaData) { // in the case where the main entity does not redefine the default group we have to check whether the entity which defines the constraint does - for ( Map.Entry<Class<?>, List<MetaConstraint<U, ? extends Annotation>>> entry : beanMetaData.geMetaConstraintsAsMap() + for ( Map.Entry<Class<?>, List<MetaConstraint<U, ? extends Annotation>>> entry : beanMetaData.getMetaConstraintsAsMap() .entrySet() ) { Class<?> hostingBeanClass = entry.getKey(); List<MetaConstraint<U, ? extends Annotation>> constraints = entry.getValue(); @@ -288,13 +288,13 @@ } private <T, U, V> void validateConstraintsForRedefinedDefaultGroupOnMainEntity(GlobalExecutionContext<T> globalExecutionContext, LocalExecutionContext<U, V> localExecutionContext, PathImpl path, BeanMetaData beanMetaData) { - // in the case where the main entity redefines the default group we can interate over all constraints independend of the bean they are + // in the case where the main entity redefines the default group we can iterate over all constraints independent of the bean they are // defined in. The redefined group sequence applies for all constraints. List<Class<?>> defaultGroupSequence = beanMetaData.getDefaultGroupSequence(); for ( Class<?> defaultSequenceMember : defaultGroupSequence ) { localExecutionContext.setCurrentGroup( defaultSequenceMember ); boolean validationSuccessful = true; - for ( MetaConstraint<U, ? extends Annotation> metaConstraint : beanMetaData.geMetaConstraintsAsList() ) { + for ( MetaConstraint<U, ? extends Annotation> metaConstraint : beanMetaData.getMetaConstraintsAsList() ) { boolean tmp = validateConstraint( globalExecutionContext, localExecutionContext, metaConstraint, path ); @@ -308,7 +308,7 @@ private <T, U, V> void validateConstraintsForNonDefaultGroup(GlobalExecutionContext<T> globalExecutionContext, LocalExecutionContext<U, V> localExecutionContext, PathImpl path) { BeanMetaData beanMetaData = getBeanMetaData( localExecutionContext.getCurrentBeanType() ); - for ( MetaConstraint<U, ? extends Annotation> metaConstraint : beanMetaData.geMetaConstraintsAsList() ) { + for ( MetaConstraint<U, ? extends Annotation> metaConstraint : beanMetaData.getMetaConstraintsAsList() ) { validateConstraint( globalExecutionContext, localExecutionContext, metaConstraint, path ); } } @@ -348,7 +348,7 @@ * * @param globalExecutionContext The execution context * @param localExecutionContext Collected information for single validation - * @param path The current path of the valiation. + * @param path The current path of the validation. */ private <T, U, V> void validateCascadedConstraints(GlobalExecutionContext<T> globalExecutionContext, LocalExecutionContext<U, V> localExecutionContext, PathImpl path) { List<Member> cascadedMembers = getBeanMetaData( localExecutionContext.getCurrentBeanType() ) @@ -599,7 +599,7 @@ ); } - // process squences + // process sequences Iterator<List<Group>> sequenceIterator = groupChain.getSequenceIterator(); while ( sequenceIterator.hasNext() ) { List<Group> sequence = sequenceIterator.next(); @@ -688,7 +688,7 @@ } if ( !propertyIter.hasNext() ) { - List<MetaConstraint<T, ? extends Annotation>> metaConstraintList = metaData.geMetaConstraintsAsList(); + List<MetaConstraint<T, ? extends Annotation>> metaConstraintList = metaData.getMetaConstraintsAsList(); for ( MetaConstraint<T, ?> metaConstraint : metaConstraintList ) { if ( elem.getName() != null && elem.getName().equals( metaConstraint.getPropertyName() ) ) { metaConstraints.add( metaConstraint ); Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanDescriptorImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanDescriptorImpl.java 2009-08-26 10:54:59 UTC (rev 17419) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanDescriptorImpl.java 2009-08-26 10:56:08 UTC (rev 17420) @@ -17,7 +17,7 @@ } public boolean isBeanConstrained() { - return metadataBean.geMetaConstraintsAsMap().size() > 0; + return metadataBean.getMetaConstraintsAsMap().size() > 0; } public PropertyDescriptor getConstraintsForProperty(String propertyName) { Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaData.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaData.java 2009-08-26 10:54:59 UTC (rev 17419) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaData.java 2009-08-26 10:56:08 UTC (rev 17420) @@ -61,13 +61,13 @@ * @return A map of {@code MetaConstraint} instances encapsulating the information of all the constraints * defined on the bean mapped to the class in which the constraints is defined. */ - Map<Class<?>, List<MetaConstraint<T, ? extends Annotation>>> geMetaConstraintsAsMap(); + Map<Class<?>, List<MetaConstraint<T, ? extends Annotation>>> getMetaConstraintsAsMap(); /** * @return A list of {@code MetaConstraint} instances encapsulating the information of all the constraints * defined on the bean. */ - List<MetaConstraint<T, ? extends Annotation>> geMetaConstraintsAsList(); + List<MetaConstraint<T, ? extends Annotation>> getMetaConstraintsAsList(); /** * Return {@code PropertyDescriptor} for the given property. Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java 2009-08-26 10:54:59 UTC (rev 17419) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java 2009-08-26 10:56:08 UTC (rev 17420) @@ -126,11 +126,11 @@ return Collections.unmodifiableList( cascadedMembers ); } - public Map<Class<?>, List<MetaConstraint<T, ? extends Annotation>>> geMetaConstraintsAsMap() { + public Map<Class<?>, List<MetaConstraint<T, ? extends Annotation>>> getMetaConstraintsAsMap() { return Collections.unmodifiableMap( metaConstraints ); } - public List<MetaConstraint<T, ? extends Annotation>> geMetaConstraintsAsList() { + public List<MetaConstraint<T, ? extends Annotation>> getMetaConstraintsAsList() { List<MetaConstraint<T, ? extends Annotation>> constraintList = new ArrayList<MetaConstraint<T, ? extends Annotation>>(); for ( List<MetaConstraint<T, ? extends Annotation>> list : metaConstraints.values() ) { constraintList.addAll( list ); @@ -219,10 +219,10 @@ } /** - * Create bean desciptor, find all classes/subclasses/interfaces which have to be taken in consideration + * Create bean descriptor, find all classes/subclasses/interfaces which have to be taken in consideration * for this validator and create meta data. * - * @param annotationIgnores Datastructure keeping track on which annotation should be ignored. + * @param annotationIgnores Data structure keeping track on which annotation should be ignored. */ private void createMetaData(AnnotationIgnores annotationIgnores) { beanDescriptor = new BeanDescriptorImpl<T>( this ); @@ -403,7 +403,7 @@ } /** - * Examines the given annotation to see whether it is a single or multi valued constraint annotation. + * Examines the given annotation to see whether it is a single- or multi-valued constraint annotation. * * @param clazz the class we are currently processing. * @param annotation The annotation to examine. @@ -463,7 +463,7 @@ * Finds all constraint annotations defined for the given field/method and returns them in a list of * constraint descriptors. * - * @param member The fiels or method to check for constraints annotations. + * @param member The fields or method to check for constraints annotations. * * @return A list of constraint descriptors for all constraint specified for the given field or method. */

15 years, 4 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
7
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits August 2009