SLING-12739 - IgnoredServletResourcePredicate, even clearer
diff --git a/src/main/java/org/apache/sling/servlets/resolver/api/IgnoredResourcePredicate.java b/src/main/java/org/apache/sling/servlets/resolver/api/IgnoredServletResourcePredicate.java
similarity index 94%
rename from src/main/java/org/apache/sling/servlets/resolver/api/IgnoredResourcePredicate.java
rename to src/main/java/org/apache/sling/servlets/resolver/api/IgnoredServletResourcePredicate.java
index e0f7200..41550ab 100644
--- a/src/main/java/org/apache/sling/servlets/resolver/api/IgnoredResourcePredicate.java
+++ b/src/main/java/org/apache/sling/servlets/resolver/api/IgnoredServletResourcePredicate.java
@@ -32,5 +32,5 @@
* the servlets resolver.
*/
@ConsumerType
-public interface IgnoredResourcePredicate extends Predicate<Resource> {
+public interface IgnoredServletResourcePredicate extends Predicate<Resource> {
}
diff --git a/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java b/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
index daf9573..12b3b68 100644
--- a/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
+++ b/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
@@ -54,7 +54,7 @@
import org.apache.sling.api.servlets.ServletResolver;
import org.apache.sling.api.servlets.ServletResolverConstants;
import org.apache.sling.serviceusermapping.ServiceUserMapped;
-import org.apache.sling.servlets.resolver.api.IgnoredResourcePredicate;
+import org.apache.sling.servlets.resolver.api.IgnoredServletResourcePredicate;
import org.apache.sling.servlets.resolver.internal.defaults.DefaultErrorHandlerServlet;
import org.apache.sling.servlets.resolver.internal.defaults.DefaultServlet;
import org.apache.sling.servlets.resolver.internal.helper.AbstractResourceCollector;
@@ -137,7 +137,7 @@
policy = ReferencePolicy.DYNAMIC,
cardinality = ReferenceCardinality.OPTIONAL
)
- private volatile IgnoredResourcePredicate ignoredResourcePredicate;
+ private volatile IgnoredServletResourcePredicate ignoredResourcePredicate;
/**
* The allowed execution paths.
diff --git a/src/test/java/org/apache/sling/servlets/resolver/internal/AbsoluteResourceTypeTest.java b/src/test/java/org/apache/sling/servlets/resolver/internal/AbsoluteResourceTypeTest.java
index 147c033..1315bf7 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/internal/AbsoluteResourceTypeTest.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/internal/AbsoluteResourceTypeTest.java
@@ -39,7 +39,7 @@
import org.apache.sling.api.resource.PersistenceException;
import org.osgi.framework.Bundle;
-import org.apache.sling.servlets.resolver.api.IgnoredResourcePredicate;
+import org.apache.sling.servlets.resolver.api.IgnoredServletResourcePredicate;
import org.apache.sling.servlets.resolver.internal.resource.MockServletResource;
public class AbsoluteResourceTypeTest extends SlingServletResolverTestBase {
@@ -114,7 +114,7 @@
@Test
public void testAbsolutePathHiddenByPredicate() throws Exception {
- final IgnoredResourcePredicate hideAbsolutePath = r -> r.getPath().equals(absolutePath);
+ final IgnoredServletResourcePredicate hideAbsolutePath = r -> r.getPath().equals(absolutePath);
final Field f = servletResolver.getClass().getDeclaredField("ignoredResourcePredicate");
f.setAccessible(true);
f.set(servletResolver, hideAbsolutePath);
diff --git a/src/test/java/org/apache/sling/servlets/resolver/internal/resourcehiding/ServletHidingTest.java b/src/test/java/org/apache/sling/servlets/resolver/internal/resourcehiding/ServletHidingTest.java
index 2f84636..9a6b285 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/internal/resourcehiding/ServletHidingTest.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/internal/resourcehiding/ServletHidingTest.java
@@ -35,7 +35,7 @@
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
-import org.apache.sling.servlets.resolver.api.IgnoredResourcePredicate;
+import org.apache.sling.servlets.resolver.api.IgnoredServletResourcePredicate;
import org.apache.sling.servlets.resolver.internal.SlingServletResolverTestBase;
import org.apache.sling.servlets.resolver.internal.helper.HelperTestBase;
import org.apache.sling.servlets.resolver.internal.resource.MockServletResource;
@@ -58,7 +58,7 @@
}
}
- private void setServletHidingFilter(IgnoredResourcePredicate predicate) throws Exception {
+ private void setServletHidingFilter(IgnoredServletResourcePredicate predicate) throws Exception {
final Field predicateField = servletResolver.getClass().getDeclaredField("ignoredResourcePredicate");
predicateField.setAccessible(true);
predicateField.set(servletResolver, predicate);
@@ -101,7 +101,7 @@
@Test
public void testHideAndSeek() throws Exception {
final AtomicBoolean hide = new AtomicBoolean();
- final IgnoredResourcePredicate pred = r -> hide.get();
+ final IgnoredServletResourcePredicate pred = r -> hide.get();
// No filtering
setServletHidingFilter(null);
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/resourcehiding/ResourceHidingITBase.java b/src/test/java/org/apache/sling/servlets/resolver/it/resourcehiding/ResourceHidingITBase.java
index baaf774..6221ea3 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/resourcehiding/ResourceHidingITBase.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/resourcehiding/ResourceHidingITBase.java
@@ -21,7 +21,7 @@
import java.util.UUID;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.servlets.resolver.api.IgnoredResourcePredicate;
+import org.apache.sling.servlets.resolver.api.IgnoredServletResourcePredicate;
import org.apache.sling.servlets.resolver.it.ServletResolverTestSupport;
import org.apache.sling.servlets.resolver.it.TestServlet;
import org.junit.Before;
@@ -64,8 +64,8 @@
.register(bundleContext);
}
- protected void registerPredicate(IgnoredResourcePredicate p) {
- final IgnoredResourcePredicate wrappedPredicate = new IgnoredResourcePredicate() {
+ protected void registerPredicate(IgnoredServletResourcePredicate p) {
+ final IgnoredServletResourcePredicate wrappedPredicate = new IgnoredServletResourcePredicate() {
@Override
public boolean test(Resource r) {
final boolean result = p.test(r);
@@ -75,6 +75,6 @@
return result;
}
};
- bundleContext.registerService(IgnoredResourcePredicate.class.getName(), wrappedPredicate, null);
+ bundleContext.registerService(IgnoredServletResourcePredicate.class.getName(), wrappedPredicate, null);
}
}
\ No newline at end of file
