[hibernate-commits] Hibernate SVN: r15818 - in validator/trunk: hibernate-validator/src/main/java/org/hibernate/validation/impl and 3 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Sun Jan 25 22:04:29 EST 2009
Author: epbernard
Date: 2009-01-25 22:04:28 -0500 (Sun, 25 Jan 2009)
New Revision: 15818
Added:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintValidatorFactoryImpl.java
validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorFactory.java
Removed:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java
validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaConstraint.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/bootstrap/ValidationTest.java
validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactoryBuilder.java
validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorFactoryConfiguration.java
Log:
BVAL-91 rename constraint related classes to make them more readable. Check the spec. Applied to the RI as well
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/BeanMetaDataImpl.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -33,7 +33,7 @@
import javax.validation.Valid;
import javax.validation.ValidationException;
import javax.validation.MessageInterpolator;
-import javax.validation.ConstraintFactory;
+import javax.validation.ConstraintValidatorFactory;
import org.slf4j.Logger;
@@ -57,7 +57,7 @@
private final MessageInterpolator messageInterpolator;
- private final ConstraintFactory constraintFactory;
+ private final ConstraintValidatorFactory constraintValidatorFactory;
/**
* The root bean class for this validator.
@@ -95,10 +95,10 @@
*/
private Map<Class<?>, List<Class<?>>> groupSequences = new HashMap<Class<?>, List<Class<?>>>();
- public BeanMetaDataImpl(Class<T> beanClass, MessageInterpolator messageInterpolator, ConstraintFactory constraintFactory) {
+ public BeanMetaDataImpl(Class<T> beanClass, MessageInterpolator messageInterpolator, ConstraintValidatorFactory constraintValidatorFactory) {
this.beanClass = beanClass;
this.messageInterpolator = messageInterpolator;
- this.constraintFactory = constraintFactory;
+ this.constraintValidatorFactory = constraintValidatorFactory;
createMetaData();
}
@@ -198,7 +198,8 @@
for ( ConstraintDescriptorImpl constraintDescription : fieldMetadata ) {
ReflectionHelper.setAccessibility( field );
MetaConstraint metaConstraint = new MetaConstraint( field, constraintDescription,
- messageInterpolator, constraintFactory );
+ messageInterpolator, constraintValidatorFactory
+ );
metaConstraintList.add( metaConstraint );
}
if ( field.isAnnotationPresent( Valid.class ) ) {
@@ -214,7 +215,8 @@
for ( ConstraintDescriptorImpl constraintDescription : methodMetadata ) {
ReflectionHelper.setAccessibility( method );
MetaConstraint metaConstraint = new MetaConstraint( method, constraintDescription,
- messageInterpolator, constraintFactory );
+ messageInterpolator, constraintValidatorFactory
+ );
metaConstraintList.add( metaConstraint );
}
if ( method.isAnnotationPresent( Valid.class ) ) {
@@ -228,7 +230,8 @@
List<ConstraintDescriptorImpl> classMetadata = findClassLevelConstraints( clazz );
for ( ConstraintDescriptorImpl constraintDescription : classMetadata ) {
MetaConstraint metaConstraint = new MetaConstraint( clazz, constraintDescription,
- messageInterpolator, constraintFactory );
+ messageInterpolator, constraintValidatorFactory
+ );
metaConstraintList.add( metaConstraint );
}
}
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-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -22,7 +22,7 @@
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintDescriptor;
import javax.validation.ValidationException;
-import javax.validation.ConstraintFactory;
+import javax.validation.ConstraintValidatorFactory;
import javax.validation.MessageInterpolator;
import org.slf4j.Logger;
@@ -44,24 +44,24 @@
private final List<ConstraintTree> children;
private ConstraintValidator constraintValidator;
private final ConstraintDescriptor descriptor;
- private final ConstraintFactory constraintFactory;
+ private final ConstraintValidatorFactory constraintValidatorFactory;
private final MessageInterpolator messageInterpolator;
- public ConstraintTree(ConstraintDescriptor descriptor, ConstraintFactory constraintFactory, MessageInterpolator messageInterpolator) {
- this( descriptor, null, constraintFactory, messageInterpolator );
+ public ConstraintTree(ConstraintDescriptor descriptor, ConstraintValidatorFactory constraintValidatorFactory, MessageInterpolator messageInterpolator) {
+ this( descriptor, null, constraintValidatorFactory, messageInterpolator );
}
- private ConstraintTree(ConstraintDescriptor descriptor, ConstraintTree parent, ConstraintFactory constraintFactory, MessageInterpolator messageInterpolator) {
+ private ConstraintTree(ConstraintDescriptor descriptor, ConstraintTree parent, ConstraintValidatorFactory constraintValidatorFactory, MessageInterpolator messageInterpolator) {
this.parent = parent;
this.descriptor = descriptor;
- this.constraintFactory = constraintFactory;
+ this.constraintValidatorFactory = constraintValidatorFactory;
this.messageInterpolator = messageInterpolator;
this.constraintValidator = getConstraint( descriptor );
children = new ArrayList<ConstraintTree>( descriptor.getComposingConstraints().size() );
for ( ConstraintDescriptor composingDescriptor : descriptor.getComposingConstraints() ) {
ConstraintTree treeNode = new ConstraintTree(
- composingDescriptor, this, constraintFactory, messageInterpolator
+ composingDescriptor, this, constraintValidatorFactory, messageInterpolator
);
children.add( treeNode );
}
@@ -147,7 +147,7 @@
ConstraintValidator constraintValidator;
try {
//unchecked
- constraintValidator = constraintFactory.getInstance( descriptor.getConstraintValidatorClass() );
+ constraintValidator = constraintValidatorFactory.getInstance( descriptor.getConstraintValidatorClass() );
}
catch ( RuntimeException e ) {
throw new ValidationException( "Unable to instantiate " + descriptor.getConstraintValidatorClass(), e );
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaConstraint.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaConstraint.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -24,7 +24,7 @@
import javax.validation.ConstraintDescriptor;
import javax.validation.ValidationException;
import javax.validation.MessageInterpolator;
-import javax.validation.ConstraintFactory;
+import javax.validation.ConstraintValidatorFactory;
import org.hibernate.validation.util.ReflectionHelper;
@@ -70,11 +70,11 @@
*/
private final ElementType elementType;
- public MetaConstraint(Type t, ConstraintDescriptor constraintDescriptor, MessageInterpolator messageInterpolator, ConstraintFactory factory) {
- this( t, null, null, ElementType.FIELD, constraintDescriptor, "", messageInterpolator, factory );
+ public MetaConstraint(Type t, ConstraintDescriptor constraintDescriptor, MessageInterpolator messageInterpolator, ConstraintValidatorFactory validatorFactory) {
+ this( t, null, null, ElementType.FIELD, constraintDescriptor, "", messageInterpolator, validatorFactory );
}
- public MetaConstraint(Method m, ConstraintDescriptor constraintDescriptor, MessageInterpolator messageInterpolator, ConstraintFactory factory) {
+ public MetaConstraint(Method m, ConstraintDescriptor constraintDescriptor, MessageInterpolator messageInterpolator, ConstraintValidatorFactory validatorFactory) {
this(
null,
m,
@@ -83,21 +83,23 @@
constraintDescriptor,
ReflectionHelper.getPropertyName( m ),
messageInterpolator,
- factory
+ validatorFactory
);
}
- public MetaConstraint(Field f, ConstraintDescriptor constraintDescriptor, MessageInterpolator messageInterpolator, ConstraintFactory factory) {
- this( null, null, f, ElementType.FIELD, constraintDescriptor, f.getName(), messageInterpolator, factory );
+ public MetaConstraint(Field f, ConstraintDescriptor constraintDescriptor, MessageInterpolator messageInterpolator, ConstraintValidatorFactory validatorFactory) {
+ this( null, null, f, ElementType.FIELD, constraintDescriptor, f.getName(), messageInterpolator,
+ validatorFactory
+ );
}
- private MetaConstraint(Type t, Method m, Field f, ElementType elementType, ConstraintDescriptor constraintDescriptor, String property, MessageInterpolator messageInterpolator, ConstraintFactory factory) {
+ private MetaConstraint(Type t, Method m, Field f, ElementType elementType, ConstraintDescriptor constraintDescriptor, String property, MessageInterpolator messageInterpolator, ConstraintValidatorFactory validatorFactory) {
this.type = t;
this.method = m;
this.field = f;
this.elementType = elementType;
this.propertyName = property;
- constraintTree = new ConstraintTree( constraintDescriptor, factory, messageInterpolator );
+ constraintTree = new ConstraintTree( constraintDescriptor, validatorFactory, messageInterpolator );
}
/**
Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -1,45 +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.impl;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintFactory;
-import javax.validation.ValidationException;
-
-/**
- * Default <code>ConstraintFactory</code> using a no-arg constructor.
- *
- * @author Emmanuel Bernard
- */
-public class ConstraintFactoryImpl implements ConstraintFactory {
-
- /**
- * {@inheritDoc}
- */
- public <T extends ConstraintValidator> T getInstance(Class<T> key) {
- try {
- return key.newInstance();
- }
- catch ( InstantiationException e ) {
- throw new ValidationException( "Unable to instanciate " + key, e );
- }
- catch ( IllegalAccessException e ) {
- throw new ValidationException( "Unable to instanciate " + key, e );
- }
- }
-}
Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintValidatorFactoryImpl.java (from rev 15817, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java)
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintValidatorFactoryImpl.java (rev 0)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintValidatorFactoryImpl.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -0,0 +1,45 @@
+// $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.impl;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorFactory;
+import javax.validation.ValidationException;
+
+/**
+ * Default <code>ConstraintValidatorFactory</code> using a no-arg constructor.
+ *
+ * @author Emmanuel Bernard
+ */
+public class ConstraintValidatorFactoryImpl implements ConstraintValidatorFactory {
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T extends ConstraintValidator> T getInstance(Class<T> key) {
+ try {
+ return key.newInstance();
+ }
+ catch ( InstantiationException e ) {
+ throw new ValidationException( "Unable to instanciate " + key, e );
+ }
+ catch ( IllegalAccessException e ) {
+ throw new ValidationException( "Unable to instanciate " + key, e );
+ }
+ }
+}
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintValidatorFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
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-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryBuilderImpl.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -19,7 +19,7 @@
import java.io.InputStream;
import java.util.List;
-import javax.validation.ConstraintFactory;
+import javax.validation.ConstraintValidatorFactory;
import javax.validation.MessageInterpolator;
import javax.validation.TraversableResolver;
import javax.validation.ValidationException;
@@ -48,7 +48,7 @@
private final TraversableResolver defaultTraversableResolver = new DefaultTraversableResolver();
private MessageInterpolator messageInterpolator;
- private ConstraintFactory constraintFactory = new ConstraintFactoryImpl();
+ private ConstraintValidatorFactory constraintValidatorFactory = new ConstraintValidatorFactoryImpl();
private String configurationFile = "META-INF/validation.xml";
private final ValidationProvider provider;
private final ValidationProviderResolver providerResolver;
@@ -86,8 +86,8 @@
return this;
}
- public ValidatorFactoryBuilderImpl constraintFactory(ConstraintFactory constraintFactory) {
- this.constraintFactory = constraintFactory;
+ public ValidatorFactoryBuilderImpl constraintValidatorFactory(ConstraintValidatorFactory constraintValidatorFactory) {
+ this.constraintValidatorFactory = constraintValidatorFactory;
return this;
}
@@ -123,8 +123,8 @@
return messageInterpolator;
}
- public ConstraintFactory getConstraintFactory() {
- return constraintFactory;
+ public ConstraintValidatorFactory getConstraintValidatorFactory() {
+ return constraintValidatorFactory;
}
public TraversableResolver getTraversableResolver() {
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-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -19,7 +19,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.validation.ConstraintFactory;
+import javax.validation.ConstraintValidatorFactory;
import javax.validation.MessageInterpolator;
import javax.validation.TraversableResolver;
import javax.validation.Validator;
@@ -37,7 +37,7 @@
private final MessageInterpolator messageInterpolator;
private final TraversableResolver traversableResolver;
- private final ConstraintFactory constraintFactory;
+ private final ConstraintValidatorFactory constraintValidatorFactory;
//TODO is there a way to replace ? by so kind of <T> to express the correlation?
private Map<Class<?>, BeanMetaDataImpl<?>> metadataProviders
@@ -46,7 +46,7 @@
public ValidatorFactoryImpl(ValidatorFactoryConfiguration configuration) {
this.messageInterpolator = configuration.getMessageInterpolator();
- this.constraintFactory = configuration.getConstraintFactory();
+ this.constraintValidatorFactory = configuration.getConstraintValidatorFactory();
this.traversableResolver = configuration.getTraversableResolver();
//do init metadata from XML form
}
@@ -72,7 +72,7 @@
@SuppressWarnings( "unchecked")
BeanMetaDataImpl<T> metadata = ( BeanMetaDataImpl<T> ) metadataProviders.get(beanClass);
if (metadata == null) {
- metadata = new BeanMetaDataImpl<T>(beanClass, messageInterpolator, constraintFactory);
+ metadata = new BeanMetaDataImpl<T>(beanClass, messageInterpolator, constraintValidatorFactory );
metadataProviders.put( beanClass, metadata );
}
return metadata;
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -23,7 +23,7 @@
import java.util.Locale;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintDescriptor;
-import javax.validation.ConstraintFactory;
+import javax.validation.ConstraintValidatorFactory;
import javax.validation.ConstraintViolation;
import javax.validation.MessageInterpolator;
import javax.validation.Validation;
@@ -45,7 +45,7 @@
import org.hibernate.validation.HibernateValidatorFactoryBuilder;
import org.hibernate.validation.constraints.NotNullConstraintValidator;
import org.hibernate.validation.eg.Customer;
-import org.hibernate.validation.impl.ConstraintFactoryImpl;
+import org.hibernate.validation.impl.ConstraintValidatorFactoryImpl;
import org.hibernate.validation.impl.ValidatorFactoryBuilderImpl;
import org.hibernate.validation.impl.ValidatorFactoryImpl;
import org.hibernate.validation.impl.HibernateValidationProvider;
@@ -132,7 +132,7 @@
}
@Test
- public void testCustomConstraintFactory() {
+ public void testCustomConstraintValidatorFactory() {
ValidatorFactoryBuilder<?> builder = Validation.getBuilder();
assertDefaultBuilderAndFactory( builder );
@@ -150,13 +150,13 @@
//FIXME nothing guarantee that a builder can be reused
// now we modify the builder, get a new factory and valiator and try again
- builder.constraintFactory(
- new ConstraintFactory() {
+ builder.constraintValidatorFactory(
+ new ConstraintValidatorFactory() {
public <T extends ConstraintValidator> T getInstance(Class<T> key) {
if ( key == NotNullConstraintValidator.class ) {
return ( T ) new BadlyBehavedNotNullConstraintValidator();
}
- return new ConstraintFactoryImpl().getInstance( key );
+ return new ConstraintValidatorFactoryImpl().getInstance( key );
}
}
);
Modified: validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: Constraint.java 15817 2009-01-25 22:35:36Z epbernard $
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -41,5 +41,5 @@
/**
* @return The class implementing the constraint validation logic
*/
- public abstract Class<? extends ConstraintValidator> validatedBy();
+ public Class<? extends ConstraintValidator> validatedBy();
}
\ No newline at end of file
Deleted: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -1,36 +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 javax.validation;
-
-/**
- * Instantiate a <code>ConstraintValidator</code> instance from its class.
- * The <code>ConstraintFactory</code> is <b>not</b> responsible for calling {@link ConstraintValidator#initialize(java.lang.annotation.Annotation)}.
- *
- * @author Dhanji R. Prasanna
- * @author Emmanuel Bernard
- * @author Hardy Ferentschik
- */
-public interface ConstraintFactory {
-
- /**
- * @param key The class of the constraint validator to instantiate.
- *
- * @return An constraint validator instance of the specified class.
- */
- <T extends ConstraintValidator> T getInstance(Class<T> key);
-}
Copied: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorFactory.java (from rev 15817, validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java)
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorFactory.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorFactory.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -0,0 +1,36 @@
+// $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 javax.validation;
+
+/**
+ * Instantiate a <code>ConstraintValidator</code> instance from its class.
+ * The <code>ConstraintValidatorFactory</code> is <b>not</b> responsible for calling {@link ConstraintValidator#initialize(java.lang.annotation.Annotation)}.
+ *
+ * @author Dhanji R. Prasanna
+ * @author Emmanuel Bernard
+ * @author Hardy Ferentschik
+ */
+public interface ConstraintValidatorFactory {
+
+ /**
+ * @param key The class of the constraint validator to instantiate.
+ *
+ * @return An constraint validator instance of the specified class.
+ */
+ <T extends ConstraintValidator> T getInstance(Class<T> key);
+}
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactoryBuilder.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactoryBuilder.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactoryBuilder.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -69,14 +69,14 @@
T traversableResolver(TraversableResolver resolver);
/**
- * Defines the constraint factory. Has priority over the configuration
+ * Defines the constraint validator factory. Has priority over the configuration
* based constraint factory.
*
- * @param constraintFactory constraint factory inmplementation.
+ * @param constraintValidatorFactory constraint factory inmplementation.
*
* @return <code>this</code> following the chaining method pattern.
*/
- T constraintFactory(ConstraintFactory constraintFactory);
+ T constraintValidatorFactory(ConstraintValidatorFactory constraintValidatorFactory);
/**
* Configure the ValidatorFactory based on <code>stream</code>
Modified: validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorFactoryConfiguration.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorFactoryConfiguration.java 2009-01-25 22:35:36 UTC (rev 15817)
+++ validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorFactoryConfiguration.java 2009-01-26 03:04:28 UTC (rev 15818)
@@ -18,7 +18,7 @@
package javax.validation.spi;
import java.io.InputStream;
-import javax.validation.ConstraintFactory;
+import javax.validation.ConstraintValidatorFactory;
import javax.validation.MessageInterpolator;
import javax.validation.TraversableResolver;
@@ -49,12 +49,12 @@
InputStream getConfigurationStream();
/**
- * Defines the constraint implementation factory as defined by
+ * Defines the constraint validator implementation factory as defined by
* the client programmatically or null if undefined
*
* @return factory instance or null if not defined
*/
- ConstraintFactory getConstraintFactory();
+ ConstraintValidatorFactory getConstraintValidatorFactory();
/**
* Traversable resolver as defined by the client programmatically
More information about the hibernate-commits
mailing list