fixed SpringValidatorAdapter regression to return correct error codes for class-level constraints (SPR-8958)

Author: jhoeller

org.springframework.context/src/main/java/org/springframework/validation/AbstractBindingResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,13 +120,6 @@ public void addAllErrors(Errors errors) {
 		this.errors.addAll(errors.getAllErrors());
 	}
 
-	/**
-	 * Resolve the given error code into message codes.
-	 * Calls the MessageCodesResolver with appropriate parameters.
-	 * @param errorCode the error code to resolve into message codes
-	 * @return the resolved message codes
-	 * @see #setMessageCodesResolver
-	 */
 	public String[] resolveMessageCodes(String errorCode) {
 		return getMessageCodesResolver().resolveMessageCodes(errorCode, getObjectName());
 	}

org.springframework.context/src/main/java/org/springframework/validation/BindException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -220,6 +220,10 @@ public void addError(ObjectError error) {
 		this.bindingResult.addError(error);
 	}
 
+	public String[] resolveMessageCodes(String errorCode) {
+		return this.bindingResult.resolveMessageCodes(errorCode);
+	}
+
 	public String[] resolveMessageCodes(String errorCode, String field) {
 		return this.bindingResult.resolveMessageCodes(errorCode, field);
 	}

org.springframework.context/src/main/java/org/springframework/validation/BindingResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,6 +112,14 @@ public interface BindingResult extends Errors {
 	 */
 	void addError(ObjectError error);
 
+	/**
+	 * Resolve the given error code into message codes.
+	 * <p>Calls the configured {@link MessageCodesResolver} with appropriate parameters.
+	 * @param errorCode the error code to resolve into message codes
+	 * @return the resolved message codes
+	 */
+	String[] resolveMessageCodes(String errorCode);
+
 	/**
 	 * Resolve the given error code into message codes for the given field.
 	 * <p>Calls the configured {@link MessageCodesResolver} with appropriate parameters.

org.springframework.context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,24 +119,23 @@ protected void processConstraintViolations(Set<ConstraintViolation<Object>> viol
 						// can do custom FieldError registration with invalid value from ConstraintViolation,
 						// as necessary for Hibernate Validator compatibility (non-indexed set path in field)
 						BindingResult bindingResult = (BindingResult) errors;
-						String[] errorCodes = bindingResult.resolveMessageCodes(errorCode, field);
 						String nestedField = bindingResult.getNestedPath() + field;
-						ObjectError error;
 						if ("".equals(nestedField)) {
-							error = new ObjectError(
-									errors.getObjectName(), errorCodes, errorArgs, violation.getMessage());
+							String[] errorCodes = bindingResult.resolveMessageCodes(errorCode);
+							bindingResult.addError(new ObjectError(
+									errors.getObjectName(), errorCodes, errorArgs, violation.getMessage()));
 						}
 						else {
 							Object invalidValue = violation.getInvalidValue();
 							if (!"".equals(field) && invalidValue == violation.getLeafBean()) {
 								// bean constraint with property path: retrieve the actual property value
 								invalidValue = bindingResult.getRawFieldValue(field);
 							}
-							error = new FieldError(
+							String[] errorCodes = bindingResult.resolveMessageCodes(errorCode, field);
+							bindingResult.addError(new FieldError(
 									errors.getObjectName(), nestedField, invalidValue, false,
-									errorCodes, errorArgs, violation.getMessage());
+									errorCodes, errorArgs, violation.getMessage()));
 						}
-						bindingResult.addError(error);
 					}
 					else {
 						// got no BindingResult - can only do standard rejectValue call

org.springframework.context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,11 +110,22 @@ public void testSpringValidation() throws Exception {
 		assertEquals(2, result.getErrorCount());
 		FieldError fieldError = result.getFieldError("name");
 		assertEquals("name", fieldError.getField());
-		System.out.println(Arrays.asList(fieldError.getCodes()));
+		List<String> errorCodes = Arrays.asList(fieldError.getCodes());
+		assertEquals(4, errorCodes.size());
+		assertTrue(errorCodes.contains("NotNull.person.name"));
+		assertTrue(errorCodes.contains("NotNull.name"));
+		assertTrue(errorCodes.contains("NotNull.java.lang.String"));
+		assertTrue(errorCodes.contains("NotNull"));
 		System.out.println(fieldError.getDefaultMessage());
 		fieldError = result.getFieldError("address.street");
 		assertEquals("address.street", fieldError.getField());
-		System.out.println(Arrays.asList(fieldError.getCodes()));
+		errorCodes = Arrays.asList(fieldError.getCodes());
+		assertEquals(5, errorCodes.size());
+		assertTrue(errorCodes.contains("NotNull.person.address.street"));
+		assertTrue(errorCodes.contains("NotNull.address.street"));
+		assertTrue(errorCodes.contains("NotNull.street"));
+		assertTrue(errorCodes.contains("NotNull.java.lang.String"));
+		assertTrue(errorCodes.contains("NotNull"));
 		System.out.println(fieldError.getDefaultMessage());
 	}
 
@@ -129,7 +140,10 @@ public void testSpringValidationWithClassLevel() throws Exception {
 		validator.validate(person, result);
 		assertEquals(1, result.getErrorCount());
 		ObjectError globalError = result.getGlobalError();
-		System.out.println(Arrays.asList(globalError.getCodes()));
+		List<String> errorCodes = Arrays.asList(globalError.getCodes());
+		assertEquals(2, errorCodes.size());
+		assertTrue(errorCodes.contains("NameAddressValid.person"));
+		assertTrue(errorCodes.contains("NameAddressValid"));
 		System.out.println(globalError.getDefaultMessage());
 	}