From 9842ae0cd9d7df2e2c56a755583bc3956e6ba5e9 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 8 Jul 2011 11:12:52 +0000
Subject: [PATCH] WW-3545 - remove comments for JSON output

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1144259 13f79535-47bb-0310-9956-ffa450edef68
---
 .../validation/JSONValidationInterceptor.java |  6 ++--
 .../JSONValidationInterceptorTest.java        | 36 +++++++++----------
 .../struts2/interceptor/validation/json-1.txt |  4 +--
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
index 1d1bec4d1..5a0a0635d 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
@@ -106,7 +106,7 @@ public class JSONValidationInterceptor extends MethodFilterInterceptor {
             if (isValidateOnly(request)) {
                 //there were no errors
                 setupEncoding(response, request);
-                response.getWriter().print("/* {} */");
+                response.getWriter().print("{}");
                 response.setContentType("application/json");
                 return Action.NONE;
             } else {
@@ -159,7 +159,7 @@ public class JSONValidationInterceptor extends MethodFilterInterceptor {
     protected String buildResponse(ValidationAware validationAware) {
         //should we use FreeMarker here?
         StringBuilder sb = new StringBuilder();
-        sb.append("/* { ");
+        sb.append("{ ");
 
         if (validationAware.hasErrors()) {
             //action errors
@@ -192,7 +192,7 @@ public class JSONValidationInterceptor extends MethodFilterInterceptor {
             }
         }
 
-        sb.append("} */");
+        sb.append("}");
         /*response should be something like:
          * {
          *      "errors": ["this", "that"],
diff --git a/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
index e7d5e3924..07e82bbdf 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
@@ -21,13 +21,16 @@
 
 package org.apache.struts2.interceptor.validation;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import com.opensymphony.xwork2.mock.MockActionProxy;
+import com.opensymphony.xwork2.validator.annotations.EmailValidator;
+import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
+import com.opensymphony.xwork2.validator.annotations.Validation;
 import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.StrutsTestCase;
 import org.apache.struts2.TestUtils;
@@ -35,18 +38,11 @@ import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
 import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
 import org.apache.struts2.views.jsp.StrutsMockServletContext;
 
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.mock.MockActionInvocation;
-import com.opensymphony.xwork2.mock.MockActionProxy;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.annotations.EmailValidator;
-import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
-import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
-import com.opensymphony.xwork2.validator.annotations.Validation;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
 
 public class JSONValidationInterceptorTest extends StrutsTestCase {
     private MockActionInvocation invocation;
@@ -121,7 +117,7 @@ public class JSONValidationInterceptorTest extends StrutsTestCase {
         String json = stringWriter.toString();
 
         String normalizedActual = TestUtils.normalize(json, true);
-        assertEquals("/*{}*/", normalizedActual);
+        assertEquals("{}", normalizedActual);
         assertFalse(action.isExecuted());
         assertEquals("application/json", response.getContentType());
         assertEquals("UTF-8", response.getCharacterEncoding());
diff --git a/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt b/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
index cb7a4ee3a..826aa5527 100644
--- a/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
+++ b/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
@@ -1,4 +1,4 @@
-/* {
+{
    "errors": [
         "General error"
    ],
@@ -9,4 +9,4 @@
 			"This is no email"
 		]
    } 
-} */
\ No newline at end of file
+}
\ No newline at end of file