You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2013/02/26 12:04:40 UTC
svn commit: r1450131 - in /sling/trunk/bundles:
api/src/main/java/org/apache/sling/api/resource/
resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/
resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/
Author: cziegeler
Date: Tue Feb 26 11:04:40 2013
New Revision: 1450131
URL: http://svn.apache.org/r1450131
Log:
SLING-2739 : Add methods for handling the resource type hierarchy to the resource resolver
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java?rev=1450131&r1=1450130&r2=1450131&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceResolver.java Tue Feb 26 11:04:40 2013
@@ -584,7 +584,7 @@ public interface ResourceResolver extend
* Returns the super type of the given resource. This method checks first if
* the resource itself knows its super type by calling
* {@link Resource#getResourceSuperType()}. If that returns
- * <code>null</code> {@link #getParentSuperType(String)}
+ * <code>null</code> {@link #getParentResourceType(String)}
* is invoked with the resource type of the resource.
*
* @param resource The resource to return the resource super type for.
@@ -608,7 +608,7 @@ public interface ResourceResolver extend
* <code>null</code> if <code>resourceType> is null.
* @since 2.3
*/
- public String getParentSuperType(final String resourceType);
+ public String getParentResourceType(final String resourceType);
/**
* Returns <code>true</code> if the resource type or any of the resource's
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java?rev=1450131&r1=1450130&r2=1450131&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java Tue Feb 26 11:04:40 2013
@@ -400,7 +400,7 @@ public class ResourceUtil {
* the resource type to a resource path by calling
* {@link #resourceTypeToPath(String)} and uses the
* <code>resourceResolver</code> to get the corresponding resource. If the
- * resource exists, the {@link Resource#getResourceSuperType()} metod is
+ * resource exists, the {@link Resource#getResourceSuperType()} method is
* called.
*
* @param resourceResolver The <code>ResourceResolver</code> used to access
@@ -414,12 +414,12 @@ public class ResourceUtil {
* <code>null</code> if the resource type does not exists or returns
* <code>null</code> for its super type.
* @since 2.0.6
- * @deprecated Use {@link ResourceResolver#getParentSuperType(String)}
+ * @deprecated Use {@link ResourceResolver#getParentResourceType(String)}
*/
@Deprecated
public static String getResourceSuperType(
final ResourceResolver resourceResolver, final String resourceType) {
- return resourceResolver.getParentSuperType(resourceType);
+ return resourceResolver.getParentResourceType(resourceType);
}
/**
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java?rev=1450131&r1=1450130&r2=1450131&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java Tue Feb 26 11:04:40 2013
@@ -1092,16 +1092,16 @@ public class ResourceResolverImpl extend
if ( resource != null ) {
resourceSuperType = resource.getResourceSuperType();
if (resourceSuperType == null) {
- resourceSuperType = this.getParentSuperType(resource.getResourceType());
+ resourceSuperType = this.getParentResourceType(resource.getResourceType());
}
}
return resourceSuperType;
}
/**
- * @see org.apache.sling.api.resource.ResourceResolver#getParentSuperType(java.lang.String)
+ * @see org.apache.sling.api.resource.ResourceResolver#getParentResourceType(java.lang.String)
*/
- public String getParentSuperType(final String resourceType) {
+ public String getParentResourceType(final String resourceType) {
// normalize resource type to a path string
final String rtPath = (resourceType == null ? null : ResourceUtil.resourceTypeToPath(resourceType));
// get the resource type resource and check its super type
@@ -1143,7 +1143,7 @@ public class ResourceResolverImpl extend
if (resourceType.equals(superType)) {
result = true;
} else {
- superType = this.getParentSuperType(superType);
+ superType = this.getParentResourceType(superType);
}
}
}
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java?rev=1450131&r1=1450130&r2=1450131&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java Tue Feb 26 11:04:40 2013
@@ -370,8 +370,8 @@ public class ResourceResolverImplTest {
resolver.setResource("/a", r);
resolver.setResource("/a/b", typeResource);
- assertEquals("t:c", resolver.getParentSuperType(r.getResourceType()));
- assertNull(resolver.getParentSuperType(r2.getResourceType()));
+ assertEquals("t:c", resolver.getParentResourceType(r.getResourceType()));
+ assertNull(resolver.getParentResourceType(r2.getResourceType()));
}
@Test public void test_isA() {