You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/02/23 01:33:26 UTC
svn commit: r1731765 - in
/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling:
MockSling.java package-info.java servlet/MockSlingHttpServletRequest.java
servlet/package-info.java
Author: sseifert
Date: Tue Feb 23 00:33:26 2016
New Revision: 1731765
URL: http://svn.apache.org/viewvc?rev=1731765&view=rev
Log:
SLING-5546 remove deprecated methods
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java?rev=1731765&r1=1731764&r2=1731765&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java Tue Feb 23 00:33:26 2016
@@ -26,7 +26,6 @@ import org.apache.sling.api.resource.Res
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
@@ -197,19 +143,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
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/package-info.java?rev=1731765&r1=1731764&r2=1731765&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/package-info.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/package-info.java Tue Feb 23 00:33:26 2016
@@ -19,5 +19,5 @@
/**
* Mock implementation of selected Sling APIs.
*/
-@aQute.bnd.annotation.Version("1.6")
+@aQute.bnd.annotation.Version("2.0")
package org.apache.sling.testing.mock.sling;
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java?rev=1731765&r1=1731764&r2=1731765&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java Tue Feb 23 00:33:26 2016
@@ -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
/**
* 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);
}
/**
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java?rev=1731765&r1=1731764&r2=1731765&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java Tue Feb 23 00:33:26 2016
@@ -19,5 +19,5 @@
/**
* Mock implementation of selected Servlet-related Sling APIs.
*/
-@aQute.bnd.annotation.Version("2.0")
+@aQute.bnd.annotation.Version("3.0")
package org.apache.sling.testing.mock.sling.servlet;