Hibernate SVN: r15765 - in validator/trunk: hibernate-validator/src/main/java/org/hibernate/validation/impl and 14 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-01-09 09:56:30 -0500 (Fri, 09 Jan 2009)
New Revision: 15765
Added:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeConstraint.java
validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/BuiltinConstraintDefinitions.properties
Removed:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeContraint.java
Modified:
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertFalse.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertFalseValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertTrue.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertTrueValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/ClassValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Email.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/EmailValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Future.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/FutureValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/InvalidStateException.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/InvalidValue.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Length.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/LengthValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Max.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/MaxValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Min.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/MinValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/NotNull.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/NotNullValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Past.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PastValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Pattern.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PatternValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PersistentClassConstraint.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PropertyConstraint.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Range.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/RangeValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Size.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/SizeValidator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Valid.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Validator.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/ValidatorClass.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidateEventListener.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidatePreInsertEventListener.java
validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidatePreUpdateEventListener.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Address.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Brother.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Contact.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/EmailTest.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Serializability.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/SerializabilityValidator.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Site.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Tv.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/TvOwner.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/User.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/ValidatorTest.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Vase.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration/HibernateAnnotationIntegrationTest.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Animal.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/BoneEater.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Dog.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Eater.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/InheritanceTest.java
validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Name.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/BeanDescriptorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/DefaultTraversableResolver.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java
validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/All.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/DefaultAlias.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/First.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Last.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Second.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
validator/trunk/validation-api/src/main/java/javax/validation/BeanDescriptor.java
validator/trunk/validation-api/src/main/java/javax/validation/PropertyDescriptor.java
validator/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java
validator/trunk/validation-api/src/main/java/javax/validation/groups/Default.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s2/s4/FineGrainedLengthConstraint.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s2/s4/Length.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s2/s4/LengthConstraint.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Address.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Auditable.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Billable.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/BuyInOneClick.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/BuyInOneClickInherited.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/CreditCard.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Order.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/User.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/ZipCode.java
validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/ZipCodeCoherenceChecker.java
Log:
refactorings and settings svn:keywords on all java files
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java 2009-01-09 13:56:01 UTC (rev 15764)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java 2009-01-09 14:56:30 UTC (rev 15765)
@@ -1,4 +1,4 @@
-// $Id: SizeContraint.java 15494 2008-11-04 03:12:55Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -19,7 +19,6 @@
import javax.validation.Constraint;
import javax.validation.ConstraintContext;
-import javax.validation.constraints.Size;
/**
* Check that a string's length is between min and max.
@@ -41,7 +40,7 @@
return true;
}
if ( !( value instanceof String ) ) {
- throw new IllegalArgumentException( "Expected String type." );
+ throw new IllegalArgumentException( "Expected String type." );
}
String string = ( String ) value;
int length = string.length();
Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeConstraint.java (from rev 15756, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeContraint.java)
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeConstraint.java (rev 0)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeConstraint.java 2009-01-09 14:56:30 UTC (rev 15765)
@@ -0,0 +1,67 @@
+// $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.validation.constraints;
+
+import java.util.Collection;
+import java.lang.reflect.Array;
+import javax.validation.Constraint;
+import javax.validation.ConstraintContext;
+import javax.validation.constraints.Size;
+
+/**
+ * Check that a string's length is between min and max.
+ *
+ * @author Emmanuel Bernard
+ * @author Gavin King
+ */
+public class SizeConstraint implements Constraint<Size> {
+ private int min;
+ private int max;
+
+ public void initialize(Size parameters) {
+ min = parameters.min();
+ max = parameters.max();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isValid(Object value, ConstraintContext constraintContext) {
+ if ( value == null ) {
+ return true;
+ }
+
+ int size;
+ if ( value instanceof String ) {
+ String string = ( String ) value;
+ size = string.length();
+
+ }
+ else if ( value instanceof Collection ) {
+ Collection collection = ( Collection ) value;
+ size = collection.size();
+ }
+ else if ( value instanceof Array ) {
+ size = Array.getLength( value );
+ }
+ else {
+ throw new IllegalArgumentException( "Expected String type." );
+ }
+ return size >= min && size <= max;
+ }
+}
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeContraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeContraint.java 2009-01-09 13:56:01 UTC (rev 15764)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/SizeContraint.java 2009-01-09 14:56:30 UTC (rev 15765)
@@ -1,55 +0,0 @@
-// $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.validation.constraints;
-
-import javax.validation.Constraint;
-import javax.validation.ConstraintContext;
-import javax.validation.constraints.Size;
-
-/**
- * Check that a string's length is between min and max.
- *
- * @author Emmanuel Bernard
- * @author Gavin King
- */
-public class SizeContraint implements Constraint<Size> {
- private int min;
- private int max;
-
- public void initialize(Size parameters) {
- min = parameters.min();
- max = parameters.max();
- }
-
- /**
- * {@inheritDoc}
- * @todo Implement collection support
- */
- public boolean isValid(Object value, ConstraintContext constraintContext) {
- if ( value == null ) {
- return true;
- }
- if ( !( value instanceof String ) ) {
- throw new IllegalArgumentException( "Expected String type." );
- }
- String string = ( String ) value;
- int length = string.length();
- return length >= min && length <= max;
- }
-
-}
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/BeanDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/DefaultTraversableResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java 2009-01-09 13:56:01 UTC (rev 15764)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java 2009-01-09 14:56:30 UTC (rev 15765)
@@ -18,6 +18,7 @@
package org.hibernate.validation.util;
import java.beans.Introspector;
+import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
@@ -29,23 +30,20 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.WildcardType;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
+import java.util.Properties;
+import javax.validation.Constraint;
import javax.validation.ConstraintValidator;
import javax.validation.ValidationException;
-import javax.validation.Constraint;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
import org.slf4j.Logger;
-import org.hibernate.validation.constraints.NotNullConstraint;
-import org.hibernate.validation.constraints.SizeContraint;
-
/**
* Some reflection utility methods.
*
@@ -54,7 +52,18 @@
public class ReflectionHelper {
private static final Logger log = LoggerFactory.make();
+ private static final Properties builtInConstraints = new Properties();
+ static {
+ URL url = ReflectionHelper.class.getResource( "/org/hibernate/validation/BuiltinConstraintDefinitions.properties" );
+ try {
+ builtInConstraints.load( url.openStream() );
+ }
+ catch ( IOException e ) {
+ throw new ValidationException( "Unable to load defined builtin constraint definitions." );
+ }
+ }
+
/**
* Private constructor in order to avoid instantiation.
*/
@@ -62,20 +71,23 @@
}
- /**
- * @todo Maybe move into another class
- * @todo Read mappings for example from a resource file
- */
public static Class<? extends Constraint> getBuiltInConstraint(Annotation annotation) {
- if ( annotation instanceof NotNull ) {
- return NotNullConstraint.class;
+ Class constraint = null;
+ String annotationType = annotation.annotationType().getName();
+ if ( builtInConstraints.containsKey( annotationType ) ) {
+ String constraintImplClassName = null;
+ try {
+ constraintImplClassName = builtInConstraints.getProperty( annotationType );
+ constraint = Class.forName( constraintImplClassName );
+ }
+ catch ( ClassNotFoundException e ) {
+ throw new ValidationException(
+ "Unable to load " + constraintImplClassName + " as default implementation for " + annotationType
+ );
+ }
+
}
- if ( annotation instanceof Size ) {
- return SizeContraint.class;
- }
- else {
- return null;
- }
+ return constraint;
}
/**
@@ -154,9 +166,9 @@
* @param annotation the annotation to check.
*
* @return <code>true</code> if the specified annotation is a multi value constraints, <code>false</code>
- * otherwise.
+ * otherwise.
*/
- public static boolean isMultiValueConstraint(Annotation annotation) {
+ public static boolean isMultiValueConstraint(Annotation annotation) {
boolean isMultiValueConstraint = false;
try {
Method m = annotation.getClass().getMethod( "value" );
@@ -166,7 +178,8 @@
for ( Annotation a : annotations ) {
if ( isConstraintAnnotation( a ) || isBuiltInConstraintAnnotation( a ) ) {
isMultiValueConstraint = true;
- } else {
+ }
+ else {
isMultiValueConstraint = false;
break;
}
Added: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/BuiltinConstraintDefinitions.properties
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/BuiltinConstraintDefinitions.properties (rev 0)
+++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/BuiltinConstraintDefinitions.properties 2009-01-09 14:56:30 UTC (rev 15765)
@@ -0,0 +1,3 @@
+# $Id$
+javax.validation.constraints.NotNull=org.hibernate.validation.constraints.NotNullConstraint
+javax.validation.constraints.Size=org.hibernate.validation.constraints.SizeConstraint
\ No newline at end of file
Property changes on: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/BuiltinConstraintDefinitions.properties
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties 2009-01-09 13:56:01 UTC (rev 15764)
+++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties 2009-01-09 14:56:30 UTC (rev 15765)
@@ -1,3 +1,4 @@
+# $Id$
validator.notNull=may not be null
validator.size=size must be between {min} and {max}
validator.length=length must be between {min} and {max}
@@ -2,2 +3,2 @@
validator.notEmpty=may not be empty
-validator.pattern=must match "{regex}"
\ No newline at end of file
+\validator.pattern=must match "{regex}"
\ No newline at end of file
Property changes on: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validation/ValidationMessages.properties
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/All.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/DefaultAlias.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/First.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Last.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Second.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java 2009-01-09 13:56:01 UTC (rev 15764)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java 2009-01-09 14:56:30 UTC (rev 15765)
@@ -29,7 +29,7 @@
import static org.hibernate.validation.util.TestUtil.assertConstraintViolation;
import org.hibernate.validation.constraints.NotNullConstraint;
-import org.hibernate.validation.constraints.SizeContraint;
+import org.hibernate.validation.constraints.SizeConstraint;
import org.hibernate.validation.constraints.PatternConstraint;
import org.hibernate.validation.eg.FrenchAddress;
@@ -68,7 +68,7 @@
assertConstraintViolation(
violation,
"A french zip code has a length of 5",
- SizeContraint.class,
+ SizeConstraint.class,
FrenchAddress.class,
"abc",
"zipCode"
@@ -108,7 +108,7 @@
assertConstraintViolation(
violation,
"A french zip code has a length of 5",
- SizeContraint.class,
+ SizeConstraint.class,
FrenchAddress.class,
"123",
"zipCode"
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-01-09 13:56:01 UTC (rev 15764)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-01-09 14:56:30 UTC (rev 15765)
@@ -1,4 +1,4 @@
-// $Id: ReflectionHelperTest.java 15751 2009-01-07 15:32:23Z 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/test/java/org/hibernate/validation/util/TestUtil.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertFalse.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertFalseValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertTrue.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/AssertTrueValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/ClassValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Email.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/EmailValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Future.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/FutureValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/InvalidStateException.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/InvalidValue.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Length.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/LengthValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Max.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/MaxValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Min.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/MinValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/NotNull.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/NotNullValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Past.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PastValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Pattern.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PatternValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PersistentClassConstraint.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/PropertyConstraint.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Range.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/RangeValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Size.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/SizeValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Valid.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/Validator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/ValidatorClass.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidateEventListener.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidatePreInsertEventListener.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/event/ValidatePreUpdateEventListener.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Address.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Brother.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Contact.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/EmailTest.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Serializability.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/SerializabilityValidator.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Site.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Tv.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/TvOwner.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/User.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/ValidatorTest.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/Vase.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/haintegration/HibernateAnnotationIntegrationTest.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Animal.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/BoneEater.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Dog.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Eater.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/InheritanceTest.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/hibernate-validator-legacy/src/test/java/org/hibernate/validator/test/inheritance/Name.java
___________________________________________________________________
Name: svn:keywords
- Date Revision Author Id
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/BeanDescriptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/PropertyDescriptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/groups/Default.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s2/s4/FineGrainedLengthConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s2/s4/Length.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s2/s4/LengthConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Address.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Auditable.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Billable.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/BuyInOneClick.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/BuyInOneClickInherited.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/CreditCard.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/Order.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/User.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/ZipCode.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/test/java/org/hibernate/validator/spec/s3/s4/ZipCodeCoherenceChecker.java
___________________________________________________________________
Name: svn:keywords
+ Id
15 years, 3 months
- 1
- 0
Hibernate SVN: r15764 - core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-01-09 08:56:01 -0500 (Fri, 09 Jan 2009)
New Revision: 15764
Modified:
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java
Log:
JBPAPP-1563 HHH-3640 - Added mapping to functions mod and bit_length
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java 2009-01-09 13:45:30 UTC (rev 15763)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/dialect/SybaseDialect.java 2009-01-09 13:56:01 UTC (rev 15764)
@@ -103,6 +103,9 @@
registerFunction( "trim", new SQLFunctionTemplate( Hibernate.STRING, "ltrim(rtrim(?1))") );
registerFunction( "locate", new CharIndexFunction() );
+ registerFunction( "mod", new SQLFunctionTemplate( Hibernate.INTEGER, "?1 % ?2" ) );
+ registerFunction( "bit_length", new SQLFunctionTemplate( Hibernate.INTEGER, "datalength(?1) * 8" ) );
+
getDefaultProperties().setProperty(Environment.STATEMENT_BATCH_SIZE, NO_BATCH);
}
15 years, 3 months
- 1
- 0
Hibernate SVN: r15763 - in validator/trunk: hibernate-validator/src/main/java/org/hibernate/validation/constraints and 6 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-01-09 08:45:30 -0500 (Fri, 09 Jan 2009)
New Revision: 15763
Added:
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryBuilderImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/FrenchZipcode.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java
validator/trunk/pom.xml
validator/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java
Log:
BVAL-31 added support for @OverridesParameters; refactoring
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -20,6 +20,7 @@
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@@ -28,7 +29,7 @@
* @author Hardy Ferentschik
*/
@Documented
-@Target({ METHOD, FIELD })
+@Target({ METHOD, FIELD, TYPE })
@Retention(RUNTIME)
public @interface Patterns {
Pattern[] value();
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -68,7 +68,7 @@
private Class<?> currentGroup;
/**
- * Stack for keep track of the currently validated object.
+ * Stack for keeping track of the currently validated object.
*/
private Stack<ValidatedBean> validatedObjectStack = new Stack<ValidatedBean>();
@@ -79,7 +79,7 @@
public ValidationContext(T rootBean, Object object) {
this.rootBean = rootBean;
- validatedObjectStack.push( new ValidatedBean(object) );
+ validatedObjectStack.push( new ValidatedBean( object ) );
processedObjects = new HashMap<Class<?>, IdentitySet>();
propertyPath = "";
failingConstraintViolations = new ArrayList<ConstraintViolationImpl<T>>();
@@ -94,7 +94,7 @@
}
public void pushValidatedObject(Object validatedObject) {
- validatedObjectStack.push( new ValidatedBean(validatedObject) );
+ validatedObjectStack.push( new ValidatedBean( validatedObject ) );
}
public void popValidatedObject() {
@@ -186,7 +186,9 @@
return groups.contains( currentGroup );
}
- //TODO caching the object class is useful?
+ /**
+ * @todo Is it useful to cache the object class?
+ */
private static class ValidatedBean {
final Object bean;
@@ -194,7 +196,7 @@
private ValidatedBean(Object bean) {
this.bean = bean;
- if (bean == null) {
+ if ( bean == null ) {
this.beanType = null;
}
else {
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-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -30,15 +30,14 @@
import javax.validation.BeanDescriptor;
import javax.validation.Constraint;
import javax.validation.ConstraintDescriptor;
+import javax.validation.ConstraintFactory;
import javax.validation.ConstraintViolation;
import javax.validation.MessageResolver;
import javax.validation.TraversableResolver;
import javax.validation.ValidationException;
import javax.validation.Validator;
-import javax.validation.ConstraintFactory;
import javax.validation.groups.Default;
-import org.hibernate.validation.Version;
import org.hibernate.validation.impl.ConstraintViolationImpl;
import org.hibernate.validation.util.PropertyIterator;
import org.hibernate.validation.util.ReflectionHelper;
@@ -60,12 +59,6 @@
INDEXABLE_CLASS.add( String.class );
}
-
- //TODO move to Factory at least
- static {
- Version.touch();
- }
-
/**
* Message resolver used for interpolating error messages.
*/
@@ -151,10 +144,10 @@
BeanMetaData<T> beanMetaData =
( BeanMetaData<T> ) factory.getBeanMetaData( context.peekValidatedObjectType() );
for ( MetaConstraint metaConstraint : beanMetaData.getConstraintMetaDataList() ) {
- ConstraintDescriptor constraintDescriptor = metaConstraint.getDescriptor();
+ ConstraintDescriptor mainConstraintDescriptor = metaConstraint.getDescriptor();
context.pushProperty( metaConstraint.getPropertyName() );
- if ( !context.needsValidation( constraintDescriptor.getGroups() ) ) {
+ if ( !context.needsValidation( mainConstraintDescriptor.getGroups() ) ) {
context.popProperty();
continue;
}
@@ -162,9 +155,10 @@
final Object leafBeanInstance = context.peekValidatedObject();
Object value = metaConstraint.getValue( leafBeanInstance );
+ // we have to check the main constraint and all composing constraints
Set<ConstraintDescriptor> descriptors = new HashSet<ConstraintDescriptor>();
- descriptors.addAll( constraintDescriptor.getComposingConstraints() );
- descriptors.add(constraintDescriptor);
+ descriptors.addAll( mainConstraintDescriptor.getComposingConstraints() );
+ descriptors.add(mainConstraintDescriptor);
for (ConstraintDescriptor descriptor : descriptors) {
ConstraintContextImpl contextImpl = new ConstraintContextImpl( descriptor );
if ( !getConstraint( descriptor ).isValid( value, contextImpl ) ) {
@@ -353,6 +347,9 @@
return factory.getBeanMetaData( clazz ).getBeanDescriptor();
}
+ /**
+ * @todo Implement composing constraints.
+ */
private <T> void validateValue(Class<T> beanType, Object object, PropertyIterator propertyIter, List<ConstraintViolationImpl<T>> failingConstraintViolations, Class<?>... groups) {
ConstraintDescriptor constraintDescriptor = getConstraintDescriptorForPath( beanType, propertyIter );
@@ -434,7 +431,7 @@
for ( MetaConstraint metaConstraint : metaConstraintList ) {
ConstraintDescriptor constraintDescriptor = metaConstraint.getDescriptor();
if ( metaConstraint.getPropertyName().equals( propertyIter.getHead() ) ) {
- matchingConstraintDescriptor = ( ConstraintDescriptor ) constraintDescriptor;
+ matchingConstraintDescriptor = constraintDescriptor;
}
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.List;
import javax.validation.Constraint;
import javax.validation.ConstraintDescriptor;
import javax.validation.ConstraintValidator;
@@ -51,21 +52,27 @@
public class ConstraintDescriptorImpl implements ConstraintDescriptor {
private static final Logger log = LoggerFactory.make();
private static final Class<?>[] DEFAULT_GROUP = new Class<?>[] { Default.class };
+ private static final int OVERRIDES_PARAMETER_DEFAULT_INDEX = -1;
private final Annotation annotation;
private final Class<? extends Constraint> constraintClass;
private final Set<Class<?>> groups;
private final Map<String, Object> parameters;
private final Set<ConstraintDescriptor> composingConstraints = new HashSet<ConstraintDescriptor>();
+ private final Map<ClassIndexWrapper, Map<String, Object>> overrideParameters = new HashMap<ClassIndexWrapper, Map<String, Object>>();
private final boolean isReportAsSingleInvalidConstraint;
public ConstraintDescriptorImpl(Annotation annotation, Class<?>[] groups) {
- this.annotation = annotation;
+ this( annotation, new HashSet<Class<?>>() );
if ( groups.length == 0 ) {
groups = DEFAULT_GROUP;
}
- this.groups = new HashSet<Class<?>>();
this.groups.addAll( Arrays.asList( groups ) );
+ }
+
+ public ConstraintDescriptorImpl(Annotation annotation, Set<Class<?>> groups) {
+ this.annotation = annotation;
+ this.groups = groups;
this.parameters = getAnnotationParameters( annotation );
this.isReportAsSingleInvalidConstraint = annotation.annotationType().isAnnotationPresent(
@@ -82,49 +89,8 @@
this.constraintClass = constraintValidator.value();
}
-
- // check for overrides
- Map<ClassIndexWrapper, Map<String, Object>> overrideParameters = new HashMap<ClassIndexWrapper, Map<String, Object>>();
- for ( Method m : annotation.annotationType().getMethods() ) {
- if ( m.getAnnotation( OverridesParameter.class ) != null ) {
- addOverrideParameter(
- overrideParameters, getMethodValue( annotation, m ), m.getAnnotation( OverridesParameter.class )
- );
- }
- else if ( m.getAnnotation( OverridesParameters.class ) != null ) {
- addOverrideParameter(
- overrideParameters,
- getMethodValue( annotation, m ),
- m.getAnnotation( OverridesParameters.class ).value()
- );
- }
- }
-
- // check for composing constraints
- for ( Annotation a : annotation.annotationType().getDeclaredAnnotations() ) {
- if ( ReflectionHelper.isConstraintAnnotation( a ) || ReflectionHelper.isBuiltInConstraintAnnotation( a ) ) {
- AnnotationDescriptor annotationDescriptor = new AnnotationDescriptor(
- a.annotationType(), getAnnotationParameters( a )
- );
- Map<String, Object> overrides = overrideParameters.get(
- new ClassIndexWrapper(
- a.annotationType(), -1
- )
- );
- if ( overrides != null ) {
- for ( Map.Entry<String, Object> entry : overrides.entrySet() ) {
- annotationDescriptor.setValue( entry.getKey(), entry.getValue() );
- }
- }
- Annotation annotationProxy = AnnotationFactory.create( annotationDescriptor );
- ConstraintDescriptorImpl descriptor = new ConstraintDescriptorImpl( annotationProxy, groups );
- composingConstraints.add( descriptor );
- log.debug( "Adding composing constraint: " + descriptor );
- }
- else if ( ReflectionHelper.isMultiValueConstraint( a ) ) {
- // todo - implement
- }
- }
+ parseOverrideParameters();
+ parseComposingConstraints();
}
/**
@@ -226,6 +192,69 @@
return value;
}
+ private void parseOverrideParameters() {
+ // check for overrides
+ for ( Method m : annotation.annotationType().getMethods() ) {
+ if ( m.getAnnotation( OverridesParameter.class ) != null ) {
+ addOverrideParameter(
+ overrideParameters, getMethodValue( annotation, m ), m.getAnnotation( OverridesParameter.class )
+ );
+ }
+ else if ( m.getAnnotation( OverridesParameters.class ) != null ) {
+ addOverrideParameter(
+ overrideParameters,
+ getMethodValue( annotation, m ),
+ m.getAnnotation( OverridesParameters.class ).value()
+ );
+ }
+ }
+ }
+
+ private void parseComposingConstraints() {
+ for ( Annotation declaredAnnotation : annotation.annotationType().getDeclaredAnnotations() ) {
+ if ( ReflectionHelper.isConstraintAnnotation( declaredAnnotation ) || ReflectionHelper.isBuiltInConstraintAnnotation(
+ declaredAnnotation
+ ) ) {
+ ConstraintDescriptorImpl descriptor = createComposingConstraintDescriptor(
+ OVERRIDES_PARAMETER_DEFAULT_INDEX,
+ declaredAnnotation
+ );
+ composingConstraints.add( descriptor );
+ log.debug( "Adding composing constraint: " + descriptor );
+ }
+ else if ( ReflectionHelper.isMultiValueConstraint( declaredAnnotation ) ) {
+ List<Annotation> multiValueConstraints = ReflectionHelper.getMultiValueConstraints( declaredAnnotation );
+ int index = 1;
+ for ( Annotation constraintAnnotation : multiValueConstraints ) {
+ ConstraintDescriptorImpl descriptor = createComposingConstraintDescriptor(
+ index, constraintAnnotation
+ );
+ composingConstraints.add( descriptor );
+ log.debug( "Adding composing constraint: " + descriptor );
+ index++;
+ }
+ }
+ }
+ }
+
+ private ConstraintDescriptorImpl createComposingConstraintDescriptor(int index, Annotation constraintAnnotation) {
+ AnnotationDescriptor annotationDescriptor = new AnnotationDescriptor(
+ constraintAnnotation.annotationType(), getAnnotationParameters( constraintAnnotation )
+ );
+ Map<String, Object> overrides = overrideParameters.get(
+ new ClassIndexWrapper(
+ constraintAnnotation.annotationType(), index
+ )
+ );
+ if ( overrides != null ) {
+ for ( Map.Entry<String, Object> entry : overrides.entrySet() ) {
+ annotationDescriptor.setValue( entry.getKey(), entry.getValue() );
+ }
+ }
+ Annotation annotationProxy = AnnotationFactory.create( annotationDescriptor );
+ return new ConstraintDescriptorImpl( annotationProxy, groups );
+ }
+
private class ClassIndexWrapper {
final Class<?> clazz;
final int index;
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -25,6 +25,7 @@
import javax.validation.spi.BootstrapState;
import org.hibernate.validation.HibernateValidatorFactoryBuilder;
+import org.hibernate.validation.Version;
/**
* Default implementation of <code>ValidationProvider</code> within Hibernate validator.
@@ -42,8 +43,10 @@
}
public <T extends ValidatorFactoryBuilder<T>> T createSpecializedValidatorFactoryBuilder(BootstrapState state, Class<T> builderClass) {
- if ( ! isSuitable( builderClass ) ) {
- throw new ValidationException("Illegal call to createSpecializedValidatorFactoryBuilder() for a non suitable provider");
+ if ( !isSuitable( builderClass ) ) {
+ throw new ValidationException(
+ "Illegal call to createSpecializedValidatorFactoryBuilder() for a non suitable provider"
+ );
}
//cast protected by isSuitable call
return builderClass.cast( new ValidatorFactoryBuilderImpl( this ) );
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryBuilderImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryBuilderImpl.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryBuilderImpl.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -32,11 +32,17 @@
import javax.validation.spi.ValidatorFactoryConfiguration;
import org.hibernate.validation.HibernateValidatorFactoryBuilder;
+import org.hibernate.validation.Version;
/**
* @author Emmanuel Bernard
*/
public class ValidatorFactoryBuilderImpl implements HibernateValidatorFactoryBuilder, ValidatorFactoryConfiguration {
+
+ static {
+ Version.touch();
+ }
+
//FIXME not sure why it is like that. We should cache these instances somehow. Static?
private final MessageResolver defaultMessageResolver = new ResourceBundleMessageResolver();
private final TraversableResolver defaultTraversableResolver = new DefaultTraversableResolver();
@@ -49,7 +55,7 @@
private TraversableResolver traversableResolver;
public ValidatorFactoryBuilderImpl(BootstrapState state) {
- if (state.getValidationProviderResolver() == null) {
+ if ( state.getValidationProviderResolver() == null ) {
this.providerResolver = new DefaultValidationProviderResolver();
}
else {
@@ -62,7 +68,7 @@
public ValidatorFactoryBuilderImpl(ValidationProvider provider) {
if ( provider == null ) {
- throw new ValidationException( "Assertion error: inconsistent ValidatorFactoryBuilderImpl construction");
+ throw new ValidationException( "Assertion error: inconsistent ValidatorFactoryBuilderImpl construction" );
}
this.provider = provider;
this.providerResolver = null;
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -34,7 +34,7 @@
* @author Hardy Ferentschik
*/
public class ValidatorFactoryImpl implements ValidatorFactoryImplementor {
-
+
private final MessageResolver messageResolver;
private final TraversableResolver traversableResolver;
private final ConstraintFactory constraintFactory;
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/FrenchZipcode.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/FrenchZipcode.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/FrenchZipcode.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -26,14 +26,19 @@
import java.lang.annotation.Target;
import javax.validation.ConstraintValidator;
import javax.validation.OverridesParameter;
+import javax.validation.OverridesParameters;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import org.hibernate.validation.constraints.Pattern;
+import org.hibernate.validation.constraints.Patterns;
+
/**
* @author Hardy Ferentschik
*/
@NotNull
-@Size(max = 5)
+@Size
+@Patterns({ @Pattern(regex = "....."), @Pattern(regex = "bar") })
@ConstraintValidator(FrenchZipcodeConstraint.class)
@Documented
@Target({ METHOD, FIELD, TYPE })
@@ -43,6 +48,16 @@
Class<?>[] groups() default { };
- @OverridesParameter(constraint = Size.class, parameter = "min")
+ @OverridesParameters({
+ @OverridesParameter(constraint = Size.class, parameter = "min"),
+ @OverridesParameter(constraint = Size.class, parameter = "max")
+ })
int size() default 5;
+
+ @OverridesParameter(constraint = Size.class, parameter = "message")
+ String sizeMessage() default "A french zip code has a length of 5";
+
+
+ @OverridesParameter(constraint = Pattern.class, parameter = "regex", index=2)
+ String regex() default "\\d*";
}
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -17,40 +17,21 @@
*/
package org.hibernate.validation.engine;
-import java.util.HashSet;
import java.util.Set;
import javax.validation.ConstraintViolation;
-import javax.validation.ValidationException;
import javax.validation.Validator;
-import javax.validation.Validation;
-import javax.validation.groups.Default;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.hibernate.validation.eg.Actor;
-import org.hibernate.validation.eg.Address;
-import org.hibernate.validation.eg.Animal;
-import org.hibernate.validation.eg.Author;
-import org.hibernate.validation.eg.Book;
-import org.hibernate.validation.eg.Boy;
-import org.hibernate.validation.eg.Customer;
-import org.hibernate.validation.eg.Dictonary;
-import org.hibernate.validation.eg.Engine;
-import org.hibernate.validation.eg.EnglishDictonary;
-import org.hibernate.validation.eg.Order;
-import org.hibernate.validation.eg.Unconstraint;
-import org.hibernate.validation.eg.First;
-import org.hibernate.validation.eg.Second;
-import org.hibernate.validation.eg.Last;
-import org.hibernate.validation.eg.DefaultAlias;
-import org.hibernate.validation.eg.FrenchAddress;
-import org.hibernate.validation.HibernateValidatorFactoryBuilder;
+import static org.hibernate.validation.util.TestUtil.getHibernateValidator;
+import static org.hibernate.validation.util.TestUtil.assertNumberOfViolations;
+import static org.hibernate.validation.util.TestUtil.assertConstraintViolation;
+
import org.hibernate.validation.constraints.NotNullConstraint;
import org.hibernate.validation.constraints.SizeContraint;
-import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.validation.constraints.PatternConstraint;
+import org.hibernate.validation.eg.FrenchAddress;
/**
* Tests for the implementation of <code>Validator</code>.
@@ -59,19 +40,6 @@
*/
public class ConstraintCompositionTest {
- private Validator hibernateValidator;
-
- //TODO should not be Hibernate specific in most case
- private Validator getHibernateValidator() {
- if ( hibernateValidator == null ) {
- HibernateValidatorFactoryBuilder builder = Validation
- .builderType( HibernateValidatorFactoryBuilder.class )
- .getBuilder();
- hibernateValidator = builder.build().getValidator();
- }
- return hibernateValidator;
- }
-
@Test
public void testComposition() {
Validator validator = getHibernateValidator();
@@ -81,28 +49,88 @@
address.setAddressline2( "BP 12 " );
address.setCity( "Bordeaux" );
Set<ConstraintViolation<FrenchAddress>> constraintViolations = validator.validate( address );
- assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- ConstraintViolation<FrenchAddress> violation = constraintViolations.iterator().next();
- assertEquals(
- "Wrong error type",
+ assertNumberOfViolations( constraintViolations, 1 );
+ assertConstraintViolation(
+ constraintViolations.iterator().next(),
+ "may not be null",
NotNullConstraint.class,
- violation.getConstraintDescriptor().getConstraintClass()
+ FrenchAddress.class,
+ null,
+ "zipCode"
);
- assertEquals( "Wrong message", "may not be null", violation.getInterpolatedMessage() );
+
+ address.setZipCode( "abc" );
+ constraintViolations = validator.validate( address );
+ assertNumberOfViolations( constraintViolations, 3 );
+ for ( ConstraintViolation violation : constraintViolations ) {
+ if ( violation.getInterpolatedMessage().equals( "A french zip code has a length of 5" ) ) {
+ assertConstraintViolation(
+ violation,
+ "A french zip code has a length of 5",
+ SizeContraint.class,
+ FrenchAddress.class,
+ "abc",
+ "zipCode"
+ );
+ }
+ else if ( violation.getInterpolatedMessage().equals( "must match \"d*\"" ) ) {
+ assertConstraintViolation(
+ violation,
+ "must match \"d*\"",
+ PatternConstraint.class,
+ FrenchAddress.class,
+ "abc",
+ "zipCode"
+ );
+ }
+ else if ( violation.getInterpolatedMessage().equals( "must match \".....\"" ) ) {
+ assertConstraintViolation(
+ violation,
+ "must match \".....\"" ,
+ PatternConstraint.class,
+ FrenchAddress.class,
+ "abc",
+ "zipCode"
+ );
+ }
+ else {
+ fail( "Wrong violation found." );
+ }
+ }
+
+
address.setZipCode( "123" );
constraintViolations = validator.validate( address );
- assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- violation = constraintViolations.iterator().next();
- assertEquals(
- "Wrong error type",
- SizeContraint.class,
- violation.getConstraintDescriptor().getConstraintClass()
- );
+ assertNumberOfViolations( constraintViolations, 2 );
+ for ( ConstraintViolation violation : constraintViolations ) {
+ if ( violation.getInterpolatedMessage().equals( "A french zip code has a length of 5" ) ) {
+ assertConstraintViolation(
+ violation,
+ "A french zip code has a length of 5",
+ SizeContraint.class,
+ FrenchAddress.class,
+ "123",
+ "zipCode"
+ );
+ }
+ else if ( violation.getInterpolatedMessage().equals( "must match \".....\"" ) ) {
+ assertConstraintViolation(
+ violation,
+ "must match \".....\"" ,
+ PatternConstraint.class,
+ FrenchAddress.class,
+ "123",
+ "zipCode"
+ );
+ }
+ else {
+ fail( "Wrong violation found." );
+ }
+ }
address.setZipCode( "33023" );
constraintViolations = validator.validate( address );
- assertEquals( "Wrong number of constraints", 0, constraintViolations.size() );
- assertEquals( "Wrong message", "size must be between 5 and 5", violation.getInterpolatedMessage() );
+ assertNumberOfViolations( constraintViolations, 0 );
}
}
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -22,7 +22,6 @@
import javax.validation.ConstraintViolation;
import javax.validation.ValidationException;
import javax.validation.Validator;
-import javax.validation.Validation;
import javax.validation.groups.Default;
import static org.junit.Assert.assertEquals;
@@ -30,6 +29,7 @@
import static org.junit.Assert.fail;
import org.junit.Test;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.validation.eg.Actor;
import org.hibernate.validation.eg.Address;
import org.hibernate.validation.eg.Animal;
@@ -37,17 +37,16 @@
import org.hibernate.validation.eg.Book;
import org.hibernate.validation.eg.Boy;
import org.hibernate.validation.eg.Customer;
+import org.hibernate.validation.eg.DefaultAlias;
import org.hibernate.validation.eg.Dictonary;
import org.hibernate.validation.eg.Engine;
import org.hibernate.validation.eg.EnglishDictonary;
-import org.hibernate.validation.eg.Order;
-import org.hibernate.validation.eg.Unconstraint;
import org.hibernate.validation.eg.First;
-import org.hibernate.validation.eg.Second;
import org.hibernate.validation.eg.Last;
-import org.hibernate.validation.eg.DefaultAlias;
-import org.hibernate.validation.HibernateValidatorFactoryBuilder;
-import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.validation.eg.Order;
+import org.hibernate.validation.eg.Second;
+import org.hibernate.validation.eg.Unconstraint;
+import org.hibernate.validation.util.TestUtil;
/**
* Tests for the implementation of <code>Validator</code>.
@@ -56,29 +55,11 @@
*/
public class ValidatorImplTest {
- private Validator hibernateValidator;
-
- //TODO should not be Hibernate specific in most case
- private Validator getHibernateValidator() {
- if (hibernateValidator == null) {
- HibernateValidatorFactoryBuilder builder = Validation
- .builderType( HibernateValidatorFactoryBuilder.class )
- .getBuilder();
- hibernateValidator = builder.build().getValidator();
- }
- return hibernateValidator;
- }
-
-
- /**
- * JSR 303: Requirements on classes to be validates (3.1)
- * @jsr 3.1
- */
@SpecAssertion( section = {"3.1"} )
@Test
public void testWrongMethodName() {
try {
- getHibernateValidator().getConstraintsForClass( Boy.class ).hasConstraints();
+ TestUtil.getHibernateValidator().getConstraintsForClass( Boy.class ).hasConstraints();
fail();
}
catch ( ValidationException e ) {
@@ -93,36 +74,36 @@
@Test(expected = IllegalArgumentException.class)
public void testNullParamterToValidatorImplConstructor() {
- getHibernateValidator().getConstraintsForClass( null );
+ TestUtil.getHibernateValidator().getConstraintsForClass( null );
}
@Test
public void testUnconstraintClass() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
assertTrue( "There should be no constraints", !validator.getConstraintsForClass( Unconstraint.class ).hasConstraints() );
}
@Test
public void testHasConstraints() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
assertTrue( "There should be constraints", validator.getConstraintsForClass( Customer.class ).hasConstraints() );
}
@Test(expected = IllegalArgumentException.class)
public void testValidateWithNull() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
validator.validate( null );
}
@Test(expected = IllegalArgumentException.class)
public void testValidateWithNullProperty() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
validator.validateProperty( null, "firstName" );
}
@Test
public void testGroups() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Author author = new Author();
author.setLastName( "" );
@@ -175,7 +156,7 @@
@Test
public void testDefaultGroupSequence() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Author author = new Author();
author.setLastName( "" );
@@ -217,7 +198,7 @@
@Test
public void testBasicValidation() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Customer customer = new Customer();
customer.setFirstName( "John" );
@@ -233,7 +214,7 @@
@Test
public void testGroupSequences() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Dictonary dictonary = new Dictonary();
dictonary.setTitle( "English - German" );
@@ -249,7 +230,7 @@
@Test
public void testValidationFailureInMultipleGroups() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Animal elepfant = new Animal();
elepfant.setName( "" );
elepfant.setDomain( Animal.Domain.EUKARYOTA );
@@ -274,13 +255,13 @@
@Test(expected = ValidationException.class)
public void testInvalidSequenceName() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
validator.getConstraintsForClass( EnglishDictonary.class ).hasConstraints();
}
@Test
public void testValidationMethod() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Address address = new Address();
address.setAddressline1( null );
@@ -318,7 +299,7 @@
@Test
public void testValidateList() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Customer customer = new Customer();
customer.setFirstName( "John" );
@@ -340,13 +321,10 @@
}
- /**
- * JSR 303: Multi-valued constraints (2.2)
- * @jsr 2.2
- */
@Test
+ @SpecAssertion( section = {"2.2"} )
public void testMultiValueConstraint() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Engine engine = new Engine();
engine.setSerialNumber( "mail(a)foobar.com" );
@@ -362,14 +340,10 @@
assertEquals( "Wrong number of constraints", 0, constraintViolations.size() );
}
-
- /**
- * JSR 303: Object graph validation (3.5.1)
- * @jsr 3.5.1
- */
@Test
+ @SpecAssertion( section = {"3.5.1"} )
public void testGraphValidation() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Actor clint = new Actor( "Clint", "Eastwood" );
Actor morgan = new Actor( "Morgan", "" );
@@ -394,7 +368,7 @@
@Test
public void testValidateValue() {
- Validator validator = getHibernateValidator();
+ Validator validator = TestUtil.getHibernateValidator();
Order order = new Order();
Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java (rev 0)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -0,0 +1,103 @@
+// $Id: ReflectionHelperTest.java 15751 2009-01-07 15:32:23Z 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.validation.util;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+
+import static org.junit.Assert.assertEquals;
+
+import org.hibernate.validation.HibernateValidatorFactoryBuilder;
+
+/**
+ * Tests for the <code>ReflectionHelper</code>.
+ *
+ * @author Hardy Ferentschik
+ */
+public class TestUtil {
+
+ private static Validator hibernateValidator;
+
+ private TestUtil() {
+ }
+
+ public static Validator getHibernateValidator() {
+ if ( hibernateValidator == null ) {
+ HibernateValidatorFactoryBuilder builder = Validation
+ .builderType( HibernateValidatorFactoryBuilder.class )
+ .getBuilder();
+ hibernateValidator = builder.build().getValidator();
+ }
+ return hibernateValidator;
+ }
+
+ public static void assertConstraintViolation(ConstraintViolation violation, String errorMessage, Class constraintType, Class rootBean, Object invalidValue, String propertyPath, Class leafBean) {
+ assertEquals(
+ "Wrong leaf bean type",
+ leafBean,
+ violation.getLeafBean().getClass()
+ );
+ assertConstraintViolation( violation, errorMessage, constraintType, rootBean, invalidValue, propertyPath );
+ }
+
+ public static void assertConstraintViolation(ConstraintViolation violation, String errorMessage, Class constraintType, Class rootBean, Object invalidValue, String propertyPath) {
+ assertEquals(
+ "Wrong propertyPath",
+ propertyPath,
+ violation.getPropertyPath()
+ );
+ assertConstraintViolation( violation, errorMessage, constraintType, rootBean, invalidValue );
+ }
+
+ public static void assertConstraintViolation(ConstraintViolation violation, String errorMessage, Class constraintType, Class rootBean, Object invalidValue) {
+ assertEquals(
+ "Wrong invalid value",
+ invalidValue,
+ violation.getInvalidValue()
+ );
+ assertConstraintViolation( violation, errorMessage, constraintType, rootBean );
+ }
+
+ public static void assertConstraintViolation(ConstraintViolation violation, String errorMessage, Class constraintType, Class rootBean) {
+ assertEquals(
+ "Wrong root bean type",
+ rootBean,
+ violation.getRootBean().getClass()
+ );
+ assertConstraintViolation( violation, errorMessage, constraintType );
+ }
+
+ public static void assertConstraintViolation(ConstraintViolation violation, String errorMessage, Class constraintType) {
+ assertEquals(
+ "Wrong constraint error Type",
+ constraintType,
+ violation.getConstraintDescriptor().getConstraintClass()
+ );
+ assertConstraintViolation( violation, errorMessage );
+ }
+
+ public static void assertConstraintViolation(ConstraintViolation violation, String message) {
+ assertEquals( "Wrong message", message, violation.getInterpolatedMessage() );
+ }
+
+ public static void assertNumberOfViolations(Set violations, int expectedViolations) {
+ assertEquals( "Wrong number of constraint violations", expectedViolations, violations.size() );
+ }
+}
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/pom.xml 2009-01-09 13:45:30 UTC (rev 15763)
@@ -124,6 +124,9 @@
<configuration>
<forkMode>always</forkMode>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
</configuration>
</plugin>
<plugin>
Modified: validator/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java 2009-01-09 11:32:38 UTC (rev 15762)
+++ validator/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java 2009-01-09 13:45:30 UTC (rev 15763)
@@ -6,7 +6,7 @@
* Contract determining if a property can be accessed by the Bean Validation provider
* This contract is called for each property either validated or traversed
*
- * A traversable resolver implementation must me thread-safe
+ * A traversable resolver implementation must me thread-safe.
*
* @author Emmanuel Bernard
*/
@@ -14,14 +14,14 @@
/**
* Determine if a property can be traversed by Bean Validation.
*
- * @param traversableObject object hosting traversableProperty
- * @param traversableProperty name of the traqversable property
+ * @param traversableObject object hosting <code>traversableProperty</code>.
+ * @param traversableProperty name of the traqversable property.
* @param rootBeanType type of the root object passed to the Validator.
- * @param pathToTraversableObject path from the root object to the traversableObject
- * (using the path specification defined by Bean Validator)
- * @param elementType either FIELD or METHOD
+ * @param pathToTraversableObject path from the root object to the <code>traversableProperty</code>
+ * (using the path specification defined by Bean Validator).
+ * @param elementType either <code>FIELD</code> or <code>METHOD</code>.
*
- * @return true if the property is traversable by Bean Validation
+ * @return <code>true</code> if the property is traversable by Bean Validation, <code>false</code> otherwise.
*/
boolean isTraversable(Object traversableObject,
String traversableProperty,
15 years, 3 months
- 1
- 0
Hibernate SVN: r15762 - core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2009-01-09 06:32:38 -0500 (Fri, 09 Jan 2009)
New Revision: 15762
Modified:
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/SQLFunctionsTest.java
Log:
JBPAPP-1555 HHH-3691 : Sybase does not support Blobs and Clobs; skip unit tests that use Blobs/Clobs (missed one)
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/SQLFunctionsTest.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/SQLFunctionsTest.java 2009-01-09 11:00:17 UTC (rev 15761)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/SQLFunctionsTest.java 2009-01-09 11:32:38 UTC (rev 15762)
@@ -27,6 +27,7 @@
import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.function.SQLFunction;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -498,6 +499,14 @@
//s.refresh(b);
//assertTrue( b.getClob() instanceof ClobImpl );
s.flush();
+
+ // Sybase ASE does not support ResultSet.getBlob(String)
+ if ( getDialect() instanceof SybaseDialect && ! ( getDialect() instanceof SQLServerDialect ) ) {
+ s.connection().rollback();
+ s.close();
+ return;
+ }
+
s.refresh(b);
//b.getBlob().setBytes( 2, "abc".getBytes() );
b.getClob().getSubString(2, 3);
15 years, 3 months
- 1
- 0