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 41b471d6363447255198366b88b2b19d38384697 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Feb 23 00:33:26 2016 +0000 SLING-5546 remove deprecated methods git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1731765 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/testing/mock/sling/MockSling.java | 67 ---------------------- .../sling/testing/mock/sling/package-info.java | 2 +- .../sling/servlet/MockSlingHttpServletRequest.java | 23 +------- .../testing/mock/sling/servlet/package-info.java | 2 +- 4 files changed, 3 insertions(+), 91 deletions(-) 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 b53faae..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 @@ -26,7 +26,6 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.scripting.SlingScriptHelper; import org.apache.sling.jcr.api.SlingRepository; -import org.apache.sling.testing.mock.osgi.MockOsgi; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse; import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter; @@ -54,18 +53,6 @@ public final class MockSling { /** * Creates new sling resource resolver factory instance. - * @param type Type of underlying repository. - * @return Resource resolver factory instance - * @deprecated Please use {@link #newResourceResolverFactory(ResourceResolverType, BundleContext)} - * and shutdown the bundle context after usage. - */ - @Deprecated - public static ResourceResolverFactory newResourceResolverFactory(final ResourceResolverType type) { - return newResourceResolverFactory(type, MockOsgi.newBundleContext()); - } - - /** - * Creates new sling resource resolver factory instance. * @param bundleContext Bundle context * @return Resource resolver factory instance */ @@ -119,47 +106,6 @@ public final class MockSling { } /** - * Creates new sling resource resolver factory instance using - * {@link #DEFAULT_RESOURCERESOLVER_TYPE}. - * @return Resource resolver factory instance - * @deprecated Please use {@link #newResourceResolverFactory(BundleContext)} - * and shutdown the bundle context after usage. - */ - @Deprecated - public static ResourceResolverFactory newResourceResolverFactory() { - return newResourceResolverFactory(DEFAULT_RESOURCERESOLVER_TYPE); - } - - /** - * Creates new sling resource resolver instance. - * @param type Type of underlying repository. - * @return Resource resolver instance - * @deprecated Please use {@link #newResourceResolver(ResourceResolverType, BundleContext)} - * and shutdown the bundle context after usage. - */ - @Deprecated - public static ResourceResolver newResourceResolver(final ResourceResolverType type) { - ResourceResolverFactory factory = newResourceResolverFactory(type); - try { - return factory.getAdministrativeResourceResolver(null); - } catch (LoginException ex) { - throw new RuntimeException("Mock resource resolver factory implementation seems to require login.", ex); - } - } - - /** - * Creates new sling resource resolver instance using - * {@link #DEFAULT_RESOURCERESOLVER_TYPE}. - * @return Resource resolver instance - * @deprecated Please use {@link #newResourceResolver(BundleContext)} - * and shutdown the bundle context after usage. - */ - @Deprecated - public static ResourceResolver newResourceResolver() { - return newResourceResolver(DEFAULT_RESOURCERESOLVER_TYPE); - } - - /** * Creates new sling resource resolver instance. * @param type Type of underlying repository. * @param bundleContext Bundle context @@ -199,19 +145,6 @@ public final class MockSling { /** * Creates a new sling script helper instance using * {@link #DEFAULT_RESOURCERESOLVER_TYPE} for the resource resolver. - * @return Sling script helper instance - * @deprecated Please use {@link #newSlingScriptHelper(BundleContext)} - * and shutdown the bundle context after usage. - */ - @Deprecated - public static SlingScriptHelper newSlingScriptHelper() { - BundleContext bundleContext = MockOsgi.newBundleContext(); - return newSlingScriptHelper(bundleContext); - } - - /** - * Creates a new sling script helper instance using - * {@link #DEFAULT_RESOURCERESOLVER_TYPE} for the resource resolver. * @param bundleContext Bundle context * @return Sling script helper instance */ diff --git a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java index b34a57d..a0c9444 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/package-info.java @@ -19,5 +19,5 @@ /** * Mock implementation of selected Sling APIs. */ [email protected]("1.6") [email protected]("2.0") package org.apache.sling.testing.mock.sling; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java index dc251c5..798ad02 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java @@ -23,7 +23,6 @@ import java.util.ResourceBundle; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.i18n.ResourceBundleProvider; -import org.apache.sling.testing.mock.osgi.MockOsgi; import org.apache.sling.testing.mock.sling.MockSling; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -37,30 +36,10 @@ public class MockSlingHttpServletRequest extends org.apache.sling.servlethelpers /** * Instantiate with default resource resolver - * @deprecated Please use {@link #MockSlingHttpServletRequest(BundleContext)} - * and shutdown the bundle context after usage. - */ - @Deprecated - public MockSlingHttpServletRequest() { - this(MockOsgi.newBundleContext()); - } - - /** - * Instantiate with default resource resolver * @param bundleContext Bundle context */ public MockSlingHttpServletRequest(BundleContext bundleContext) { - this(MockSling.newResourceResolver(bundleContext)); - } - - /** - * @param resourceResolver Resource resolver - * @deprecated Please use {@link #MockSlingHttpServletRequest(ResourceResolver, BundleContext)} - * and shutdown the bundle context after usage. - */ - @Deprecated - public MockSlingHttpServletRequest(ResourceResolver resourceResolver) { - this(resourceResolver, MockOsgi.newBundleContext()); + this(MockSling.newResourceResolver(bundleContext), bundleContext); } /** diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java index 0408710..67c2cbd 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java @@ -19,5 +19,5 @@ /** * Mock implementation of selected Servlet-related Sling APIs. */ [email protected]("2.0") [email protected]("3.0") package org.apache.sling.testing.mock.sling.servlet; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
