[hibernate-commits] Hibernate SVN: r15989 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine and 3 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Feb 17 08:16:07 EST 2009
Author: epbernard
Date: 2009-02-17 08:16:07 -0500 (Tue, 17 Feb 2009)
New Revision: 15989
Modified:
beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.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/ConstraintViolationImpl.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.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/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
Log:
BVAL-120 rename Rename ConstraintViolation getRawMessage=>getMessageTemplate, getInterpolatedMessage=>getMessage
Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.java
===================================================================
--- beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.java 2009-02-17 13:06:46 UTC (rev 15988)
+++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintViolation.java 2009-02-17 13:16:07 UTC (rev 15989)
@@ -32,12 +32,12 @@
/**
* @return The interpolated error message for this constraint violation.
*/
- String getInterpolatedMessage();
+ String getMessage();
/**
* @return The non-interpolated error message for this constraint violation.
*/
- String getRawMessage();
+ String getMessageTemplate();
/**
* @return The root bean being validated.
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-17 13:06:46 UTC (rev 15988)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintTree.java 2009-02-17 13:16:07 UTC (rev 15989)
@@ -117,14 +117,14 @@
&& getParent().getDescriptor().isReportAsSingleViolation();
}
- private <T> void createConstraintViolation(Object value, Class<T> beanClass, ExecutionContext<T> executionContext, Object leafBeanInstance, String message, ConstraintDescriptor descriptor) {
+ private <T> void createConstraintViolation(Object value, Class<T> beanClass, ExecutionContext<T> executionContext, Object leafBeanInstance, String messageTemplate, ConstraintDescriptor descriptor) {
String interpolatedMessage = executionContext.getMessageResolver().interpolate(
- message,
+ messageTemplate,
descriptor,
leafBeanInstance
);
ConstraintViolationImpl<T> failingConstraintViolation = new ConstraintViolationImpl<T>(
- message,
+ messageTemplate,
interpolatedMessage,
executionContext.getRootBean(),
beanClass,
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java 2009-02-17 13:06:46 UTC (rev 15988)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConstraintViolationImpl.java 2009-02-17 13:16:07 UTC (rev 15989)
@@ -38,10 +38,10 @@
private String rawMessage;
- public ConstraintViolationImpl(String rawMessage, String interpolatedMessage, T rootBean, Class<T> beanClass,
+ public ConstraintViolationImpl(String messageTemplate, String interpolatedMessage, T rootBean, Class<T> beanClass,
Object leafBeanInstance, Object value,
String propertyPath, Class<?> group, ConstraintDescriptor constraintDescriptor) {
- this.rawMessage = rawMessage;
+ this.rawMessage = messageTemplate;
this.interpolatedMessage = interpolatedMessage;
this.rootBean = rootBean;
this.beanClass = beanClass;
@@ -56,11 +56,11 @@
/**
* {@inheritDoc}
*/
- public String getInterpolatedMessage() {
+ public String getMessage() {
return interpolatedMessage;
}
- public String getRawMessage() {
+ public String getMessageTemplate() {
return rawMessage;
}
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-02-17 13:06:46 UTC (rev 15988)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2009-02-17 13:16:07 UTC (rev 15989)
@@ -108,7 +108,7 @@
Set<ConstraintViolation<Customer>> constraintViolations = validator.validate( customer );
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
ConstraintViolation<Customer> constraintViolation = constraintViolations.iterator().next();
- assertEquals( "Wrong message", "may not be null", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "may not be null", constraintViolation.getMessage() );
//FIXME nothing guarantee that a configuration can be reused
// now we modify the configuration, get a new factory and valiator and try again
@@ -128,7 +128,7 @@
constraintViolations = validator.validate( customer );
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
constraintViolation = constraintViolations.iterator().next();
- assertEquals( "Wrong message", "my custom message", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "my custom message", constraintViolation.getMessage() );
}
@Test
@@ -146,7 +146,7 @@
Set<ConstraintViolation<Customer>> constraintViolations = validator.validate( customer );
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
ConstraintViolation<Customer> constraintViolation = constraintViolations.iterator().next();
- assertEquals( "Wrong message", "may not be null", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "may not be null", constraintViolation.getMessage() );
// get a new factory using a custom configuration
configuration = Validation.byDefaultProvider().configure();
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-02-17 13:06:46 UTC (rev 15988)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ConstraintCompositionTest.java 2009-02-17 13:16:07 UTC (rev 15989)
@@ -60,7 +60,7 @@
constraintViolations = validator.validate( address );
assertNumberOfViolations( constraintViolations, 3 );
for ( ConstraintViolation violation : constraintViolations ) {
- if ( violation.getInterpolatedMessage().equals( "A french zip code has a length of 5" ) ) {
+ if ( violation.getMessage().equals( "A french zip code has a length of 5" ) ) {
assertConstraintViolation(
violation,
"A french zip code has a length of 5",
@@ -69,7 +69,7 @@
"zipCode"
);
}
- else if ( violation.getInterpolatedMessage().equals( "must match \"d*\"" ) ) {
+ else if ( violation.getMessage().equals( "must match \"d*\"" ) ) {
assertConstraintViolation(
violation,
"must match \"d*\"",
@@ -78,7 +78,7 @@
"zipCode"
);
}
- else if ( violation.getInterpolatedMessage().equals( "must match \".....\"" ) ) {
+ else if ( violation.getMessage().equals( "must match \".....\"" ) ) {
assertConstraintViolation(
violation,
"must match \".....\"",
@@ -97,7 +97,7 @@
constraintViolations = validator.validate( address );
assertNumberOfViolations( constraintViolations, 2 );
for ( ConstraintViolation violation : constraintViolations ) {
- if ( violation.getInterpolatedMessage().equals( "A french zip code has a length of 5" ) ) {
+ if ( violation.getMessage().equals( "A french zip code has a length of 5" ) ) {
assertConstraintViolation(
violation,
"A french zip code has a length of 5",
@@ -106,7 +106,7 @@
"zipCode"
);
}
- else if ( violation.getInterpolatedMessage().equals( "must match \".....\"" ) ) {
+ else if ( violation.getMessage().equals( "must match \".....\"" ) ) {
assertConstraintViolation(
violation,
"must match \".....\"",
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-02-17 13:06:46 UTC (rev 15988)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2009-02-17 13:16:07 UTC (rev 15989)
@@ -122,7 +122,7 @@
constraintViolations = validator.validate( book, First.class, Second.class, Last.class );
ConstraintViolation constraintViolation = constraintViolations.iterator().next();
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- assertEquals( "Wrong message", "may not be empty", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "may not be empty", constraintViolation.getMessage() );
assertEquals( "Wrong root entity", book, constraintViolation.getRootBean() );
assertEquals( "Wrong value", book.getTitle(), constraintViolation.getInvalidValue() );
assertEquals( "Wrong propertyName", "title", constraintViolation.getPropertyPath() );
@@ -133,7 +133,7 @@
constraintViolations = validator.validate( book, First.class, Second.class, Last.class );
constraintViolation = constraintViolations.iterator().next();
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- assertEquals( "Wrong message", "length must be between 0 and 30", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "length must be between 0 and 30", constraintViolation.getMessage() );
assertEquals( "Wrong root entity", book, constraintViolation.getRootBean() );
assertEquals( "Wrong value", book.getSubtitle(), constraintViolation.getInvalidValue() );
assertEquals( "Wrong propertyName", "subtitle", constraintViolation.getPropertyPath() );
@@ -144,7 +144,7 @@
constraintViolations = validator.validate( book, First.class, Second.class, Last.class );
constraintViolation = constraintViolations.iterator().next();
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- assertEquals( "Wrong message", "length must be between 0 and 20", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "length must be between 0 and 20", constraintViolation.getMessage() );
assertEquals( "Wrong root entity", book, constraintViolation.getRootBean() );
assertEquals( "Wrong value", author.getCompany(), constraintViolation.getInvalidValue() );
assertEquals( "Wrong propertyName", "author.company", constraintViolation.getPropertyPath() );
@@ -174,7 +174,7 @@
constraintViolations = validator.validate( book, Default.class );
ConstraintViolation constraintViolation = constraintViolations.iterator().next();
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- assertEquals( "Wrong message", "may not be null", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "may not be null", constraintViolation.getMessage() );
assertEquals( "Wrong root entity", book, constraintViolation.getRootBean() );
assertEquals( "Wrong value", book.getTitle(), constraintViolation.getInvalidValue() );
assertEquals( "Wrong propertyName", "title", constraintViolation.getPropertyPath() );
@@ -315,7 +315,7 @@
constraintViolations = validator.validate( customer );
ConstraintViolation constraintViolation = constraintViolations.iterator().next();
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- assertEquals( "Wrong message", "may not be null", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "may not be null", constraintViolation.getMessage() );
assertEquals( "Wrong root entity", customer, constraintViolation.getRootBean() );
assertEquals( "Wrong value", order1.getOrderNumber(), constraintViolation.getInvalidValue() );
assertEquals( "Wrong propertyName", "orderList[0].orderNumber", constraintViolation.getPropertyPath() );
@@ -361,7 +361,7 @@
Set<ConstraintViolation<Actor>> constraintViolations = validator.validate( clint );
ConstraintViolation constraintViolation = constraintViolations.iterator().next();
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- assertEquals( "Wrong message", "may not be empty", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "may not be empty", constraintViolation.getMessage() );
assertEquals( "Wrong root entity", clint, constraintViolation.getRootBean() );
assertEquals( "Wrong value", morgan.getLastName(), constraintViolation.getInvalidValue() );
assertEquals( "Wrong propertyName", "playedWith[0].playedWith[1].lastName", constraintViolation.getPropertyPath() );
@@ -380,7 +380,7 @@
ConstraintViolation constraintViolation = constraintViolations.iterator().next();
assertEquals( "Wrong number of constraints", 1, constraintViolations.size() );
- assertEquals( "Wrong message", "may not be null", constraintViolation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", "may not be null", constraintViolation.getMessage() );
assertEquals( "Wrong root entity", null, constraintViolation.getRootBean() );
assertEquals( "Wrong value", order.getOrderNumber(), constraintViolation.getInvalidValue() );
assertEquals( "Wrong propertyName", "orderList[0].orderNumber", constraintViolation.getPropertyPath() );
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-17 13:06:46 UTC (rev 15988)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-02-17 13:16:07 UTC (rev 15989)
@@ -85,7 +85,7 @@
}
public static void assertConstraintViolation(ConstraintViolation violation, String message) {
- assertEquals( "Wrong message", message, violation.getInterpolatedMessage() );
+ assertEquals( "Wrong message", message, violation.getMessage() );
}
public static void assertNumberOfViolations(Set violations, int expectedViolations) {
More information about the hibernate-commits
mailing list