Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-1367 Add support for JSF 2 Ajax requests, update booking-faces sample (JSF 2 based Ajax, jsr-303 validation), add chained delegation to AjaxHandlers, other miscellaneous improvements

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-07-28 12:56:24 +00:00
parent 507fec3edf
commit fe9229cf15
36 changed files with 722 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spring-js/src/main/java/org/springframework/js/ajax/AbstractAjaxHandler.java Normal file
View File

@@ -0,0 +1,43 @@
package org.springframework.js.ajax;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.context.support.WebApplicationObjectSupport;
public abstract class AbstractAjaxHandler extends WebApplicationObjectSupport implements AjaxHandler {
private AbstractAjaxHandler delegate;
public AbstractAjaxHandler(AbstractAjaxHandler delegate) {
this.delegate = delegate;
}
public final boolean isAjaxRequest(HttpServletRequest request, HttpServletResponse response) {
if (isAjaxRequestInternal(request, response)) {
return true;
}
if (delegate != null) {
return delegate.isAjaxRequest(request, response);
}
return false;
}
public final void sendAjaxRedirect(String targetUrl, HttpServletRequest request, HttpServletResponse response,
boolean popup) throws IOException {
if (isAjaxRequestInternal(request, response)) {
sendAjaxRedirectInternal(targetUrl, request, response, popup);
}
if (delegate != null) {
delegate.sendAjaxRedirect(targetUrl, request, response, popup);
}
}
protected abstract boolean isAjaxRequestInternal(HttpServletRequest request, HttpServletResponse response);
protected abstract void sendAjaxRedirectInternal(String targetUrl, HttpServletRequest request,
HttpServletResponse response, boolean popup) throws IOException;
}

22
spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java
View File

