SLING-5026 - refactor validator interface to allow to set multiple failure messages
This closes #117
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1720802 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java b/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
index a5977b6..f589df9 100644
--- a/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
+++ b/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
@@ -16,11 +16,8 @@
*/
package org.apache.sling.models.validation;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.apache.commons.lang.StringUtils;
import org.apache.sling.models.factory.InvalidModelException;
+import org.apache.sling.validation.ValidationFailure;
import org.apache.sling.validation.ValidationResult;
/**
@@ -61,8 +58,8 @@
public String getMessage() {
StringBuilder builder = new StringBuilder("Validation errors for ");
builder.append("'" + path +"':");
- for (Entry<String, List<String>> entry : result.getFailureMessages().entrySet()) {
- builder.append("\n" + entry.getKey() + ":" + StringUtils.join(entry.getValue(), "\n\t"));
+ for (ValidationFailure failure : result.getFailures()) {
+ builder.append("\n" + failure.getLocation() + ":" + failure.getMessage() + "\n\t");
}
return builder.toString();
}
