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 2015/05/05 12:26:45 UTC
svn commit: r1677775 - in
/sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource:
AbstractResource.java ResourceResolver.java package-info.java
Author: cziegeler
Date: Tue May 5 10:26:45 2015
New Revision: 1677775
URL: http://svn.apache.org/r1677775
Log:
Add getParent method to resource resolver
Modified:
sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/AbstractResource.java
sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/package-info.java
Modified: sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/AbstractResource.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/AbstractResource.java?rev=1677775&r1=1677774&r2=1677775&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/AbstractResource.java (original)
+++ sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/AbstractResource.java Tue May 5 10:26:45 2015
@@ -49,6 +49,7 @@ public abstract class AbstractResource
* {@link ResourceUtil#getName(String)} method with the path of this
* resource.
*/
+ @Override
public String getName() {
return ResourceUtil.getName(getPath());
}
@@ -60,12 +61,9 @@ public abstract class AbstractResource
* calling the {@link ResourceUtil#getParent(String)} method and then to
* retrieve that resource from the resource resolver.
*/
+ @Override
public Resource getParent() {
- final String parentPath = ResourceUtil.getParent(getPath());
- if (parentPath == null) {
- return null;
- }
- return getResourceResolver().getResource(parentPath);
+ return getResourceResolver().getParent(this);
}
/**
@@ -80,6 +78,7 @@ public abstract class AbstractResource
* Implementations should not generally overwrite this method without
* calling this base class implementation.
*/
+ @Override
public Resource getChild(String relPath) {
return getResourceResolver().getResource(this, relPath);
}
@@ -93,6 +92,7 @@ public abstract class AbstractResource
* Implementations should not generally overwrite this method without
* calling this base class implementation.
*/
+ @Override
public Iterator<Resource> listChildren() {
return getResourceResolver().listChildren(this);
}
@@ -100,9 +100,11 @@ public abstract class AbstractResource
/**
* @see org.apache.sling.api.resource.Resource#getChildren()
*/
+ @Override
public Iterable<Resource> getChildren() {
return new Iterable<Resource>() {
+ @Override
public Iterator<Resource> iterator() {
return listChildren();
}
@@ -113,6 +115,7 @@ public abstract class AbstractResource
* Checks to see if there are direct children of this resource by invoking
* {@link ResourceResolver#hasChildren(Resource)}.
*/
+ @Override
public boolean hasChildren() {
return getResourceResolver().hasChildren(this);
}
@@ -123,6 +126,7 @@ public abstract class AbstractResource
* <p>
* This method delegates to {@link ResourceResolver#isResourceType(Resource, String)}
*/
+ @Override
public boolean isResourceType(final String resourceType) {
return this.getResourceResolver().isResourceType(this, resourceType);
}
@@ -136,6 +140,7 @@ public abstract class AbstractResource
* the adaptions are not successful an empty value map is returned.
* @see org.apache.sling.api.resource.Resource#getValueMap()
*/
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public ValueMap getValueMap() {
// adapt to ValueMap if resource is not null
Modified: sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/ResourceResolver.java?rev=1677775&r1=1677774&r2=1677775&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/ResourceResolver.java (original)
+++ sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/ResourceResolver.java Tue May 5 10:26:45 2015
@@ -381,6 +381,8 @@ public interface ResourceResolver extend
*/
@Nonnull Iterator<Resource> listChildren(@Nonnull Resource parent);
+ @CheckForNull Resource getParent(@Nonnull Resource parent);
+
/**
* Returns an <code>Iterable</code> of {@link Resource} objects loaded from
* the children of the given <code>Resource</code>.
Modified: sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/package-info.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/package-info.java?rev=1677775&r1=1677774&r2=1677775&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/package-info.java (original)
+++ sling/whiteboard/cziegeler/api-v3/src/main/java/org/apache/sling/api/resource/package-info.java Tue May 5 10:26:45 2015
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.8.0")
+@Version("2.9.0")
package org.apache.sling.api.resource;
import aQute.bnd.annotation.Version;