SLING-11073: rename OriginalResourceViaProvider to OriginalResourceTypeViaProvider (#33)
In order to make it clear that this is the counterpart of ResourceSuperTypeViaProvider and ForcedResourceTypeViaProvider.
diff --git a/src/main/java/org/apache/sling/models/impl/via/OriginalResourceViaProvider.java b/src/main/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProvider.java
similarity index 91%
rename from src/main/java/org/apache/sling/models/impl/via/OriginalResourceViaProvider.java
rename to src/main/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProvider.java
index 250eceb..00ef495 100644
--- a/src/main/java/org/apache/sling/models/impl/via/OriginalResourceViaProvider.java
+++ b/src/main/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProvider.java
@@ -19,26 +19,26 @@
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.ViaProviderType;
-import org.apache.sling.models.annotations.via.OriginalResource;
+import org.apache.sling.models.annotations.via.OriginalResourceType;
import org.apache.sling.models.spi.ViaProvider;
import org.osgi.service.component.annotations.Component;
/**
- * This {@link ViaProvider} implements the counterpart of the {@link ForcedResourceTypeViaProvider} and
+ * This {@link ViaProvider} implements the counterpart of the {@link ForcedResourceTypeViaProvider} and the
* {@link ResourceSuperTypeViaProvider}. It is in particular helpful in models that want to inject another model using the original
- * {@link Resource}'s or {@link SlingHttpServletRequest}'s resource type instead of the one forced by either of the above-mentioned via
- * providers.
+ * {@link Resource}'s or {@link SlingHttpServletRequest}'s resource type instead of the one forced by either of the above-mentioned
+ * {@link ViaProvider}s
* <p>
* The implementation simply unwraps the {@link org.apache.sling.api.resource.ResourceWrapper} or
* {@link org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper} used by the {@link ForcedResourceTypeViaProvider} and
* {@link ResourceSuperTypeViaProvider}.
*/
@Component
-public class OriginalResourceViaProvider implements ViaProvider {
+public class OriginalResourceTypeViaProvider implements ViaProvider {
@Override
public Class<? extends ViaProviderType> getType() {
- return OriginalResource.class;
+ return OriginalResourceType.class;
}
@Override
diff --git a/src/test/java/org/apache/sling/models/impl/via/OriginalResourceViaProviderTest.java b/src/test/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProviderTest.java
similarity index 92%
rename from src/test/java/org/apache/sling/models/impl/via/OriginalResourceViaProviderTest.java
rename to src/test/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProviderTest.java
index 28358af..a793b0c 100644
--- a/src/test/java/org/apache/sling/models/impl/via/OriginalResourceViaProviderTest.java
+++ b/src/test/java/org/apache/sling/models/impl/via/OriginalResourceTypeViaProviderTest.java
@@ -20,7 +20,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceWrapper;
import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
-import org.apache.sling.models.annotations.via.OriginalResource;
+import org.apache.sling.models.annotations.via.OriginalResourceType;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -30,9 +30,9 @@
import static org.junit.Assert.assertNull;
@RunWith(MockitoJUnitRunner.class)
-public class OriginalResourceViaProviderTest {
+public class OriginalResourceTypeViaProviderTest {
- private OriginalResourceViaProvider provider = new OriginalResourceViaProvider();
+ private OriginalResourceTypeViaProvider provider = new OriginalResourceTypeViaProvider();
@Mock
private Resource resource;
@@ -42,7 +42,7 @@
@Test
public void testReturnsCorrectMarkerInterface() {
- assertEquals(OriginalResource.class, provider.getType());
+ assertEquals(OriginalResourceType.class, provider.getType());
}
@Test