@@ -25,10 +25,12 @@ import org.springframework.util.StringUtils;
/**
* Ajax handler for Spring Javascript (Spring.js).
*
* @see AbstractAjaxHandler
*
* @author Jeremy Grelle
* @author Keith Donald
*/
public class SpringJavascriptAjaxHandler implements AjaxHandler {
public class SpringJavascriptAjaxHandler extends AbstractAjaxHandler {
/**
* The response header to be set on an Ajax redirect
@@ -50,7 +52,21 @@ public class SpringJavascriptAjaxHandler implements AjaxHandler {
*/
public static final String AJAX_SOURCE_PARAM = "ajaxSource";
public boolean isAjaxRequest(HttpServletRequest request, HttpServletResponse response) {
/**
* Create a SpringJavascriptAjaxHandler that is not part of a chain of AjaxHandler's.
*/
public SpringJavascriptAjaxHandler() {
this(null);
}
/**
* Create a SpringJavascriptAjaxHandler as part of a chain of AjaxHandler's.
*/
public SpringJavascriptAjaxHandler(AbstractAjaxHandler delegate) {
super(delegate);
}
protected boolean isAjaxRequestInternal(HttpServletRequest request, HttpServletResponse response) {
String acceptHeader = request.getHeader("Accept");
String ajaxParam = request.getParameter(AJAX_SOURCE_PARAM);
if (AJAX_ACCEPT_CONTENT_TYPE.equals(acceptHeader) || StringUtils.hasText(ajaxParam)) {
@@ -60,7 +76,7 @@ public class SpringJavascriptAjaxHandler implements AjaxHandler {
}
}
public void sendAjaxRedirect(String targetUrl, HttpServletRequest request, HttpServletResponse response,
protected void sendAjaxRedirectInternal(String targetUrl, HttpServletRequest request, HttpServletResponse response,
boolean popup) throws IOException {
if (popup) {
response.setHeader(POPUP_VIEW_HEADER, "true");

90
spring-js/src/test/java/org/springframework/js/ajax/AbstractAjaxHandlerTests.java Normal file
View File

@@ -0,0 +1,90 @@
package org.springframework.js.ajax;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import junit.framework.TestCase;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
public class AbstractAjaxHandlerTests extends TestCase {
private MockHttpServletRequest request;
private MockHttpServletResponse response;
protected void setUp() throws Exception {
request = new MockHttpServletRequest();
response = new MockHttpServletResponse();
}
public void testIsAjaxRequest() throws Exception {
TestAjaxHandler handler = new TestAjaxHandler(null, true);
assertTrue(handler.isAjaxRequest(request, response));
}
public void testIsNotAjaxRequest() throws Exception {
TestAjaxHandler handler = new TestAjaxHandler(null, false);
assertFalse(handler.isAjaxRequest(request, response));
}
public void testIsAjaxRequestViaDelegate() throws Exception {
TestAjaxHandler handler = new TestAjaxHandler(new TestAjaxHandler(null, true), false);
assertTrue(handler.isAjaxRequest(request, response));
}
public void testSendAjaxRedirect() throws Exception {
TestAjaxHandler handler = new TestAjaxHandler(null, true);
handler.sendAjaxRedirect("", request, response, false);
assertTrue(handler.wasAjaxRedirectInternalCalled);
}
public void testAjaxRedirectNotSent() throws Exception {
TestAjaxHandler handler = new TestAjaxHandler(null, false);
handler.sendAjaxRedirect("", request, response, false);
assertFalse(handler.wasAjaxRedirectInternalCalled());
}
public void testSendAjaxRedirectViaDelegate() throws Exception {
TestAjaxHandler handler = new TestAjaxHandler(new TestAjaxHandler(null, true), false);
handler.sendAjaxRedirect("", request, response, false);
assertTrue(handler.wasAjaxRedirectInternalCalled());
}
private final class TestAjaxHandler extends AbstractAjaxHandler {
private boolean isAjaxRequest;
private boolean wasAjaxRedirectInternalCalled;
private TestAjaxHandler delegate;
private TestAjaxHandler(TestAjaxHandler delegate, boolean isAjaxRequest) {
super(delegate);
this.delegate = delegate;
this.isAjaxRequest = isAjaxRequest;
}
protected boolean isAjaxRequestInternal(HttpServletRequest request, HttpServletResponse response) {
return isAjaxRequest;
}
protected void sendAjaxRedirectInternal(String targetUrl, HttpServletRequest request,
HttpServletResponse response, boolean popup) throws IOException {
wasAjaxRedirectInternalCalled = true;
}
public TestAjaxHandler getDelegate() {
return delegate;
}
public boolean wasAjaxRedirectInternalCalled() {
if (wasAjaxRedirectInternalCalled) {
return true;
} else {
return (getDelegate() != null) ? delegate.wasAjaxRedirectInternalCalled() : false;
}
}
}
}

8
spring-js/src/test/java/org/springframework/js/resource/ResourceServletTests.java
View File

@@ -31,7 +31,7 @@ public class ResourceServletTests extends TestCase {
public final void testExecute() throws Exception {
String requestPath = "/dojo/dojo.js";
String requestPath = "/spring/Spring.js";
request.setPathInfo(requestPath);
servlet.doGet(request, response);
@@ -41,10 +41,10 @@ public class ResourceServletTests extends TestCase {
public final void testExecute_CombinedResources() throws Exception {
String requestPath = "/dojo/dojo.js";
String requestPath = "/spring/Spring.js";
request.setPathInfo(requestPath);
Map params = new HashMap();
params.put("appended", "/dijit/dijit.js,/dijit/Dialog.js");
params.put("appended", "/spring/Spring-Dojo.js");
request.setParameters(params);
servlet.doGet(request, response);
@@ -53,7 +53,7 @@ public class ResourceServletTests extends TestCase {
public final void testExecute_CompressedResponse() throws Exception {
String requestPath = "/dojo/dojo.js";
String requestPath = "/spring/Spring.js";
request.setPathInfo(requestPath);
request.addHeader("Accept-Encoding", "gzip");
servlet.doGet(request, response);