For builder bug in #60 no longer trying to build a default message when

the user explicitly specifies a message code. Just echoing the provided message code as the default message instead.
SpringJutsu · May 25, 2014 · ae23c88 · ae23c88
1 parent ca0e803
commit ae23c88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/validation/src/main/java/org/springjutsu/validation/ValidationErrorMessageHandler.java b/validation/src/main/java/org/springjutsu/validation/ValidationErrorMessageHandler.java
@@ -94,7 +94,7 @@ protected void logError(ValidationEvaluationContext context, ValidationRule rule
                 errorMessageKey = (errorMessagePrefix != null  && !errorMessagePrefix.isEmpty() ? errorMessagePrefix + "." : "") + rule.getType();
         }
 
-		String defaultError =  localizedRulePath + " " + rule.getType();
+		String defaultError = rule.getMessage() != null && !rule.getMessage().isEmpty() ? rule.getMessage() : localizedRulePath + " " + rule.getType();
 		String modelMessageKey = getMessageResolver(context, rule, true);
         String ruleArg = getMessageResolver(context, rule, false);
 

diff --git a/.../src/test/java/org/springjutsu/validation/ValidationJavaConfigurationIntegrationTest.java b/.../src/test/java/org/springjutsu/validation/ValidationJavaConfigurationIntegrationTest.java
@@ -14,7 +14,6 @@
 import org.springjutsu.validation.rules.ValidationEntity;
 import org.springjutsu.validation.test.entities.Address;
 import org.springjutsu.validation.test.entities.Customer;
-import org.springjutsu.validation.util.ValidationRulesUtils;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes=ValidationJavaConfigurationIntegrationTestConfig.class)
@@ -28,8 +27,7 @@ public void testSimpleCase() {
 		Customer customer = new Customer();
 		Errors errors = validationManager.validate(customer);
 		Assert.assertEquals(1, errors.getErrorCount());
-		Assert.assertEquals("favoriteColor required", errors.getFieldErrors("favoriteColor").get(0).getDefaultMessage());
-
+		Assert.assertEquals("favoriteColor.required", errors.getFieldErrors("favoriteColor").get(0).getDefaultMessage());
 	}
 
 	@Test
@@ -38,7 +36,7 @@ public void testWithContext()
 		Customer customer = new Customer();
 		Errors errors = validationManager.validate(customer, "dave");
 		Assert.assertEquals(4, errors.getErrorCount());
-		Assert.assertEquals("errors.required", errors.getFieldErrors("favoriteColor").get(0).getCode());
+		Assert.assertEquals("favoriteColor.required", errors.getFieldErrors("favoriteColor").get(0).getCode());
 		Assert.assertEquals("blam", errors.getFieldErrors("firstName").get(0).getCode());
 		Assert.assertEquals("dizzam", errors.getFieldErrors("lastName").get(0).getCode());
 		Assert.assertEquals("doh", errors.getFieldErrors("address").get(0).getCode());
@@ -63,7 +61,7 @@ class ValidationJavaConfigurationIntegrationTestConfig
 	ValidationEntity personValidation()
 	{
 		return Validation.forEntity(Customer.class)
-				.havingRules(Validation.rule("favoriteColor", "required", new RequiredRuleExecutor()))
+				.havingRules(Validation.rule("favoriteColor", "favoriteColor.required", new RequiredRuleExecutor()))
 				.havingValidationContexts(Validation.context("group", "dave")
 					.havingRules(
 							Validation.rule("firstName", "required").withMessage("blam"),

diff --git a/...dation/src/test/resources/org/springjutsu/validation/integration/test-messages.properties b/...dation/src/test/resources/org/springjutsu/validation/integration/test-messages.properties
@@ -11,3 +11,5 @@ testCustom.errors.matches={0} must match {1}
 testCustom.errors.minLength={0} must be at least {1} characters long
 
 valuedCustomer.lastName=Most Valuable Last Name
+
+favoriteColor.required=How can you not have a favorite color?
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,5 @@ testCustom.errors.matches={0} must match {1}
		testCustom.errors.minLength={0} must be at least {1} characters long

		valuedCustomer.lastName=Most Valuable Last Name

		favoriteColor.required=How can you not have a favorite color?