Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 12F74200D41 for ; Tue, 7 Nov 2017 11:24:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1198A160C11; Tue, 7 Nov 2017 10:24:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5E60B160BED for ; Tue, 7 Nov 2017 11:24:28 +0100 (CET) Received: (qmail 37163 invoked by uid 500); 7 Nov 2017 10:24:27 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 36769 invoked by uid 99); 7 Nov 2017 10:24:26 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2017 10:24:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D717A87C99; Tue, 7 Nov 2017 10:24:25 +0000 (UTC) Date: Tue, 07 Nov 2017 10:24:38 +0000 To: "commits@sling.apache.org" Subject: [sling-org-apache-sling-validation-test-services] 13/33: SLING-5026 - refactor validator interface to allow to set multiple failure messages MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: rombert@apache.org In-Reply-To: <151005026520.18680.6998926212296366621@gitbox.apache.org> References: <151005026520.18680.6998926212296366621@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: sling-org-apache-sling-validation-test-services X-Git-Refname: refs/tags/org.apache.sling.validation.test-services-1.0.0 X-Git-Reftype: annotated tag X-Git-Rev: 0a324bc101a5b977696f6f88c14a51c14f888a75 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171107102425.D717A87C99@gitbox.apache.org> archived-at: Tue, 07 Nov 2017 10:24:29 -0000 This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.validation.test-services-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git commit 0a324bc101a5b977696f6f88c14a51c14f888a75 Author: Konrad Windszus AuthorDate: Fri Dec 18 14:50:39 2015 +0000 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/bundles/extensions/validation/test-services@1720802 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/validation/testservices/ValidationPostResponse.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java index f535c15..4b71762 100644 --- a/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java +++ b/src/main/java/org/apache/sling/validation/testservices/ValidationPostResponse.java @@ -25,9 +25,11 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; +import org.apache.sling.commons.json.JSONArray; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; import org.apache.sling.servlets.post.AbstractPostResponse; +import org.apache.sling.validation.ValidationFailure; import org.apache.sling.validation.ValidationResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,9 +52,14 @@ public class ValidationPostResponse extends AbstractPostResponse { if (validationResult != null) { try { jsonResponse.put("valid", validationResult.isValid()); - for (Map.Entry> entry : validationResult.getFailureMessages().entrySet()) { - jsonResponse.put(entry.getKey(), entry.getValue()); + JSONArray failures = new JSONArray(); + for (ValidationFailure failure : validationResult.getFailures()) { + JSONObject failureJson = new JSONObject(); + failureJson.put("message", failure.getMessage()); + failureJson.put("location", failure.getLocation()); + failures.put(failureJson); } + jsonResponse.put("failures", failures); } catch (JSONException e) { LOG.error("JSON error during response send operation.", e); } -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" .