Author: cziegeler
Date: Mon Mar 27 09:39:03 2017
New Revision: 1788863
URL: http://svn.apache.org/viewvc?rev=1788863&view=rev
Log:
SLING-6716 : Migrate to R6 annotations, clean up dependencies
Removed:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ServletResolverConstants.java
sling/trunk/bundles/servlets/resolver/src/main/resources/
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/NamedScriptResourceCollector.java
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=1788863&r1=1788862&r2=1788863&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Mon Mar 27 09:39:03 2017
@@ -22,7 +22,8 @@ import static org.apache.sling.api.Sling
import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
import static org.apache.sling.api.SlingConstants.ERROR_STATUS;
import static org.apache.sling.api.SlingConstants.SLING_CURRENT_SERVLET_NAME;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERLVET_NAME;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.DEFAULT_ERROR_HANDLER_RESOURCE_TYPE;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_NAME;
import static org.osgi.framework.Constants.SERVICE_ID;
import static org.osgi.framework.Constants.SERVICE_PID;
import static org.osgi.service.component.ComponentConstants.COMPONENT_NAME;
@@ -59,6 +60,7 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.request.RequestUtil;
+import org.apache.sling.api.request.ResponseUtil;
import org.apache.sling.api.request.SlingRequestEvent;
import org.apache.sling.api.request.SlingRequestListener;
import org.apache.sling.api.resource.LoginException;
@@ -74,7 +76,7 @@ import org.apache.sling.api.scripting.Sl
import org.apache.sling.api.scripting.SlingScriptResolver;
import org.apache.sling.api.servlets.OptingServlet;
import org.apache.sling.api.servlets.ServletResolver;
-import org.apache.sling.engine.ResponseUtil;
+import org.apache.sling.api.servlets.ServletResolverConstants;
import org.apache.sling.engine.servlets.ErrorHandler;
import
org.apache.sling.servlets.resolver.internal.defaults.DefaultErrorHandlerServlet;
import org.apache.sling.servlets.resolver.internal.defaults.DefaultServlet;
@@ -430,7 +432,7 @@ public class SlingServletResolver
// find a servlet for the status as the method name
ResourceCollector locationUtil = new
ResourceCollector(String.valueOf(status),
- ServletResolverConstants.ERROR_HANDLER_PATH, resource,
+ DEFAULT_ERROR_HANDLER_RESOURCE_TYPE, resource,
this.executionPaths);
Servlet servlet = getServletInternal(locationUtil, request,
scriptResolver);
@@ -487,7 +489,7 @@ public class SlingServletResolver
while (servlet == null && tClass != Object.class) {
// find a servlet for the simple class name as the method name
ResourceCollector locationUtil = new
ResourceCollector(tClass.getSimpleName(),
- ServletResolverConstants.ERROR_HANDLER_PATH, resource,
+ DEFAULT_ERROR_HANDLER_RESOURCE_TYPE, resource,
this.executionPaths);
servlet = getServletInternal(locationUtil, request,
scriptResolver);
@@ -564,7 +566,7 @@ public class SlingServletResolver
Resource res = request.getResource();
if (res == null) {
res = new SyntheticResource(request.getResourceResolver(),
request.getPathInfo(),
- ServletResolverConstants.ERROR_HANDLER_PATH);
+ DEFAULT_ERROR_HANDLER_RESOURCE_TYPE);
}
return res;
}
@@ -731,8 +733,8 @@ public class SlingServletResolver
// find a default error handler according to the resource type
// tree of the given resource
final ResourceCollector locationUtil = new ResourceCollector(
- ServletResolverConstants.DEFAULT_ERROR_HANDLER_NAME,
- ServletResolverConstants.ERROR_HANDLER_PATH, resource,
+ ServletResolverConstants.DEFAULT_ERROR_HANDLER_METHOD,
+ DEFAULT_ERROR_HANDLER_RESOURCE_TYPE, resource,
this.executionPaths);
final Servlet servlet = getServletInternal(locationUtil, request,
resolver);
if (servlet != null) {
@@ -1098,7 +1100,7 @@ public class SlingServletResolver
}
/** The list of property names checked by {@link
#getName(ServiceReference)} */
- private static final String[] NAME_PROPERTIES = { SLING_SERLVET_NAME,
+ private static final String[] NAME_PROPERTIES = { SLING_SERVLET_NAME,
COMPONENT_NAME, SERVICE_PID, SERVICE_ID };
/**
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/NamedScriptResourceCollector.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/NamedScriptResourceCollector.java?rev=1788863&r1=1788862&r2=1788863&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/NamedScriptResourceCollector.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/NamedScriptResourceCollector.java
Mon Mar 27 09:39:03 2017
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.servlets.resolver.internal.ServletResolverConstants;
+import org.apache.sling.api.servlets.ServletResolverConstants;
/**
* The <code>ResourceCollector</code> class provides a single public method -
@@ -47,7 +47,7 @@ public class NamedScriptResourceCollecto
if ( resource != null ) {
resourceType = resource.getResourceType();
resourceSuperType = resource.getResourceSuperType();
- baseResourceType = ServletResolverConstants.DEFAULT_SERVLET_NAME;
+ baseResourceType = ServletResolverConstants.DEFAULT_RESOURCE_TYPE;
} else {
resourceType = "";
resourceSuperType = null;
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java?rev=1788863&r1=1788862&r2=1788863&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
Mon Mar 27 09:39:03 2017
@@ -27,7 +27,7 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.servlets.resolver.internal.ServletResolverConstants;
+import org.apache.sling.api.servlets.ServletResolverConstants;
import
org.apache.sling.servlets.resolver.internal.resource.ServletResourceProviderFactory;
/**
@@ -119,7 +119,7 @@ public class ResourceCollector extends A
final String[] executionPaths) {
super((baseResourceType != null
? baseResourceType
- : ServletResolverConstants.DEFAULT_SERVLET_NAME),
+ : ServletResolverConstants.DEFAULT_RESOURCE_TYPE),
resource.getResourceType(), resource.getResourceSuperType(),
null, executionPaths);
this.methodName = methodName;
@@ -158,7 +158,7 @@ public class ResourceCollector extends A
final boolean isDefaultExtension,
final String methodName,
final String[] selectors) {
- super(ServletResolverConstants.DEFAULT_SERVLET_NAME,
+ super(ServletResolverConstants.DEFAULT_RESOURCE_TYPE,
resource.getResourceType(),
resource.getResourceSuperType(),
extension, executionPaths);
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java?rev=1788863&r1=1788862&r2=1788863&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
Mon Mar 27 09:39:03 2017
@@ -18,12 +18,12 @@
*/
package org.apache.sling.servlets.resolver.internal.resource;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_METHODS;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_PATHS;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_PREFIX;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERVLET_SELECTORS;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_METHODS;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_PATHS;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_PREFIX;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.SLING_SERVLET_SELECTORS;
import java.util.HashSet;
import java.util.Set;
Modified:
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java?rev=1788863&r1=1788862&r2=1788863&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java
Mon Mar 27 09:39:03 2017
@@ -20,7 +20,6 @@ package org.apache.sling.servlets.resolv
import static junit.framework.TestCase.assertNull;
import static junit.framework.TestCase.assertTrue;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.SLING_SERLVET_NAME;
import static org.junit.Assert.assertEquals;
import java.lang.annotation.Annotation;
@@ -41,6 +40,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.servlets.OptingServlet;
+import org.apache.sling.api.servlets.ServletResolverConstants;
import org.apache.sling.commons.testing.osgi.MockBundle;
import org.apache.sling.commons.testing.osgi.MockBundleContext;
import org.apache.sling.commons.testing.osgi.MockComponentContext;
@@ -158,10 +158,10 @@ public class SlingServletResolverTest {
bundleContext, SlingServletResolverTest.this.servlet);
MockServiceReference serviceReference = new
MockServiceReference(bundle);
serviceReference.setProperty(Constants.SERVICE_ID, 1L);
- serviceReference.setProperty(SLING_SERLVET_NAME,
+
serviceReference.setProperty(ServletResolverConstants.SLING_SERVLET_NAME,
SERVLET_NAME);
serviceReference.setProperty(
- ServletResolverConstants.SLING_SERVLET_PATHS, SERVLET_PATH);
+ ServletResolverConstants.SLING_SERVLET_PATHS, SERVLET_PATH);
serviceReference.setProperty(
ServletResolverConstants.SLING_SERVLET_EXTENSIONS,
SERVLET_EXTENSION);
Modified:
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java?rev=1788863&r1=1788862&r2=1788863&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/helper/LocationIteratorTest.java
Mon Mar 27 09:39:03 2017
@@ -18,7 +18,7 @@
*/
package org.apache.sling.servlets.resolver.internal.helper;
-import static
org.apache.sling.servlets.resolver.internal.ServletResolverConstants.DEFAULT_SERVLET_NAME;
+import static
org.apache.sling.api.servlets.ServletResolverConstants.DEFAULT_RESOURCE_TYPE;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
@@ -28,7 +28,7 @@ public class LocationIteratorTest extend
private LocationIterator getLocationIterator(final String resourceType,
final String resourceSuperType) {
- return this.getLocationIterator(resourceType, resourceSuperType,
DEFAULT_SERVLET_NAME);
+ return this.getLocationIterator(resourceType, resourceSuperType,
DEFAULT_RESOURCE_TYPE);
}
private LocationIterator getLocationIterator(final String resourceType,
@@ -55,7 +55,7 @@ public class LocationIteratorTest extend
// 2. /sling/servlet/default
assertTrue(li.hasNext());
- assertEquals("/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals("/" + DEFAULT_RESOURCE_TYPE, li.next());
// 3. finished
assertFalse(li.hasNext());
@@ -75,7 +75,7 @@ public class LocationIteratorTest extend
// 2. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 3. finished
assertFalse(li.hasNext());
@@ -100,11 +100,11 @@ public class LocationIteratorTest extend
// 3. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 4. /libs/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root1 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root1 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 5. finished
assertFalse(li.hasNext());
@@ -129,7 +129,7 @@ public class LocationIteratorTest extend
// 2. /sling/servlet/default
assertTrue(li.hasNext());
- assertEquals("/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals("/" + DEFAULT_RESOURCE_TYPE, li.next());
// 3. finished
assertFalse(li.hasNext());
@@ -154,7 +154,7 @@ public class LocationIteratorTest extend
// 2. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 3. finished
assertFalse(li.hasNext());
@@ -180,11 +180,11 @@ public class LocationIteratorTest extend
// 2. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 3. /libs/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root1 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root1 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 4. finished
assertFalse(li.hasNext());
@@ -213,7 +213,7 @@ public class LocationIteratorTest extend
// 3. /sling/servlet/default
assertTrue(li.hasNext());
- assertEquals("/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals("/" + DEFAULT_RESOURCE_TYPE, li.next());
// 4. finished
assertFalse(li.hasNext());
@@ -242,7 +242,7 @@ public class LocationIteratorTest extend
// 3. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 4. finished
assertFalse(li.hasNext());
@@ -280,11 +280,11 @@ public class LocationIteratorTest extend
// 5. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 6. /libs/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root1 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root1 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 7. finished
assertFalse(li.hasNext());
@@ -318,7 +318,7 @@ public class LocationIteratorTest extend
// 3. /sling/servlet/default
assertTrue(li.hasNext());
- assertEquals("/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals("/" + DEFAULT_RESOURCE_TYPE, li.next());
// 4. finished
assertFalse(li.hasNext());
@@ -352,7 +352,7 @@ public class LocationIteratorTest extend
// 3. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 4. finished
assertFalse(li.hasNext());
@@ -391,11 +391,11 @@ public class LocationIteratorTest extend
// 4. /apps/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 5. /libs/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root1 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root1 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 6. finished
assertFalse(li.hasNext());
@@ -426,9 +426,9 @@ public class LocationIteratorTest extend
assertTrue(li.hasNext());
assertEquals(root1 + "/a/b", li.next());
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
assertTrue(li.hasNext());
- assertEquals(root1 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root1 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
assertFalse(li.hasNext());
}
@@ -447,9 +447,9 @@ public class LocationIteratorTest extend
assertTrue(li.hasNext());
assertEquals(root1 + "/c/d", li.next());
assertTrue(li.hasNext());
- assertEquals(root0 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root0 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
assertTrue(li.hasNext());
- assertEquals(root1 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root1 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
assertFalse(li.hasNext());
}
@@ -488,7 +488,7 @@ public class LocationIteratorTest extend
// 4. /libs/sling/servlet/default
assertTrue(li.hasNext());
- assertEquals(root1 + "/" + DEFAULT_SERVLET_NAME, li.next());
+ assertEquals(root1 + "/" + DEFAULT_RESOURCE_TYPE, li.next());
// 5. finished
assertFalse(li.hasNext());
Modified:
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java?rev=1788863&r1=1788862&r2=1788863&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderCreateTest.java
Mon Mar 27 09:39:03 2017
@@ -26,12 +26,12 @@ import javax.servlet.Servlet;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import junit.framework.TestCase;
-
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.servlets.HttpConstants;
+import org.apache.sling.api.servlets.ServletResolverConstants;
import org.apache.sling.commons.testing.osgi.MockServiceReference;
-import org.apache.sling.servlets.resolver.internal.ServletResolverConstants;
+
+import junit.framework.TestCase;
public class ServletResourceProviderCreateTest extends TestCase {
@@ -64,7 +64,7 @@ public class ServletResourceProviderCrea
assertNotNull(paths);
assertEquals(2, paths.length);
- Set<String> checkerSet = new HashSet<String>();
+ Set<String> checkerSet = new HashSet<>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_GET
+ ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_HEAD
@@ -92,7 +92,7 @@ public class ServletResourceProviderCrea
assertNotNull(paths);
assertEquals(1, paths.length);
- Set<String> checkerSet = new HashSet<String>();
+ Set<String> checkerSet = new HashSet<>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_GET
+ ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
@@ -119,7 +119,7 @@ public class ServletResourceProviderCrea
assertNotNull(paths);
assertEquals(3, paths.length);
- Set<String> checkerSet = new HashSet<String>();
+ Set<String> checkerSet = new HashSet<>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_GET
+ ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_POST
@@ -149,7 +149,7 @@ public class ServletResourceProviderCrea
assertNotNull(paths);
assertEquals(1, paths.length);
- Set<String> checkerSet = new HashSet<String>();
+ Set<String> checkerSet = new HashSet<>();
checkerSet.add(ROOT + RES_TYPE_PATH
+ ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
@@ -180,7 +180,7 @@ public class ServletResourceProviderCrea
assertNotNull(paths);
assertEquals(1, paths.length);
- Set<String> checkerSet = new HashSet<String>();
+ Set<String> checkerSet = new HashSet<>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/ext.json."
+ HttpConstants.METHOD_GET
+ ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
@@ -209,7 +209,7 @@ public class ServletResourceProviderCrea
assertNotNull(paths);
assertEquals(4, paths.length);
- Set<String> checkerSet = new HashSet<String>();
+ Set<String> checkerSet = new HashSet<>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/json."
+ HttpConstants.METHOD_GET
+ ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
