Author: lukaszlenart
Date: Fri Jul 8 11:12:52 2011
New Revision: 1144259
URL: http://svn.apache.org/viewvc?rev=1144259&view=rev
Log:
WW-3545 - remove comments for JSON output
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java?rev=1144259&r1=1144258&r2=1144259&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
Fri Jul 8 11:12:52 2011
@@ -106,7 +106,7 @@ public class JSONValidationInterceptor e
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 e
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 e
}
}
- sb.append("} */");
+ sb.append("}");
/*response should be something like:
* {
* "errors": ["this", "that"],
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java?rev=1144259&r1=1144258&r2=1144259&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
Fri Jul 8 11:12:52 2011
@@ -21,32 +21,28 @@
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 org.apache.struts2.StrutsStatics;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.TestUtils;
-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 org.apache.struts2.StrutsStatics;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.TestUtils;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
+import org.apache.struts2.views.jsp.StrutsMockServletContext;
+
+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 JSONValidationInterceptorTe
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());
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt?rev=1144259&r1=1144258&r2=1144259&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/interceptor/validation/json-1.txt
Fri Jul 8 11:12:52 2011
@@ -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
