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/07/13 23:07:00 UTC
svn commit: r1690822 - in /sling/trunk/bundles/resourceresolver: pom.xml
src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Author: cziegeler
Date: Mon Jul 13 21:07:00 2015
New Revision: 1690822
URL: http://svn.apache.org/r1690822
Log:
SLING-4750 : New resource provider API - start provider implementation
Modified:
sling/trunk/bundles/resourceresolver/pom.xml
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Modified: sling/trunk/bundles/resourceresolver/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1690822&r1=1690821&r2=1690822&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Mon Jul 13 21:07:00 2015
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.9.0</version>
+ <version>2.9.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
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=1690822&r1=1690821&r2=1690822&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 Mon Jul 13 21:07:00 2015
@@ -112,6 +112,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#clone(Map)
*/
+ @Override
public ResourceResolver clone(final Map<String, Object> authenticationInfo)
throws LoginException {
// ensure resolver is still live
@@ -138,6 +139,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#isLive()
*/
+ @Override
public boolean isLive() {
return !this.isClosed.get() && this.context.isLive() && this.factory.isLive();
}
@@ -145,6 +147,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#close()
*/
+ @Override
public void close() {
if ( this.isClosed.compareAndSet(false, true)) {
this.factory.unregister(this, this.context);
@@ -168,6 +171,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#getAttributeNames()
*/
+ @Override
public Iterator<String> getAttributeNames() {
checkClosed();
return this.factory.getRootProviderEntry().getAttributeNames(this.context, this);
@@ -176,6 +180,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#getAttribute(String)
*/
+ @Override
public Object getAttribute(final String name) {
checkClosed();
if (name == null) {
@@ -190,6 +195,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#resolve(java.lang.String)
*/
+ @Override
public Resource resolve(final String path) {
checkClosed();
@@ -200,6 +206,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#resolve(javax.servlet.http.HttpServletRequest)
*/
+ @Override
@SuppressWarnings("javadoc")
public Resource resolve(final HttpServletRequest request) {
checkClosed();
@@ -213,6 +220,7 @@ public class ResourceResolverImpl extend
* @see org.apache.sling.api.resource.ResourceResolver#resolve(javax.servlet.http.HttpServletRequest,
* java.lang.String)
*/
+ @Override
public Resource resolve(final HttpServletRequest request, String path) {
checkClosed();
@@ -363,6 +371,7 @@ public class ResourceResolverImpl extend
*
* @see org.apache.sling.api.resource.ResourceResolver#map(java.lang.String)
*/
+ @Override
public String map(final String resourcePath) {
checkClosed();
return map(null, resourcePath);
@@ -376,6 +385,7 @@ public class ResourceResolverImpl extend
* @see org.apache.sling.api.resource.ResourceResolver#map(javax.servlet.http.HttpServletRequest,
* java.lang.String)
*/
+ @Override
public String map(final HttpServletRequest request, final String resourcePath) {
checkClosed();
@@ -575,6 +585,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#getSearchPath()
*/
+ @Override
public String[] getSearchPath() {
checkClosed();
return factory.getSearchPath().clone();
@@ -585,6 +596,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#getResource(java.lang.String)
*/
+ @Override
public Resource getResource(String path) {
checkClosed();
final Resource result = this.getResourceInternal(path);
@@ -595,6 +607,7 @@ public class ResourceResolverImpl extend
* @see org.apache.sling.api.resource.ResourceResolver#getResource(org.apache.sling.api.resource.Resource,
* java.lang.String)
*/
+ @Override
public Resource getResource(final Resource base, final String path) {
checkClosed();
@@ -658,6 +671,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#listChildren(org.apache.sling.api.resource.Resource)
*/
+ @Override
public Iterator<Resource> listChildren(final Resource parent) {
checkClosed();
@@ -671,9 +685,11 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.Resource#getChildren()
*/
+ @Override
public Iterable<Resource> getChildren(final Resource parent) {
return new Iterable<Resource>() {
+ @Override
public Iterator<Resource> iterator() {
return listChildren(parent);
}
@@ -688,6 +704,7 @@ public class ResourceResolverImpl extend
* @see org.apache.sling.api.resource.ResourceResolver#findResources(java.lang.String,
* java.lang.String)
*/
+ @Override
public Iterator<Resource> findResources(final String query, final String language) throws SlingException {
checkClosed();
@@ -700,6 +717,7 @@ public class ResourceResolverImpl extend
* @see org.apache.sling.api.resource.ResourceResolver#queryResources(java.lang.String,
* java.lang.String)
*/
+ @Override
public Iterator<Map<String, Object>> queryResources(final String query, final String language)
throws SlingException {
checkClosed();
@@ -711,6 +729,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#getUserID()
*/
+ @Override
public String getUserID() {
checkClosed();
@@ -1095,6 +1114,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#delete(org.apache.sling.api.resource.Resource)
*/
+ @Override
public void delete(final Resource resource)
throws PersistenceException {
// check if the resource is non existing - throws NPE if resource is null as stated in the API
@@ -1109,6 +1129,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#create(org.apache.sling.api.resource.Resource, java.lang.String, Map)
*/
+ @Override
public Resource create(final Resource parent, final String name, final Map<String, Object> properties)
throws PersistenceException {
// if parent or name is null, we get an NPE as stated in the API
@@ -1136,6 +1157,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#revert()
*/
+ @Override
public void revert() {
this.context.revert(this);
}
@@ -1143,6 +1165,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#commit()
*/
+ @Override
public void commit() throws PersistenceException {
this.context.commit(this);
}
@@ -1150,6 +1173,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#hasChanges()
*/
+ @Override
public boolean hasChanges() {
return this.context.hasChanges(this);
}
@@ -1157,13 +1181,15 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#hasChildren()
*/
- public boolean hasChildren(Resource resource) {
+ @Override
+ public boolean hasChildren(Resource resource) {
return listChildren(resource).hasNext();
}
/**
* @see org.apache.sling.api.resource.ResourceResolver#getParentResourceType(org.apache.sling.api.resource.Resource)
*/
+ @Override
public String getParentResourceType(final Resource resource) {
String resourceSuperType = null;
if ( resource != null ) {
@@ -1178,6 +1204,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#getParentResourceType(java.lang.String)
*/
+ @Override
public String getParentResourceType(final String resourceType) {
return this.context.getParentResourceType(this.factory, this, resourceType);
}
@@ -1185,6 +1212,7 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#isResourceType(org.apache.sling.api.resource.Resource, java.lang.String)
*/
+ @Override
public boolean isResourceType(final Resource resource, final String resourceType) {
boolean result = false;
if ( resource != null && resourceType != null ) {
@@ -1211,7 +1239,24 @@ public class ResourceResolverImpl extend
/**
* @see org.apache.sling.api.resource.ResourceResolver#refresh()
*/
+ @Override
public void refresh() {
this.context.refresh();
}
+
+ @Override
+ public Resource getParent(final Resource child) {
+ // TODO Auto-generated method stub
+ return this.getResource(ResourceUtil.getParent(child.getPath()));
+ }
+
+ @Override
+ public void copy(final String srcAbsPath, final String destAbsPath) throws PersistenceException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void move(final String srcAbsPath, final String destAbsPath) throws PersistenceException {
+ throw new UnsupportedOperationException();
+ }
}