[hibernate-commits] Hibernate SVN: r17549 - in validator/trunk: hibernate-validator/src/main/java/org/hibernate/validator/engine and 3 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Sep 25 09:23:41 EDT 2009
Author: hardy.ferentschik
Date: 2009-09-25 09:23:40 -0400 (Fri, 25 Sep 2009)
New Revision: 17549
Added:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidatorConfiguration.java
Removed:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java
Modified:
validator/trunk/hibernate-validator-archetype/src/test/java/org/hibernate/validator/quickstart/BootstrapTest.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/ValidationTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/TestUtil.java
Log:
HV-239
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidator.java 2009-09-25 13:16:48 UTC (rev 17548)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidator.java 2009-09-25 13:23:40 UTC (rev 17549)
@@ -24,7 +24,7 @@
import javax.validation.spi.ValidationProvider;
import org.hibernate.validator.engine.ConfigurationImpl;
-import org.hibernate.validator.engine.ValidatorConfiguration;
+import org.hibernate.validator.HibernateValidatorConfiguration;
import org.hibernate.validator.engine.ValidatorFactoryImpl;
/**
@@ -33,10 +33,10 @@
* @author Emmanuel Bernard
* @author Hardy Ferentschik
*/
-public class HibernateValidator implements ValidationProvider<ValidatorConfiguration> {
+public class HibernateValidator implements ValidationProvider<HibernateValidatorConfiguration> {
- public ValidatorConfiguration createSpecializedConfiguration(BootstrapState state) {
- return ValidatorConfiguration.class.cast( new ConfigurationImpl( this ) );
+ public HibernateValidatorConfiguration createSpecializedConfiguration(BootstrapState state) {
+ return HibernateValidatorConfiguration.class.cast( new ConfigurationImpl( this ) );
}
public Configuration<?> createGenericConfiguration(BootstrapState state) {
Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidatorConfiguration.java (from rev 17505, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java)
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidatorConfiguration.java (rev 0)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidatorConfiguration.java 2009-09-25 13:23:40 UTC (rev 17549)
@@ -0,0 +1,12 @@
+package org.hibernate.validator;
+
+import javax.validation.Configuration;
+
+/**
+ * Uniquely identify Hibernate Validator in the Bean Validation bootstrap strategy
+ * Also contains Hibernate Validator specific configurations
+ *
+ * @author Emmanuel Bernard
+ */
+public interface HibernateValidatorConfiguration extends Configuration<HibernateValidatorConfiguration> {
+}
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/HibernateValidatorConfiguration.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java 2009-09-25 13:16:48 UTC (rev 17548)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java 2009-09-25 13:23:40 UTC (rev 17549)
@@ -38,6 +38,7 @@
import org.hibernate.validator.util.Version;
import org.hibernate.validator.xml.ValidationBootstrapParameters;
import org.hibernate.validator.xml.ValidationXmlParser;
+import org.hibernate.validator.HibernateValidatorConfiguration;
/**
* Hibernate specific <code>Configuration</code> implementation.
@@ -45,7 +46,7 @@
* @author Emmanuel Bernard
* @author Hardy Ferentschik
*/
-public class ConfigurationImpl implements ValidatorConfiguration, ConfigurationState {
+public class ConfigurationImpl implements HibernateValidatorConfiguration, ConfigurationState {
static {
Version.touch();
@@ -80,7 +81,7 @@
validationBootstrapParameters.provider = provider;
}
- public ValidatorConfiguration ignoreXmlConfiguration() {
+ public HibernateValidatorConfiguration ignoreXmlConfiguration() {
ignoreXmlConfiguration = true;
return this;
}
@@ -100,12 +101,12 @@
return this;
}
- public ValidatorConfiguration addMapping(InputStream stream) {
+ public HibernateValidatorConfiguration addMapping(InputStream stream) {
validationBootstrapParameters.mappings.add( stream );
return this;
}
- public ValidatorConfiguration addProperty(String name, String value) {
+ public HibernateValidatorConfiguration addProperty(String name, String value) {
if ( value != null ) {
validationBootstrapParameters.configProperties.put( name, value );
}
Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java 2009-09-25 13:16:48 UTC (rev 17548)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorConfiguration.java 2009-09-25 13:23:40 UTC (rev 17549)
@@ -1,12 +0,0 @@
-package org.hibernate.validator.engine;
-
-import javax.validation.Configuration;
-
-/**
- * Uniquely identify Hibernate Validator in the Bean Validation bootstrap strategy
- * Also contains Hibernate Validator specific configurations
- *
- * @author Emmanuel Bernard
- */
-public interface ValidatorConfiguration extends Configuration<ValidatorConfiguration> {
-}
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/ValidationTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/ValidationTest.java 2009-09-25 13:16:48 UTC (rev 17548)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/bootstrap/ValidationTest.java 2009-09-25 13:23:40 UTC (rev 17549)
@@ -35,7 +35,7 @@
import org.hibernate.validator.constraints.impl.NotNullValidator;
import org.hibernate.validator.engine.ConfigurationImpl;
import org.hibernate.validator.engine.ConstraintValidatorFactoryImpl;
-import org.hibernate.validator.engine.ValidatorConfiguration;
+import org.hibernate.validator.HibernateValidatorConfiguration;
import org.hibernate.validator.engine.ValidatorFactoryImpl;
import org.hibernate.validator.HibernateValidator;
@@ -48,7 +48,7 @@
@Test
public void testBootstrapAsServiceWithBuilder() {
- ValidatorConfiguration configuration = Validation
+ HibernateValidatorConfiguration configuration = Validation
.byProvider( HibernateValidator.class )
.configure();
assertDefaultBuilderAndFactory( configuration );
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/TestUtil.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/TestUtil.java 2009-09-25 13:16:48 UTC (rev 17548)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/TestUtil.java 2009-09-25 13:23:40 UTC (rev 17549)
@@ -37,7 +37,7 @@
import static org.testng.FileAssert.fail;
import org.hibernate.validator.HibernateValidator;
-import org.hibernate.validator.engine.ValidatorConfiguration;
+import org.hibernate.validator.HibernateValidatorConfiguration;
import org.hibernate.validator.engine.PathImpl;
/**
@@ -55,7 +55,7 @@
public static Validator getValidator() {
if ( hibernateValidator == null ) {
- ValidatorConfiguration configuration = Validation
+ HibernateValidatorConfiguration configuration = Validation
.byProvider( HibernateValidator.class )
.configure();
hibernateValidator = configuration.buildValidatorFactory().getValidator();
@@ -73,7 +73,7 @@
public static Validator getValidatorWithCustomConfiguration(String path) {
Thread.currentThread().setContextClassLoader( new CustomValidationXmlClassLoader( path ) );
- ValidatorConfiguration configuration = Validation
+ HibernateValidatorConfiguration configuration = Validation
.byProvider( HibernateValidator.class )
.configure();
return configuration.buildValidatorFactory().getValidator();
@@ -85,7 +85,7 @@
public static Validator getValidatorIgnoringValidationXml() {
Thread.currentThread().setContextClassLoader( new IgnoringValidationXmlClassLoader() );
- ValidatorConfiguration configuration = Validation
+ HibernateValidatorConfiguration configuration = Validation
.byProvider( HibernateValidator.class )
.configure();
return configuration.buildValidatorFactory().getValidator();
Modified: validator/trunk/hibernate-validator-archetype/src/test/java/org/hibernate/validator/quickstart/BootstrapTest.java
===================================================================
--- validator/trunk/hibernate-validator-archetype/src/test/java/org/hibernate/validator/quickstart/BootstrapTest.java 2009-09-25 13:16:48 UTC (rev 17548)
+++ validator/trunk/hibernate-validator-archetype/src/test/java/org/hibernate/validator/quickstart/BootstrapTest.java 2009-09-25 13:23:40 UTC (rev 17549)
@@ -32,7 +32,7 @@
import org.junit.Test;
import org.hibernate.validator.HibernateValidator;
-import org.hibernate.validator.engine.ValidatorConfiguration;
+import org.hibernate.validator.HibernateValidatorConfiguration;
/**
* A module test that shows the different bootstrap possibilities of Hibernate Validator.
@@ -64,7 +64,7 @@
@Test
public void testByProvider() {
- ValidatorConfiguration config = Validation.byProvider( HibernateValidator.class ).configure();
+ HibernateValidatorConfiguration config = Validation.byProvider( HibernateValidator.class ).configure();
config.messageInterpolator( new MyMessageInterpolator() )
.traversableResolver( new MyTraversableResolver() )
.constraintValidatorFactory( new MyConstraintValidatorFactory() );
More information about the hibernate-commits
mailing list