Author: ivaynberg
Date: Thu Jan 27 18:15:56 2011
New Revision: 1064240
URL: http://svn.apache.org/viewvc?rev=1064240&view=rev
Log:
added request.getcontainerrequest() to stay consistent with
response.getcontainerresponse()
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Request.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java?rev=1064240&r1=1064239&r2=1064240&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebRequest.java
Thu Jan 27 18:15:56 2011
@@ -256,4 +256,10 @@ public class MockWebRequest extends WebR
{
return new Url(url.getSegments(), Collections.<QueryParameter>
emptyList());
}
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return this;
+ }
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java?rev=1064240&r1=1064239&r2=1064240&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
Thu Jan 27 18:15:56 2011
@@ -333,6 +333,6 @@ public class MockWebResponse extends Web
@Override
public Object getContainerResponse()
{
- return null;
+ return this;
}
}
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=1064240&r1=1064239&r2=1064240&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:15:56 2011
@@ -411,5 +411,11 @@ public class ServletWebRequest extends W
return RequestUtils.getCharset(httpServletRequest);
}
+ @Override
+ public Object getContainerRequest()
+ {
+ return httpServletRequest;
+ }
+
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java?rev=1064240&r1=1064239&r2=1064240&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java
Thu Jan 27 18:15:56 2011
@@ -75,6 +75,12 @@ public abstract class AbstractMapperTest
{
return url;
}
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return null;
+ }
};
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java?rev=1064240&r1=1064239&r2=1064240&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java
Thu Jan 27 18:15:56 2011
@@ -82,6 +82,12 @@ public class ResourceMapperTest extends
{
return getUrl();
}
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return null;
+ }
};
}
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Request.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Request.java?rev=1064240&r1=1064239&r2=1064240&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Request.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Request.java
Thu Jan 27 18:15:56 2011
@@ -189,6 +189,12 @@ public abstract class Request
{
return getUrl();
}
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return Request.this.getContainerRequest();
+ }
};
}
@@ -207,5 +213,19 @@ public abstract class Request
return "";
}
+ /**
+ * Gets charset of the request
+ *
+ * @return request charset
+ */
public abstract Charset getCharset();
+
+ /**
+ * Provides access to the low-level container request object that
implementaion of this
+ * {@link Request} delegate to. This allows users to access features
provided by the container
+ * requests but not by generalized Wicket {@link Request} objects.
+ *
+ * @return low-level container request object, or {@code null} if none
+ */
+ public abstract Object getContainerRequest();
}
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java?rev=1064240&r1=1064239&r2=1064240&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
Thu Jan 27 18:15:56 2011
@@ -190,6 +190,12 @@ public abstract class WebRequest extends
{
return WebRequest.this.getClientUrl();
}
+
+ @Override
+ public Object getContainerRequest()
+ {
+ return WebRequest.this.getContainerRequest();
+ }
};
}
