[hibernate-commits] Hibernate SVN: r15848 - in validator/trunk: hibernate-validator/src/test/java/org/hibernate/validation/util and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2009-02-02 08:54:29 -0500 (Mon, 02 Feb 2009)
New Revision: 15848

Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintDescriptorImpl.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
   validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java
Log:
BVAL-106 Constraintdescriptor.getConstraintValidatorClasses() should return a List, not an array

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintDescriptorImpl.java	2009-02-02 12:04:31 UTC (rev 15847)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintDescriptorImpl.java	2009-02-02 13:54:29 UTC (rev 15848)
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.ArrayList;
 import javax.validation.Constraint;
 import javax.validation.ConstraintDescriptor;
 import javax.validation.ConstraintValidator;
@@ -55,6 +56,7 @@
 	private static final int OVERRIDES_PARAMETER_DEFAULT_INDEX = -1;
 
 	private final U annotation;
+	//TODO make it a list
 	private final Class<? extends ConstraintValidator<U,?>>[] constraintClasses;
 	private final Set<Class<?>> groups;
 	private final Map<String, Object> parameters;
@@ -112,9 +114,11 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public Class<? extends ConstraintValidator<U,?>>[]
+	public List<Class<? extends ConstraintValidator<?,?>>>
 			getConstraintValidatorClasses() {
-		return constraintClasses;
+		return Collections.unmodifiableList(
+				Arrays.asList((Class<? extends ConstraintValidator<?,?>>[]) constraintClasses)
+				);
 	}
 
 	/**

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-02-02 12:04:31 UTC (rev 15847)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java	2009-02-02 13:54:29 UTC (rev 15848)
@@ -131,12 +131,12 @@
 		ConstraintValidator constraintValidator;
 		try {
 			//FIXME do choose the right validator depending on the object validated
-			constraintValidator = validationContext.getConstraintValidatorFactory().getInstance( descriptor.getConstraintValidatorClasses()[0] );
+			constraintValidator = validationContext.getConstraintValidatorFactory().getInstance( descriptor.getConstraintValidatorClasses().get(0) );
 		}
 		catch ( RuntimeException e ) {
 			//FIXME do choose the right validator depending on the object validated
 			throw new ValidationException(
-					"Unable to instantiate " + descriptor.getConstraintValidatorClasses()[0], e
+					"Unable to instantiate " + descriptor.getConstraintValidatorClasses().get(0), e
 			);
 		}
 

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-02-02 12:04:31 UTC (rev 15847)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java	2009-02-02 13:54:29 UTC (rev 15848)
@@ -88,7 +88,7 @@
 		assertEquals(
 				"Wrong constraint error Type",
 				constraintType,
-				violation.getConstraintDescriptor().getConstraintValidatorClasses()[0]
+				violation.getConstraintDescriptor().getConstraintValidatorClasses().get(0)
 		);
 		assertConstraintViolation( violation, errorMessage );
 	}

Modified: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java	2009-02-02 12:04:31 UTC (rev 15847)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java	2009-02-02 13:54:29 UTC (rev 15848)
@@ -20,6 +20,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Map;
 import java.util.Set;
+import java.util.List;
 
 /**
  * Describes a single constraint and its composing constraints.
@@ -43,9 +44,12 @@
 	Set<Class<?>> getGroups();
 
 	/**
-	 * @return the constraint validation implementation class
+	 * list of the constraint validation implementation classes
+	 * The lsit is immutable
+	 *
+	 * @return list of the constraint validation implementation classes
 	 */
-	Class<? extends ConstraintValidator<?,?>>[]
+	List<Class<? extends ConstraintValidator<?,?>>>
 	    getConstraintValidatorClasses();
 
 	/**