[sling-org-apache-sling-resourcemerger] 08/15: Copy relevant bits of resourceresolver private impl class to resourcemerger to avoid dependency on internal classes (even if it's for testing)

[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.resourcemerger-1.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 403cd668030e397adb265d9fddad5e5d15e78e27
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 28 17:41:12 2015 +0000

    Copy relevant bits of resourceresolver private impl class to resourcemerger to avoid dependency on internal classes (even if it's for testing)
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1711081 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resourcemerger/impl/BasicResolveContext.java   | 52 ++++++++++++++++++++++
 .../impl/MergedResourceProviderTest.java           |  3 +-
 .../impl/OverridingResourceProviderTest.java       |  3 +-
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java b/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
new file mode 100644
index 0000000..59660b6
--- /dev/null
+++ b/src/test/java/org/apache/sling/resourcemerger/impl/BasicResolveContext.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.resourcemerger.impl;
+
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResourceProvider;
+
+public class BasicResolveContext<T> implements ResolverContext<T> {
+
+    private final ResourceResolver resourceResolver;
+
+    public BasicResolveContext(ResourceResolver resourceResolver) {
+        this.resourceResolver = resourceResolver;
+    }
+
+    @Override
+    public ResourceResolver getResourceResolver() {
+        return resourceResolver;
+    }
+
+    @Override
+    public T getProviderState() {
+        return null;
+    }
+
+    @Override
+    public ResolverContext<?> getParentResolveContext() {
+        return null;
+    }
+
+    @Override
+    public ResourceProvider<?> getParentResourceProvider() {
+        return null;
+    }
+}
diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
index 9340bb6..6d4326d 100644
--- a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
+++ b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
@@ -36,7 +36,6 @@ import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.resourcemerger.impl.picker.MergingResourcePicker;
-import org.apache.sling.resourceresolver.impl.BasicResolveContext;
 import org.apache.sling.spi.resource.provider.ResolverContext;
 import org.apache.sling.spi.resource.provider.ResourceContext;
 import org.apache.sling.testing.resourceresolver.MockHelper;
@@ -88,7 +87,7 @@ public class MergedResourceProviderTest {
                                         .commit();
 
         this.provider = new CRUDMergingResourceProvider("/merged", new MergingResourcePicker(), false);
-        this.ctx = new BasicResolveContext(resolver, null, "/");
+        this.ctx = new BasicResolveContext(resolver);
     }
 
     @Test public void testHideChildren() {
diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
index 2686dcc..1ac9157 100644
--- a/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
+++ b/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
@@ -33,7 +33,6 @@ import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.resourcemerger.impl.picker.OverridingResourcePicker;
-import org.apache.sling.resourceresolver.impl.BasicResolveContext;
 import org.apache.sling.spi.resource.provider.ResourceContext;
 import org.apache.sling.testing.resourceresolver.MockHelper;
 import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
@@ -101,7 +100,7 @@ public class OverridingResourceProviderTest {
                     .commit();
 
         this.provider = new MergingResourceProvider("/override", new OverridingResourcePicker(), false, true);
-        this.ctx = new BasicResolveContext(resolver, null, "/");
+        this.ctx = new BasicResolveContext(resolver);
     }
 
     @Test

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