SLING-7006 - omit change log from post response on error
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1801663 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java b/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java
index 37b2e85..9fd204f 100644
--- a/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java
+++ b/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java
@@ -113,7 +113,11 @@
// get changelog
changes.insert(0, "<pre>");
changes.append("</pre>");
- setProperty(PN_CHANGE_LOG, changes.toString());
+ if (getError() == null) {
+ setProperty(PN_CHANGE_LOG, changes.toString());
+ } else {
+ setProperty(PN_CHANGE_LOG, "");
+ }
Writer out = response.getWriter();
diff --git a/src/main/java/org/apache/sling/servlets/post/JSONResponse.java b/src/main/java/org/apache/sling/servlets/post/JSONResponse.java
index b6e841e..e65e90c 100644
--- a/src/main/java/org/apache/sling/servlets/post/JSONResponse.java
+++ b/src/main/java/org/apache/sling/servlets/post/JSONResponse.java
@@ -116,28 +116,28 @@
.add("message", error.getMessage()));
}
JsonArrayBuilder changesBuilder = Json.createArrayBuilder();
- for (Map<String, Object> entry : changes) {
- JsonObjectBuilder entryBuilder = Json.createObjectBuilder();
- entryBuilder.add(PROP_TYPE, (String) entry.get(PROP_TYPE));
-
- Object arguments = entry.get(PROP_ARGUMENT);
-
- if (arguments != null) {
- if (arguments instanceof List) {
- JsonArrayBuilder argumentsBuilder = Json.createArrayBuilder();
-
- for (String argument : ((List<String>) arguments))
- {
- argumentsBuilder.add(argument);
+ if (this.error == null) {
+ for (Map<String, Object> entry : changes) {
+ JsonObjectBuilder entryBuilder = Json.createObjectBuilder();
+ entryBuilder.add(PROP_TYPE, (String) entry.get(PROP_TYPE));
+
+ Object arguments = entry.get(PROP_ARGUMENT);
+
+ if (arguments != null) {
+ if (arguments instanceof List) {
+ JsonArrayBuilder argumentsBuilder = Json.createArrayBuilder();
+
+ for (String argument : ((List<String>) arguments)) {
+ argumentsBuilder.add(argument);
+ }
+
+ entryBuilder.add(PROP_ARGUMENT, argumentsBuilder);
+ } else {
+ entryBuilder.add(PROP_ARGUMENT, (String) arguments);
}
-
- entryBuilder.add(PROP_ARGUMENT, argumentsBuilder);
}
- else {
- entryBuilder.add(PROP_ARGUMENT, (String) arguments);
- }
+ changesBuilder.add(entryBuilder);
}
- changesBuilder.add(entryBuilder);
}
jsonBuilder.add(PROP_CHANGES, changesBuilder);
return jsonBuilder.build();
diff --git a/src/test/java/org/apache/sling/servlets/post/HtmlResponseTest.java b/src/test/java/org/apache/sling/servlets/post/HtmlResponseTest.java
new file mode 100644
index 0000000..c952834
--- /dev/null
+++ b/src/test/java/org/apache/sling/servlets/post/HtmlResponseTest.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.servlets.post;
+
+import org.apache.sling.commons.testing.sling.MockSlingHttpServletResponse;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.json.JsonObject;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.junit.Assert.*;
+
+public class HtmlResponseTest {
+ protected HtmlResponse res;
+
+ @Before
+ public void setUp() throws Exception {
+ res = new HtmlResponse();
+ res.setReferer("");
+ }
+
+ @Test
+ public void testNoChangesOnError() throws Exception {
+ res.onChange("modified", "argument1");
+ res.setError(new Exception("some exception"));
+ final StringWriter stringWriter = new StringWriter();
+ MockSlingHttpServletResponse response = new MockSlingHttpServletResponse() {
+ @Override
+ public PrintWriter getWriter() throws IOException {
+ return new PrintWriter(stringWriter);
+ }
+ };
+ res.doSend(response);
+ String output = stringWriter.toString();
+ assertTrue(output.contains("<div id=\"ChangeLog\"></div>"));
+ }
+
+ @Test
+ public void testChangesOnNoError() throws Exception {
+ res.onChange("modified", "argument1");
+ final StringWriter stringWriter = new StringWriter();
+ MockSlingHttpServletResponse response = new MockSlingHttpServletResponse() {
+ @Override
+ public PrintWriter getWriter() throws IOException {
+ return new PrintWriter(stringWriter);
+ }
+ };
+ res.doSend(response);
+ String output = stringWriter.toString();
+ assertTrue(output.contains("<div id=\"ChangeLog\"><pre>modified("argument1");<br/></pre></div>"));
+ }
+}
diff --git a/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java b/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java
index 02c0877..d591628 100644
--- a/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java
+++ b/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java
@@ -107,6 +107,14 @@
}
}
+ public void testNoChangesOnError() throws Exception {
+ res.onChange("modified", "argument1");
+ res.setError(new Exception("some exception"));
+ JsonObject obj = res.getJson();
+ assertTrue(obj.containsKey("changes"));
+ assertEquals(0, obj.getJsonArray("changes").size());
+ }
+
private static JsonValue assertProperty(JsonObject obj, String key) {
assertTrue("JSON object does not have property " + key, obj.containsKey(key));
return obj.get(key);
