Author: ivaynberg
Date: Thu Jan 27 18:34:08 2011
New Revision: 1064248
URL: http://svn.apache.org/viewvc?rev=1064248&view=rev
Log:
more cleanup. remove old getHttpServletRequest/Response and use
getContainerResponse() instead. which actually uncovered a bunch of places that
would be broken if responses or requests were wrapped, which they are.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
Thu Jan 27 18:34:08 2011
@@ -28,7 +28,6 @@ import org.apache.wicket.markup.MarkupSt
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.resource.ResourceUtil;
import org.apache.wicket.util.resource.UrlResourceStream;
@@ -216,7 +215,7 @@ public class Include extends WebComponen
private String importRelativeUrl(CharSequence url)
{
// make the url absolute
- HttpServletRequest req =
((ServletWebRequest)getRequest()).getHttpServletRequest();
+ HttpServletRequest req =
(HttpServletRequest)getRequest().getContainerRequest();
StringBuilder buildUrl = new StringBuilder(url.length());
String scheme = req.getScheme();
int port = req.getServerPort();
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
Thu Jan 27 18:34:08 2011
@@ -62,7 +62,7 @@ public class WebClientInfo extends Clien
{
super();
ServletWebRequest request =
(ServletWebRequest)requestCycle.getRequest();
- HttpServletRequest httpServletRequest =
request.getHttpServletRequest();
+ HttpServletRequest httpServletRequest =
request.getContainerRequest();
userAgent = httpServletRequest.getHeader("User-Agent");
properties.setRemoteAddress(getRemoteAddr(requestCycle));
init();
@@ -122,7 +122,7 @@ public class WebClientInfo extends Clien
protected String getRemoteAddr(RequestCycle requestCycle)
{
ServletWebRequest request =
(ServletWebRequest)requestCycle.getRequest();
- HttpServletRequest req = request.getHttpServletRequest();
+ HttpServletRequest req = request.getContainerRequest();
String remoteAddr = request.getHeader("X-Forwarded-For");
if (remoteAddr == null)
{
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
Thu Jan 27 18:34:08 2011
@@ -62,7 +62,7 @@ public abstract class MultipartServletWe
@Override
public ServletWebRequest cloneWithUrl(Url url)
{
- return new MultipartServletWebRequest(getHttpServletRequest(),
getFilterPrefix(), url)
+ return new MultipartServletWebRequest(getContainerRequest(),
getFilterPrefix(), url)
{
public FileItem getFile(String fieldName)
{
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Thu Jan 27 18:34:08 2011
@@ -176,16 +176,6 @@ public class ServletWebRequest extends W
return filterPrefix;
}
- /**
- * Returns the wrapped {@link HttpServletRequest} instance.
- *
- * @return {@link HttpServletRequest} instance.
- */
- public final HttpServletRequest getHttpServletRequest()
- {
- return httpServletRequest;
- }
-
@Override
public List<Cookie> getCookies()
{
@@ -239,7 +229,7 @@ public class ServletWebRequest extends W
protected Map<String, List<StringValue>> generatePostParameters()
{
// Do not attempt to parse multipart request
- if (isMultiPart(getHttpServletRequest()))
+ if (isMultiPart(getContainerRequest()))
{
return Collections.emptyMap();
}
@@ -247,7 +237,7 @@ public class ServletWebRequest extends W
Map<String, List<StringValue>> postParameters = new
HashMap<String, List<StringValue>>();
try
{
- final BufferedReader reader =
getHttpServletRequest().getReader();
+ final BufferedReader reader =
getContainerRequest().getReader();
final String value = Streams.readString(reader);
if (!Strings.isEmpty(value))
@@ -270,7 +260,7 @@ public class ServletWebRequest extends W
logger.warn(
"Error parsing request body for post
parameters; Fallback to ServletRequest#getParameters().",
e);
- for (final String name :
(List<String>)Collections.list(getHttpServletRequest().getParameterNames()))
+ for (final String name :
(List<String>)Collections.list(getContainerRequest().getParameterNames()))
{
List<StringValue> list =
postParameters.get(name);
if (list == null)
@@ -278,7 +268,7 @@ public class ServletWebRequest extends W
list = new ArrayList<StringValue>();
postParameters.put(name, list);
}
- for (final String value :
getHttpServletRequest().getParameterValues(name))
+ for (final String value :
getContainerRequest().getParameterValues(name))
{
list.add(StringValue.valueOf(value));
}
@@ -373,7 +363,7 @@ public class ServletWebRequest extends W
public MultipartServletWebRequest newMultipartWebRequest(Bytes maxSize)
throws FileUploadException
{
- return new
MultipartServletWebRequestImpl(getHttpServletRequest(), filterPrefix, maxSize);
+ return new
MultipartServletWebRequestImpl(getContainerRequest(), filterPrefix, maxSize);
}
/**
@@ -387,7 +377,7 @@ public class ServletWebRequest extends W
public MultipartServletWebRequest newMultipartWebRequest(Bytes maxSize,
FileItemFactory factory)
throws FileUploadException
{
- return new
MultipartServletWebRequestImpl(getHttpServletRequest(), filterPrefix, maxSize,
+ return new
MultipartServletWebRequestImpl(getContainerRequest(), filterPrefix, maxSize,
factory);
}
@@ -412,7 +402,7 @@ public class ServletWebRequest extends W
}
@Override
- public Object getContainerRequest()
+ public HttpServletRequest getContainerRequest()
{
return httpServletRequest;
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
Thu Jan 27 18:34:08 2011
@@ -55,16 +55,6 @@ public class ServletWebResponse extends
this.webRequest = webRequest;
}
- /**
- * Returns the wrapped response
- *
- * @return wrapped response
- */
- public final HttpServletResponse getHttpServletResponse()
- {
- return httpServletResponse;
- }
-
@Override
public void addCookie(Cookie cookie)
{
@@ -184,7 +174,7 @@ public class ServletWebResponse extends
private String getAbsolutePrefix()
{
- HttpServletRequest httpServletRequest =
webRequest.getHttpServletRequest();
+ HttpServletRequest httpServletRequest =
webRequest.getContainerRequest();
String port = "";
if (("http".equals(httpServletRequest.getScheme()) &&
httpServletRequest.getServerPort() != 80) ||
@@ -207,7 +197,7 @@ public class ServletWebResponse extends
}
else
{
- HttpServletRequest httpServletRequest =
webRequest.getHttpServletRequest();
+ HttpServletRequest httpServletRequest =
webRequest.getContainerRequest();
Charset charset =
RequestUtils.getCharset(httpServletRequest);
final Url current;
@@ -250,7 +240,7 @@ public class ServletWebResponse extends
"<ajax-response><redirect><![CDATA[" +
url + "]]></redirect></ajax-response>");
setContentType("text/xml;charset=" +
-
webRequest.getHttpServletRequest().getCharacterEncoding());
+
webRequest.getContainerRequest().getCharacterEncoding());
}
else
{
@@ -291,7 +281,7 @@ public class ServletWebResponse extends
}
@Override
- public Object getContainerResponse()
+ public HttpServletResponse getContainerResponse()
{
return httpServletResponse;
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java
Thu Jan 27 18:34:08 2011
@@ -18,7 +18,6 @@ package org.apache.wicket.protocol.https
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestHandlerDelegate;
@@ -127,7 +126,7 @@ class SwitchProtocolRequestHandler imple
public void respond(IRequestCycle requestCycle)
{
WebRequest webRequest = (WebRequest)requestCycle.getRequest();
- HttpServletRequest request =
((ServletWebRequest)webRequest).getHttpServletRequest();
+ HttpServletRequest request =
(HttpServletRequest)webRequest.getContainerRequest();
Integer port = null;
if (protocol == Protocol.HTTP)
@@ -192,7 +191,7 @@ class SwitchProtocolRequestHandler imple
{
IRequestCycle requestCycle = RequestCycle.get();
WebRequest webRequest = (WebRequest)requestCycle.getRequest();
- HttpServletRequest request =
((ServletWebRequest)webRequest).getHttpServletRequest();
+ HttpServletRequest request =
(HttpServletRequest)webRequest.getContainerRequest();
if (protocol == null || protocol == Protocol.PRESERVE_CURRENT ||
request.getScheme().equals(protocol.toString().toLowerCase()))
{
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
Thu Jan 27 18:34:08 2011
@@ -34,7 +34,6 @@ import org.apache.wicket.Session;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.protocol.http.IRequestLogger;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.http.WebRequest;
import org.slf4j.Logger;
@@ -78,11 +77,12 @@ public class HttpSessionStore implements
*/
protected final HttpServletRequest getHttpServletRequest(final Request
request)
{
- if ((request instanceof ServletWebRequest) == false)
+ Object containerRequest = request.getContainerRequest();
+ if (containerRequest == null || (containerRequest instanceof
HttpServletRequest) == false)
{
throw new IllegalArgumentException("Request must be
ServletWebRequest");
}
- return ((ServletWebRequest)request).getHttpServletRequest();
+ return (HttpServletRequest)containerRequest;
}
/**
@@ -131,7 +131,8 @@ public class HttpSessionStore implements
}
/**
- * @see
org.apache.wicket.session.ISessionStore#getSessionId(org.apache.wicket.request.Request,
boolean)
+ * @see
org.apache.wicket.session.ISessionStore#getSessionId(org.apache.wicket.request.Request,
+ * boolean)
*/
public String getSessionId(final Request request, final boolean create)
{
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
Thu Jan 27 18:34:08 2011
@@ -326,7 +326,7 @@ public class CookieUtils
}
ServletWebRequest request = (ServletWebRequest)getWebRequest();
- String path = request.getHttpServletRequest().getContextPath()
+ "/" +
+ String path = request.getContainerRequest().getContextPath() +
"/" +
request.getFilterPrefix();
cookie.setPath(path);
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Thu Jan 27 18:34:08 2011
@@ -2275,7 +2275,7 @@ public class BaseWicketTester
super.sendRedirect(url);
try
{
- getHttpServletResponse().sendRedirect(url);
+ getContainerResponse().sendRedirect(url);
}
catch (IOException e)
{
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
Thu Jan 27 18:34:08 2011
@@ -61,7 +61,7 @@ class MultipartRequest extends Multipart
{
UploadInfo info = new UploadInfo(totalBytes);
- UploadWebRequest.setUploadInfo(getHttpServletRequest(), info);
+ UploadWebRequest.setUploadInfo(getContainerRequest(), info);
}
/**
@@ -71,7 +71,7 @@ class MultipartRequest extends Multipart
@Override
protected void onUploadUpdate(final int bytesUploaded, final int total)
{
- HttpServletRequest request = getHttpServletRequest();
+ HttpServletRequest request = getContainerRequest();
UploadInfo info = UploadWebRequest.getUploadInfo(request);
if (info == null)
{
@@ -89,6 +89,6 @@ class MultipartRequest extends Multipart
@Override
protected void onUploadCompleted()
{
- UploadWebRequest.clearUploadInfo(getHttpServletRequest());
+ UploadWebRequest.clearUploadInfo(getContainerRequest());
}
}
\ No newline at end of file
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
Thu Jan 27 18:34:08 2011
@@ -18,7 +18,6 @@ package org.apache.wicket.extensions.aja
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.resource.AbstractResource;
@@ -65,7 +64,7 @@ class UploadStatusResource extends Abstr
*/
private String getStatus(final Attributes attributes)
{
- HttpServletRequest req =
((ServletWebRequest)attributes.getRequest()).getHttpServletRequest();
+ HttpServletRequest req =
(HttpServletRequest)attributes.getRequest().getContainerRequest();
UploadInfo info = UploadWebRequest.getUploadInfo(req);
String status = null;
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java?rev=1064248&r1=1064247&r2=1064248&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
Thu Jan 27 18:34:08 2011
@@ -74,7 +74,7 @@ public class UploadWebRequest extends Se
public MultipartServletWebRequest newMultipartWebRequest(final Bytes
maxsize)
throws FileUploadException
{
- return new MultipartRequest(getHttpServletRequest(),
getFilterPrefix(), maxsize);
+ return new MultipartRequest(getContainerRequest(),
getFilterPrefix(), maxsize);
}
private static final String SESSION_KEY =
UploadWebRequest.class.getName();
