[sling-org-apache-sling-testing-resourceresolver-mock] 06/15: SLING-3853 : MockResourceResolver does not extend SlingAdaptable. Apply patch from Stefan Seifert

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.resourceresolver-mock-0.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git

commit 6eecd9afb844234e09c59ab59d12dfadf06ddb67
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 15 16:18:33 2014 +0000

    SLING-3853 : MockResourceResolver does not extend SlingAdaptable. Apply patch from Stefan Seifert
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1618221 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/testing/resourceresolver/MockResourceResolver.java      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
index 1c383c0..2269d7e 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
@@ -31,13 +31,14 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.sling.api.SlingConstants;
+import org.apache.sling.api.adapter.SlingAdaptable;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.osgi.service.event.Event;
 
-public class MockResourceResolver implements ResourceResolver {
+public class MockResourceResolver extends SlingAdaptable implements ResourceResolver {
 
     private final Map<String, Map<String, Object>> resources;
 
@@ -54,11 +55,6 @@ public class MockResourceResolver implements ResourceResolver {
     }
 
     @Override
-    public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
-        return null;
-    }
-
-    @Override
     public Resource resolve(final HttpServletRequest request, final String absPath) {
         return this.getResource(absPath);
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.