removed the obsolete getRequestObjects method
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-request@1215003 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java b/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
index 8443249..b174a3d 100644
--- a/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
+++ b/tiles-request-api/src/main/java/org/apache/tiles/request/WebRequest.java
@@ -55,12 +55,4 @@
* @since 2.2.0
*/
void setContentType(String contentType);
-
- /**
- * Returns the original request objects used to create this request.
- *
- * @return The request objects.
- * @since 2.1.2
- */
- Object[] getRequestObjects();
}
diff --git a/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java b/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
index dc5ff17..e7651a9 100644
--- a/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
+++ b/tiles-request-api/src/main/java/org/apache/tiles/request/util/WebRequestWrapper.java
@@ -148,9 +148,4 @@
public boolean isUserInRole(String role) {
return context.isUserInRole(role);
}
-
- /** {@inheritDoc} */
- public Object[] getRequestObjects() {
- return context.getRequestObjects();
- }
}
diff --git a/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java b/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
index 5ccd3a5..6bcd98e 100644
--- a/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
+++ b/tiles-request-api/src/test/java/org/apache/tiles/request/util/WebRequestWrapperTest.java
@@ -20,11 +20,9 @@
*/
package org.apache.tiles.request.util;
-import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
-import static org.junit.Assert.assertArrayEquals;
import java.io.IOException;
@@ -97,21 +95,4 @@
request.setContentType("text/html");
verify(wrappedRequest);
}
-
- /**
- * Test method for {@link org.apache.tiles.request.util.WebRequestWrapper#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- WebRequest wrappedRequest = createMockRequest();
- String[] param = new String[] {"one", "two", "three"};
-
- expect(wrappedRequest.getRequestObjects()).andReturn(param);
-
- replay(wrappedRequest);
- WebRequestWrapper request = createRequestWrapper(wrappedRequest);
- assertArrayEquals(param, request.getRequestObjects());
- verify(wrappedRequest);
- }
-
}
diff --git a/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java b/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
index 17a2a21..4e657bd 100644
--- a/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
+++ b/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
@@ -61,11 +61,6 @@
private Map<String, Object> pageScope;
/**
- * The request objects.
- */
- private transient Object[] requestObjects;
-
- /**
* Creates a new Freemarker request.
*
* @param applicationContext The application context.
@@ -145,14 +140,4 @@
public Writer getWriter() {
return env.getOut();
}
-
- /** {@inheritDoc} */
- @Override
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[1];
- requestObjects[0] = env;
- }
- return requestObjects;
- }
}
diff --git a/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java b/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
index dfc33a7..483db8f 100644
--- a/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
+++ b/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
@@ -260,18 +260,4 @@
assertNotNull(context.getWriter());
verify(enclosedRequest);
}
- /**
- * Tests {@link FreemarkerRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
-
- replay(enclosedRequest);
- context = new FreemarkerRequest(enclosedRequest, env);
- Object[] requestObjects = context.getRequestObjects();
- assertEquals(1, requestObjects.length);
- assertEquals(env, requestObjects[0]);
- verify(enclosedRequest);
- }
}
diff --git a/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java b/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
index fa48824..535c5b9 100644
--- a/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
+++ b/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
@@ -58,11 +58,6 @@
private PageContext pageContext;
/**
- * The request objects, lazily initialized.
- */
- private Object[] requestObjects;
-
- /**
* <p>The lazily instantiated <code>Map</code> of page scope
* attributes.</p>
*/
@@ -191,16 +186,6 @@
return (applicationScope);
}
- /** {@inheritDoc} */
- @Override
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[1];
- requestObjects[0] = pageContext;
- }
- return requestObjects;
- }
-
/**
* Returns the page context that originated the request.
*
diff --git a/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java b/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
index 39246d9..78d14c5 100644
--- a/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
+++ b/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
@@ -112,16 +112,6 @@
}
/**
- * Test method for {@link org.apache.tiles.request.jsp.JspRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- replay(context, enclosedRequest);
- assertArrayEquals(new Object[] { context }, request.getRequestObjects());
- verify(context, enclosedRequest);
- }
-
- /**
* Test method for {@link org.apache.tiles.request.jsp.JspRequest#doInclude(java.lang.String)}.
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
diff --git a/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java b/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
index 1d02b31..0e1eb9d 100644
--- a/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
+++ b/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
@@ -104,11 +104,6 @@
/**
- * The request objects, lazily initialized.
- */
- private Object[] requestObjects;
-
- /**
* <p>The lazily instantiated <code>Map</code> of session scope
* attributes.</p>
*/
@@ -220,16 +215,6 @@
}
/** {@inheritDoc} */
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[2];
- requestObjects[0] = request;
- requestObjects[1] = response;
- }
- return requestObjects;
- }
-
- /** {@inheritDoc} */
public Locale getRequestLocale() {
return request.getLocale();
}
diff --git a/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java b/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
index 8456370..293eeab 100644
--- a/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
+++ b/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
@@ -395,13 +395,6 @@
/**
* Test method for {@link org.apache.tiles.request.portlet.PortletRequest#getRequestObjects()}.
*/
- @Test
- public void testGetRequestObjects() {
- replay(applicationContext, request, response, portletContext, requestDelegate, responseDelegate);
- assertArrayEquals(new Object[] {request, response}, req.getRequestObjects());
- verify(applicationContext, request, response, portletContext, requestDelegate, responseDelegate);
- }
-
/**
* Test method for {@link org.apache.tiles.request.portlet.PortletRequest#getRequest()}.
*/
diff --git a/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java b/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
index 67b3599..dd08938 100644
--- a/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
+++ b/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
@@ -66,11 +66,6 @@
private HttpServletResponse response;
/**
- * The request objects, lazily initialized.
- */
- private Object[] requestObjects;
-
- /**
* The response output stream, lazily initialized.
*/
private OutputStream outputStream;
@@ -282,16 +277,6 @@
}
/** {@inheritDoc} */
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- requestObjects = new Object[2];
- requestObjects[0] = request;
- requestObjects[1] = response;
- }
- return requestObjects;
- }
-
- /** {@inheritDoc} */
public HttpServletRequest getRequest() {
return request;
}
diff --git a/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java b/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
index e915b9e..e19fbb9 100644
--- a/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
+++ b/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
@@ -357,16 +357,6 @@
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.ServletRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- replay(applicationContext, request, response);
- assertArrayEquals(new Object[] {request, response}, req.getRequestObjects());
- verify(applicationContext, request, response);
- }
-
- /**
* Test method for {@link org.apache.tiles.request.servlet.ServletRequest#getRequest()}.
*/
@Test
diff --git a/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java b/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
index bff2801..ef244f3 100644
--- a/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
+++ b/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
@@ -58,11 +58,6 @@
private final Context ctx;
/**
- * The request objects.
- */
- private Object[] requestObjects;
-
- /**
* The writer to use to render the response. It may be null, if not necessary.
*/
private Writer writer;
@@ -115,9 +110,9 @@
/** {@inheritDoc} */
@Override
protected void doInclude(String path) throws IOException {
- Object[] requestObjects = super.getRequestObjects();
- HttpServletRequest request = (HttpServletRequest) requestObjects[0];
- HttpServletResponse response = (HttpServletResponse) requestObjects[1];
+ ServletRequest servletRequest = org.apache.tiles.request.servlet.ServletUtil.getServletRequest(this);
+ HttpServletRequest request = servletRequest.getRequest();
+ HttpServletResponse response = servletRequest.getResponse();
RequestDispatcher rd = request.getRequestDispatcher(path);
if (rd == null) {
@@ -158,27 +153,6 @@
return writer;
}
- /** {@inheritDoc} */
- @Override
- public Object[] getRequestObjects() {
- if (requestObjects == null) {
- Object[] parentRequestObjects = super.getRequestObjects();
- if (writer == null) {
- requestObjects = new Object[parentRequestObjects.length + 1];
- } else {
- requestObjects = new Object[parentRequestObjects.length + 2];
- }
- requestObjects[0] = ctx;
- for (int i = 0; i < parentRequestObjects.length; i++) {
- requestObjects[i + 1] = parentRequestObjects[i];
- }
- if (writer != null) {
- requestObjects[parentRequestObjects.length + 1] = writer;
- }
- }
- return requestObjects;
- }
-
/**
* Returns the page scope.
*
diff --git a/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java b/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
index f063c75..a735d03 100644
--- a/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
+++ b/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
@@ -111,7 +111,7 @@
@Test
public void testDoInclude() throws IOException, ServletException {
String path = "this way";
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ ServletRequest enclosedRequest = createMock(ServletRequest.class);
HttpServletRequest servletRequest = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
RequestDispatcher dispatcher = createMock(RequestDispatcher.class);
@@ -119,9 +119,9 @@
expect(servletRequest.getRequestDispatcher("this way")).andReturn(dispatcher);
dispatcher.include(eq(servletRequest), isA(ExternalWriterHttpServletResponse.class));
replay(servletRequest, response, dispatcher);
- Object[] requestItems = new Object[] {servletRequest, response};
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
+ expect(enclosedRequest.getRequest()).andReturn(servletRequest);
+ expect(enclosedRequest.getResponse()).andReturn(response);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext, writer);
@@ -137,15 +137,15 @@
@Test(expected = IOException.class)
public void testDoIncludeNoRequestDispatcher() throws IOException {
String path = "this way";
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ ServletRequest enclosedRequest = createMock(ServletRequest.class);
HttpServletRequest servletRequest = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
expect(servletRequest.getRequestDispatcher("this way")).andReturn(null);
replay(servletRequest, response);
- Object[] requestItems = new Object[] {servletRequest, response};
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
+ expect(enclosedRequest.getRequest()).andReturn(servletRequest);
+ expect(enclosedRequest.getResponse()).andReturn(response);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext, writer);
@@ -162,7 +162,7 @@
@Test(expected = IOException.class)
public void testDoIncludeServletException() throws IOException, ServletException {
String path = "this way";
- WebRequest enclosedRequest = createMock(WebRequest.class);
+ ServletRequest enclosedRequest = createMock(ServletRequest.class);
HttpServletRequest servletRequest = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
RequestDispatcher dispatcher = createMock(RequestDispatcher.class);
@@ -171,9 +171,9 @@
dispatcher.include(eq(servletRequest), isA(ExternalWriterHttpServletResponse.class));
expectLastCall().andThrow(new ServletException());
replay(servletRequest, response, dispatcher);
- Object[] requestItems = new Object[] {servletRequest, response};
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
+ expect(enclosedRequest.getRequest()).andReturn(servletRequest);
+ expect(enclosedRequest.getResponse()).andReturn(response);
replay(velocityContext, enclosedRequest);
context = new VelocityRequest(enclosedRequest, velocityContext, writer);
@@ -248,48 +248,6 @@
}
/**
- * Tests {@link VelocityRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjects() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
- HttpServletRequest servletRequest = createMock(HttpServletRequest.class);
- HttpServletResponse response = createMock(HttpServletResponse.class);
-
- replay(servletRequest, response);
- Object[] requestItems = new Object[] {servletRequest, response};
-
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
-
- replay(velocityContext, enclosedRequest);
- context = new VelocityRequest(enclosedRequest, velocityContext, writer);
- assertArrayEquals(new Object[] { velocityContext, servletRequest,
- response, writer }, context.getRequestObjects());
- verify(velocityContext, enclosedRequest, servletRequest, response);
- }
-
- /**
- * Tests {@link VelocityRequest#getRequestObjects()}.
- */
- @Test
- public void testGetRequestObjectsNoWriter() {
- WebRequest enclosedRequest = createMock(WebRequest.class);
- HttpServletRequest servletRequest = createMock(HttpServletRequest.class);
- HttpServletResponse response = createMock(HttpServletResponse.class);
-
- replay(servletRequest, response);
- Object[] requestItems = new Object[] {servletRequest, response};
-
- expect(enclosedRequest.getRequestObjects()).andReturn(requestItems);
-
- replay(velocityContext, enclosedRequest);
- context = new VelocityRequest(enclosedRequest, velocityContext, null);
- assertArrayEquals(new Object[] { velocityContext, servletRequest,
- response}, context.getRequestObjects());
- verify(velocityContext, enclosedRequest, servletRequest, response);
- }
-
- /**
* Tests {@link VelocityRequest#getPageScope()}.
*/
@Test
