Author: epbernard
Date: 2009-01-26 20:29:23 -0500 (Mon, 26 Jan 2009)
New Revision: 15824
Added:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorContextImpl.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorContext.java
Removed:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java
Log:
BVAL-92 improvement in building Validator
Deleted:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java
===================================================================
---
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java 2009-01-27
01:13:37 UTC (rev 15823)
+++
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java 2009-01-27
01:29:23 UTC (rev 15824)
@@ -1,53 +0,0 @@
-package org.hibernate.validation.impl;
-
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.Validator;
-import javax.validation.ValidatorBuilder;
-
-import org.hibernate.validation.engine.ValidatorImpl;
-
-/**
- * @author Emmanuel Bernard
- */
-public class ValidatorBuilderImpl implements ValidatorBuilder {
- private MessageInterpolator messageInterpolator;
- private TraversableResolver traversableResolver;
- private final MessageInterpolator factoryMessageInterpolator;
- private final TraversableResolver factoryTraversableResolver;
- private final ValidatorFactoryImpl validatorFactory;
-
- public ValidatorBuilderImpl(ValidatorFactoryImpl validatorFactory,
- MessageInterpolator factoryMessageInterpolator,
- TraversableResolver factoryTraversableResolver) {
- this.validatorFactory = validatorFactory;
- this.factoryMessageInterpolator = factoryMessageInterpolator;
- this.factoryTraversableResolver = factoryTraversableResolver;
- messageInterpolator( factoryMessageInterpolator );
- traversableResolver(factoryTraversableResolver);
- }
-
- public ValidatorBuilder messageInterpolator(MessageInterpolator messageInterpolator) {
- if ( messageInterpolator == null) {
- this.messageInterpolator = factoryMessageInterpolator;
- }
- else {
- this.messageInterpolator = messageInterpolator;
- }
- return this;
- }
-
- public ValidatorBuilder traversableResolver(TraversableResolver traversableResolver) {
- if (traversableResolver == null) {
- this.traversableResolver = factoryTraversableResolver;
- }
- else {
- this.traversableResolver = traversableResolver;
- }
- return this;
- }
-
- public Validator getValidator() {
- return new ValidatorImpl( validatorFactory );
- }
-}
Copied:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorContextImpl.java
(from rev 15817,
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java)
===================================================================
---
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorContextImpl.java
(rev 0)
+++
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorContextImpl.java 2009-01-27
01:29:23 UTC (rev 15824)
@@ -0,0 +1,53 @@
+package org.hibernate.validation.impl;
+
+import javax.validation.MessageInterpolator;
+import javax.validation.TraversableResolver;
+import javax.validation.Validator;
+import javax.validation.ValidatorContext;
+
+import org.hibernate.validation.engine.ValidatorImpl;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class ValidatorContextImpl implements ValidatorContext {
+ private MessageInterpolator messageInterpolator;
+ private TraversableResolver traversableResolver;
+ private final MessageInterpolator factoryMessageInterpolator;
+ private final TraversableResolver factoryTraversableResolver;
+ private final ValidatorFactoryImpl validatorFactory;
+
+ public ValidatorContextImpl(ValidatorFactoryImpl validatorFactory,
+ MessageInterpolator factoryMessageInterpolator,
+ TraversableResolver factoryTraversableResolver) {
+ this.validatorFactory = validatorFactory;
+ this.factoryMessageInterpolator = factoryMessageInterpolator;
+ this.factoryTraversableResolver = factoryTraversableResolver;
+ messageInterpolator( factoryMessageInterpolator );
+ traversableResolver(factoryTraversableResolver);
+ }
+
+ public ValidatorContext messageInterpolator(MessageInterpolator messageInterpolator) {
+ if ( messageInterpolator == null) {
+ this.messageInterpolator = factoryMessageInterpolator;
+ }
+ else {
+ this.messageInterpolator = messageInterpolator;
+ }
+ return this;
+ }
+
+ public ValidatorContext traversableResolver(TraversableResolver traversableResolver) {
+ if (traversableResolver == null) {
+ this.traversableResolver = factoryTraversableResolver;
+ }
+ else {
+ this.traversableResolver = traversableResolver;
+ }
+ return this;
+ }
+
+ public Validator getValidator() {
+ return new ValidatorImpl( validatorFactory );
+ }
+}
Property changes on:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorContextImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
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-27
01:13:37 UTC (rev 15823)
+++
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java 2009-01-27
01:29:23 UTC (rev 15824)
@@ -23,7 +23,7 @@
import javax.validation.MessageInterpolator;
import javax.validation.TraversableResolver;
import javax.validation.Validator;
-import javax.validation.ValidatorBuilder;
+import javax.validation.ValidatorContext;
import javax.validation.spi.ConfigurationState;
import org.hibernate.validation.engine.BeanMetaDataImpl;
@@ -55,15 +55,15 @@
* {@inheritDoc}
*/
public Validator getValidator() {
- return defineValidatorState().getValidator();
+ return usingContext().getValidator();
}
public MessageInterpolator getMessageInterpolator() {
return messageInterpolator;
}
- public ValidatorBuilder defineValidatorState() {
- return new ValidatorBuilderImpl(this, messageInterpolator, traversableResolver);
+ public ValidatorContext usingContext() {
+ return new ValidatorContextImpl(this, messageInterpolator, traversableResolver);
}
public <T> BeanMetaDataImpl<T> getBeanMetaData(Class<T> beanClass) {
Deleted:
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java
===================================================================
---
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java 2009-01-27
01:13:37 UTC (rev 15823)
+++
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java 2009-01-27
01:29:23 UTC (rev 15824)
@@ -1,31 +0,0 @@
-package javax.validation;
-
-/**
- * Return a Validator corresponding to the initialized state.
- *
- * @author Emmanuel Bernard
- */
-public interface ValidatorBuilder {
- /**
- * Defines the message interpolator implementation used by the Validator.
- * If unset, the message interpolator of the ValidatorFactory is used.
- *
- * @return self following the chaining method pattern
- */
- ValidatorBuilder messageInterpolator(MessageInterpolator messageInterpolator);
-
- /**
- * Defines the traversable resolver implementation used by the Validator.
- * If unset, the traversable resolver of the ValidatorFactory is used.
- *
- * @return self following the chaining method pattern
- */
- ValidatorBuilder traversableResolver(TraversableResolver traversableResolver);
-
- /**
- * @return an initialized <code>Validator</code> instance respecting the
defined state.
- * Validator instances can be pooled and shared by the implementation.
- */
- Validator getValidator();
-
-}
Copied:
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorContext.java (from
rev 15817,
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java)
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ValidatorContext.java
(rev 0)
+++
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorContext.java 2009-01-27
01:29:23 UTC (rev 15824)
@@ -0,0 +1,30 @@
+package javax.validation;
+
+/**
+ * Return a Validator corresponding to the initialized state.
+ *
+ * @author Emmanuel Bernard
+ */
+public interface ValidatorContext {
+ /**
+ * Defines the message interpolator implementation used by the Validator.
+ * If unset, the message interpolator of the ValidatorFactory is used.
+ *
+ * @return self following the chaining method pattern
+ */
+ ValidatorContext messageInterpolator(MessageInterpolator messageInterpolator);
+
+ /**
+ * Defines the traversable resolver implementation used by the Validator.
+ * If unset, the traversable resolver of the ValidatorFactory is used.
+ *
+ * @return self following the chaining method pattern
+ */
+ ValidatorContext traversableResolver(TraversableResolver traversableResolver);
+
+ /**
+ * @return an initialized <code>Validator</code> instance respecting the
defined state.
+ * Validator instances can be pooled and shared by the implementation.
+ */
+ Validator getValidator();
+}
Property changes on:
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorContext.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java
===================================================================
---
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java 2009-01-27
01:13:37 UTC (rev 15823)
+++
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java 2009-01-27
01:29:23 UTC (rev 15824)
@@ -34,12 +34,12 @@
Validator getValidator();
/**
- * Define the validator state and return a
+ * Define the validator context and return a
* Validator compliant with this state
*
- * @return a ValidatorBuilder
+ * @return a ValidatorContext
*/
- ValidatorBuilder defineValidatorState();
+ ValidatorContext usingContext();
/**
* Returns the MessageInterpolator instance configured at initialization time
Show replies by date