Author: fmeschbe
Date: Wed May 20 19:29:44 2009
New Revision: 776815
URL: http://svn.apache.org/viewvc?rev=776815&view=rev
Log:
SLING-979 have SlingHttpServletRequest and -Response extend Adaptable interface
Modified:
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
Modified:
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java?rev=776815&r1=776814&r2=776815&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
(original)
+++
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
Wed May 20 19:29:44 2009
@@ -26,6 +26,7 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import org.apache.sling.api.adapter.Adaptable;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestParameterMap;
@@ -48,12 +49,15 @@
* {...@link RequestParameter} instances.
* <p>
* In any case, the {...@link #getReader()} and {...@link #getInputStream()}
methods
- * will throw an <code>IllegalStateException</code> if called after any
- * methods returning request parameters if the request content type is either
+ * will throw an <code>IllegalStateException</code> if called after any methods
+ * returning request parameters if the request content type is either
* <i>application/x-www-form-urlencoded</i> or <i>multipart/form-data</i>
* because the request data has already been processed.
+ * <p>
+ * Starting with Sling API 2.0.6, this interface als extends the
+ * {...@link Adaptable} interface.
*/
-public interface SlingHttpServletRequest extends HttpServletRequest {
+public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable
{
/**
* Returns the {...@link Resource} object on whose behalf the servlet acts.
Modified:
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java?rev=776815&r1=776814&r2=776815&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
(original)
+++
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
Wed May 20 19:29:44 2009
@@ -20,13 +20,19 @@
import javax.servlet.http.HttpServletResponse;
+import org.apache.sling.api.adapter.Adaptable;
+
/**
* The <code>SlingHttpServletResponse</code> defines the interface to assist a
* servlet in creating and sending a response to the client.
* <p>
* This interface is currently empty and merely exists to paralell the
* {...@link SlingHttpServletRequest} interface.
+ * <p>
+ * Starting with Sling API 2.0.6, this interface als extends the
+ * {...@link Adaptable} interface.
*/
-public interface SlingHttpServletResponse extends HttpServletResponse {
+public interface SlingHttpServletResponse extends HttpServletResponse,
+ Adaptable {
}
Modified:
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java?rev=776815&r1=776814&r2=776815&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
(original)
+++
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
Wed May 20 19:29:44 2009
@@ -117,4 +117,8 @@
public Enumeration<String> getResponseContentTypes() {
return getSlingRequest().getResponseContentTypes();
}
+
+ public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
+ return getSlingRequest().adaptTo(type);
+ }
}
Modified:
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java?rev=776815&r1=776814&r2=776815&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
(original)
+++
incubator/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
Wed May 20 19:29:44 2009
@@ -47,4 +47,7 @@
return (SlingHttpServletResponse) getResponse();
}
+ public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
+ return getSlingResponse().adaptTo(type);
+ }
}
