From f3b4786cc9227c4ce606c562c59cfab0299eeb94 Mon Sep 17 00:00:00 2001 From: Musachy Barroso Date: Sat, 28 Apr 2007 16:37:44 +0000 Subject: [PATCH] WW-1897 Create JSONValidationInterceptor git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@533386 13f79535-47bb-0310-9956-ffa450edef68 --- .../interceptor/validation/JSONValidationInterceptor.java | 4 +++- .../interceptor/validation/JSONValidationInterceptorTest.java | 2 +- 2 files changed, 4 insertions(+), 2 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 a8fee762c..1cdc9ece5 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 @@ -80,11 +80,13 @@ public class JSONValidationInterceptor extends AnnotationValidationInterceptor { response.setStatus(validationFailedStatus); response.getWriter().print(buildResponse(validationAware)); return Action.NONE; - } + } } String validateOnly = request.getParameter("validateOnly"); if (validateOnly != null && "true".equals(validateOnly)) { + //there were no errors + response.getWriter().print("/* {} */"); return Action.NONE; } else { return invocation.invoke(); 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 d9a39cd49..635795a9f 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 @@ -104,7 +104,7 @@ public class JSONValidationInterceptorTest extends StrutsTestCase { String json = stringWriter.toString(); String normalizedActual = TestUtils.normalize(json, true); - assertEquals("", normalizedActual); + assertEquals("/*{}*/", normalizedActual); assertFalse(invocation.isExecuted()); }