This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-2.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit e2054b1292f93242797e8d6b72b08b504e72fec2 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Feb 23 01:49:03 2016 +0000 SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1731777 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/testing/mock/sling/MockJcrResourceResolverAdapter.java | 5 ++--- .../sling/testing/mock/sling/MockNoneResourceResolverAdapter.java | 5 ++--- src/main/java/org/apache/sling/testing/mock/sling/MockSling.java | 4 ++-- .../sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java | 5 ++--- .../sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java | 5 ++--- .../java/org/apache/sling/testing/mock/sling/spi/package-info.java | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java index 57bfd0b..d9df564 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java @@ -21,7 +21,6 @@ package org.apache.sling.testing.mock.sling; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter; -import org.osgi.framework.BundleContext; /** * Resource resolver type adapter for JCR Mocks implementation. @@ -29,12 +28,12 @@ import org.osgi.framework.BundleContext; class MockJcrResourceResolverAdapter implements ResourceResolverTypeAdapter { @Override - public ResourceResolverFactory newResourceResolverFactory(BundleContext bundleContext) { + public ResourceResolverFactory newResourceResolverFactory() { return null; } @Override - public SlingRepository newSlingRepository(BundleContext bundleContext) { + public SlingRepository newSlingRepository() { return new MockJcrSlingRepository(); } diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java index c99c23f..05a427c 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java @@ -21,7 +21,6 @@ package org.apache.sling.testing.mock.sling; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter; -import org.osgi.framework.BundleContext; /** * Resource resolver type with no resource provider registered. @@ -29,12 +28,12 @@ import org.osgi.framework.BundleContext; class MockNoneResourceResolverAdapter implements ResourceResolverTypeAdapter { @Override - public ResourceResolverFactory newResourceResolverFactory(BundleContext bundleContext) { + public ResourceResolverFactory newResourceResolverFactory() { return null; } @Override - public SlingRepository newSlingRepository(BundleContext bundleContext) { + public SlingRepository newSlingRepository() { return null; } diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java b/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java index 31a3059..fdc222e 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java @@ -69,9 +69,9 @@ public final class MockSling { public static ResourceResolverFactory newResourceResolverFactory(final ResourceResolverType type, final BundleContext bundleContext) { ResourceResolverTypeAdapter adapter = getResourceResolverTypeAdapter(type); - ResourceResolverFactory factory = adapter.newResourceResolverFactory(bundleContext); + ResourceResolverFactory factory = adapter.newResourceResolverFactory(); if (factory == null) { - SlingRepository repository = adapter.newSlingRepository(bundleContext); + SlingRepository repository = adapter.newSlingRepository(); factory = ResourceResolverFactoryInitializer.setUp(repository, bundleContext, type.getNodeTypeMode()); } else { diff --git a/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java index 1329805..47c4a64 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java @@ -23,7 +23,6 @@ import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter; import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory; import org.apache.sling.testing.resourceresolver.MockResourceResolverFactoryOptions; -import org.osgi.framework.BundleContext; /** * Resource resolver type adapter for Sling Resource Resolver Mock implementation. @@ -41,12 +40,12 @@ class RRMockMockResourceResolverAdapter implements ResourceResolverTypeAdapter { } @Override - public ResourceResolverFactory newResourceResolverFactory(BundleContext bundleContext) { + public ResourceResolverFactory newResourceResolverFactory() { return new MockResourceResolverFactory(options); } @Override - public SlingRepository newSlingRepository(BundleContext bundleContext) { + public SlingRepository newSlingRepository() { return null; } diff --git a/src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java index 85d346c..cc20279 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java @@ -20,7 +20,6 @@ package org.apache.sling.testing.mock.sling.spi; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.jcr.api.SlingRepository; -import org.osgi.framework.BundleContext; /** * SPI interface for resource resolver type implementations to provide a mock @@ -34,7 +33,7 @@ public interface ResourceResolverTypeAdapter { * {@link #newSlingRepository()} has to return a value. * @return Resource resolver factory instance or null */ - ResourceResolverFactory newResourceResolverFactory(BundleContext bundleContext); + ResourceResolverFactory newResourceResolverFactory(); /** * Get SlingRepository instance. Can be null if a resource resolver factory @@ -42,6 +41,6 @@ public interface ResourceResolverTypeAdapter { * {@link #newResourceResolverFactory()} has to return a value. * @return Sling repository instance or null */ - SlingRepository newSlingRepository(BundleContext bundleContext); + SlingRepository newSlingRepository(); } diff --git a/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java index c0720b9..0316d03 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java @@ -19,5 +19,5 @@ /** * SPI for hooking in alternative resource type adapter implementations. */ [email protected]("2.0") [email protected]("1.0") package org.apache.sling.testing.mock.sling.spi; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
