svn commit: r649878 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/interceptor/validation/ test/java/org/apache/struts2/interceptor/validation/ test/java/org/apache/struts2/views/jsp/

[mrdon]

Author: mrdon
Date: Sat Apr 19 20:38:49 2008
New Revision: 649878

URL: http://svn.apache.org/viewvc?rev=649878&view=rev
Log:
Adding correct response type for json validation
WW-2571

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/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java

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=649878&r1=649877&r2=649878&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
 Sat Apr 19 20:38:49 2008
@@ -98,6 +98,7 @@
                     if (validationFailedStatus >= 0)
                         response.setStatus(validationFailedStatus);
                     response.getWriter().print(buildResponse(validationAware));
+                    response.setContentType("application/json");
                     return Action.NONE;
                 }
             }
@@ -106,6 +107,7 @@
             if (validateOnly != null && "true".equals(validateOnly)) {
                 //there were no errors
                 response.getWriter().print("/* {} */");
+                response.setContentType("application/json");
                 return Action.NONE;
             } else {
                 return invocation.invoke();

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=649878&r1=649877&r2=649878&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
 Sat Apr 19 20:38:49 2008
@@ -78,6 +78,8 @@
         assertFalse(action.isExecuted());
         //http status
         assertEquals(HttpServletResponse.SC_BAD_REQUEST, response.getStatus());
+        assertEquals("application/json", response.getContentType());
+
     }
 
     public void testValidationSucceeds() throws Exception {
@@ -119,6 +121,7 @@
         String normalizedActual = TestUtils.normalize(json, true);
         assertEquals("/*{}*/", normalizedActual);
         assertFalse(action.isExecuted());
+        assertEquals("application/json", response.getContentType());
     }
 
     protected void setUp() throws Exception {

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java?rev=649878&r1=649877&r2=649878&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
 Sat Apr 19 20:38:49 2008
@@ -37,6 +37,7 @@
     private PrintWriter writer;
     private int status;
     private String redirectURL;
+    private String contentType;
 
     public Locale getLocale() {
         return locale;
@@ -47,7 +48,12 @@
     }
 
     public String getContentType() {
-        return null;  //To change body of implemented methods use File | 
Settings | File Templates.
+        return contentType;  //To change body of implemented methods use File 
| Settings | File Templates.
+    }
+    
+    @Override
+    public void setContentType(String type) {
+        this.contentType = type;
     }
 
     public PrintWriter getWriter() throws IOException {