Author: fmeschbe
Date: Tue Dec 18 06:12:53 2007
New Revision: 605211
URL: http://svn.apache.org/viewvc?rev=605211&view=rev
Log:
SLING-134 Implement new ResourceResolver.adaptTo method
Modified:
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/services/MicroslingServiceLocatorTest.java
Modified:
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java?rev=605211&r1=605210&r2=605211&view=diff
==============================================================================
---
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java
(original)
+++
incubator/sling/trunk/microsling/microsling-core/src/main/java/org/apache/sling/microsling/resource/MicroslingResourceResolver.java
Tue Dec 18 06:12:53 2007
@@ -305,6 +305,20 @@
}
}
+ /** Returns an adapter for the given class */
+ @SuppressWarnings("unchecked")
+ public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
+ if (type == Session.class) {
+ try {
+ return (AdapterType) getSession();
+ } catch (SlingException se) {
+ log.warn("Cannot get Session", se);
+ }
+ }
+
+ return null;
+ }
+
/** Returns the session used by this resolver */
protected Session getSession() throws SlingException {
if (session != null && session.isLive()) {
Modified:
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/services/MicroslingServiceLocatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/services/MicroslingServiceLocatorTest.java?rev=605211&r1=605210&r2=605211&view=diff
==============================================================================
---
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/services/MicroslingServiceLocatorTest.java
(original)
+++
incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/services/MicroslingServiceLocatorTest.java
Tue Dec 18 06:12:53 2007
@@ -64,6 +64,10 @@
public Resource resolve(HttpServletRequest request) {
return null;
}
+
+ public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
+ return null;
+ }
});
serviceLocator = sl;
