You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/06/01 21:52:32 UTC
svn commit: r1797279 - in
/sling/trunk/bundles/extensions/validation/test-services: pom.xml
src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponse.java
Author: pauls
Date: Thu Jun 1 21:52:32 2017
New Revision: 1797279
URL: http://svn.apache.org/viewvc?rev=1797279&view=rev
Log:
SLING-6913: Remove commons.json from validation/test-services
Modified:
sling/trunk/bundles/extensions/validation/test-services/pom.xml
sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponse.java
Modified: sling/trunk/bundles/extensions/validation/test-services/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/test-services/pom.xml?rev=1797279&r1=1797278&r2=1797279&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/test-services/pom.xml (original)
+++ sling/trunk/bundles/extensions/validation/test-services/pom.xml Thu Jun 1 21:52:32 2017
@@ -47,6 +47,9 @@
<configuration>
<instructions>
<Sling-Initial-Content>SLING-CONTENT/apps/sling/validation;overwrite:=true;path:=/apps/sling/validation</Sling-Initial-Content>
+ <Embed-Dependency>
+ org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -100,14 +103,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.6</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.9.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponse.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponse.java?rev=1797279&r1=1797278&r2=1797279&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponse.java (original)
+++ sling/trunk/bundles/extensions/validation/test-services/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponse.java Thu Jun 1 21:52:32 2017
@@ -25,9 +25,7 @@ import java.util.ResourceBundle;
import javax.annotation.Nonnull;
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.felix.utils.json.JSONWriter;
import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.validation.ValidationFailure;
import org.apache.sling.validation.ValidationResult;
@@ -52,27 +50,28 @@ public class ValidationPostResponse exte
protected void doSend(HttpServletResponse response) throws IOException {
response.setContentType("application/json");
PrintWriter printWriter = response.getWriter();
- JSONObject jsonResponse = new JSONObject();
+ JSONWriter writer = new JSONWriter(printWriter);
+ writer.object();
boolean validationError = false;
if (validationResult != null) {
try {
- jsonResponse.put("valid", validationResult.isValid());
- JSONArray failures = new JSONArray();
+ writer.key("valid").value(validationResult.isValid());
+ writer.key("failures").array();
for (ValidationFailure failure : validationResult.getFailures()) {
- JSONObject failureJson = new JSONObject();
- failureJson.put("message", failure.getMessage(resourceBundle));
- failureJson.put("location", failure.getLocation());
- failureJson.put("severity", failure.getSeverity());
- failures.put(failureJson);
+ writer.object();
+ writer.key("message").value(failure.getMessage(resourceBundle));
+ writer.key("location").value(failure.getLocation());
+ writer.key("severity").value(failure.getSeverity());
+ writer.endObject();
}
- jsonResponse.put("failures", failures);
- } catch (JSONException e) {
+ writer.endArray();
+ } catch (IOException e) {
LOG.error("JSON error during response send operation.", e);
}
} else {
validationError = true;
}
- printWriter.write(jsonResponse.toString());
+ writer.endObject();
if (validationError) {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
}