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 2012/07/27 14:30:18 UTC
svn commit: r1366366 - in /sling/trunk/bundles:
api/src/main/java/org/apache/sling/api/resource/
jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/
jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/
jcr/resour...
Author: cziegeler
Date: Fri Jul 27 12:30:18 2012
New Revision: 1366366
URL: http://svn.apache.org/viewvc?rev=1366366&view=rev
Log:
SLING-2530 : Implement CRUD based on resources
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
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/ResourceWrapper.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/MockResourceResolver.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/tree/ResourceProviderEntryTest.java
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java?rev=1366366&r1=1366365&r2=1366366&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java Fri Jul 27 12:30:18 2012
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.resource;
+import java.util.Map;
+
/**
* A modifying resource provider is an extension of a resource provider which
* is only supported if the resource provider has been created through
@@ -45,7 +47,7 @@ public interface ModifyingResourceProvid
*
* @throws PersistenceException If anything fails
*/
- Resource create(ResourceResolver resolver, String path, ValueMap properties)
+ Resource create(ResourceResolver resolver, String path, Map<String, Object> properties)
throws PersistenceException;
/**
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=1366366&r1=1366365&r2=1366366&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 Fri Jul 27 12:30:18 2012
@@ -520,7 +520,7 @@ public interface ResourceResolver extend
*
* @throws PersistenceException, NullPointerException, UnsupportedOperationException
*/
- Resource addChild(Resource parent, String name, ValueMap properties)
+ Resource addChild(Resource parent, String name, Map<String, Object> properties)
throws PersistenceException;
/**
Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java?rev=1366366&r1=1366365&r2=1366366&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java (original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java Fri Jul 27 12:30:18 2012
@@ -154,7 +154,13 @@ public class ResourceWrapper implements
*/
@Override
public String toString() {
- return getClass().getSimpleName() + ", type=" + getResourceType()
+ final String className;
+ if ( getClass().getSimpleName() == null ) {
+ className = getClass().getName();
+ } else {
+ className = getClass().getSimpleName();
+ }
+ return className + ", type=" + getResourceType()
+ ", path=" + getPath() + ", resource=[" + getResource() + "]";
}
}
Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java?rev=1366366&r1=1366365&r2=1366366&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java (original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java Fri Jul 27 12:30:18 2012
@@ -49,7 +49,6 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.jcr.resource.JcrModifiablePropertyMap;
import org.apache.sling.jcr.resource.JcrResourceUtil;
import org.slf4j.Logger;
@@ -380,12 +379,13 @@ public class JcrResourceProvider
}
/**
- * @see org.apache.sling.api.resource.ModifyingResourceProvider#create(ResourceResolver, java.lang.String, org.apache.sling.api.resource.ValueMap)
+ * @see org.apache.sling.api.resource.ModifyingResourceProvider#create(ResourceResolver, java.lang.String, Map)
*/
- public Resource create(final ResourceResolver resolver, final String path, final ValueMap properties)
+ public Resource create(final ResourceResolver resolver, final String path, final Map<String, Object> properties)
throws PersistenceException {
// check for node type
- final String nodeType = (properties != null ? properties.get("jcr:primaryType", String.class) : null);
+ final Object nodeObj = (properties != null ? properties.get("jcr:primaryType") : null);
+ final String nodeType = (nodeObj != null ? nodeObj.toString() : null);
try {
final Node node = JcrResourceUtil.createPath(path, null, nodeType, this.session, false);
Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java?rev=1366366&r1=1366365&r2=1366366&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java (original)
+++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java Fri Jul 27 12:30:18 2012
@@ -32,7 +32,6 @@ import org.apache.sling.api.resource.Log
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.commons.testing.jcr.EventHelper;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.resource.internal.helper.jcr.JcrNodeResource;
@@ -207,7 +206,7 @@ public class JcrResourceListenerTest ext
// TODO Auto-generated method stub
}
- public Resource addChild(Resource parent, String name, ValueMap properties) {
+ public Resource addChild(Resource parent, String name, Map<String, Object> properties) {
// TODO Auto-generated method stub
return null;
}
Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/MockResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/MockResourceResolver.java?rev=1366366&r1=1366365&r2=1366366&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/MockResourceResolver.java (original)
+++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/MockResourceResolver.java Fri Jul 27 12:30:18 2012
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletReq
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ValueMap;
public class MockResourceResolver implements ResourceResolver {
@@ -131,7 +130,7 @@ public class MockResourceResolver implem
// TODO Auto-generated method stub
}
- public Resource addChild(Resource parent, String name, ValueMap properties) {
+ public Resource addChild(Resource parent, String name, Map<String, Object> properties) {
// TODO Auto-generated method stub
return null;
}
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=1366366&r1=1366365&r2=1366366&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 Fri Jul 27 12:30:18 2012
@@ -1014,9 +1014,9 @@ public class ResourceResolverImpl extend
}
/**
- * @see org.apache.sling.api.resource.ResourceResolver#addChild(org.apache.sling.api.resource.Resource, java.lang.String, org.apache.sling.api.resource.ValueMap)
+ * @see org.apache.sling.api.resource.ResourceResolver#addChild(org.apache.sling.api.resource.Resource, java.lang.String, Map)
*/
- public Resource addChild(final Resource parent, final String name, final ValueMap properties)
+ public Resource addChild(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
if ( name == null ) {
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java?rev=1366366&r1=1366365&r2=1366366&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java Fri Jul 27 12:30:18 2012
@@ -34,7 +34,6 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ValueMap;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Constants;
@@ -304,7 +303,7 @@ public class ResourceProviderEntryTest {
// TODO Auto-generated method stub
}
- public Resource addChild(Resource parent, String name, ValueMap properties) {
+ public Resource addChild(Resource parent, String name, Map<String, Object> properties) {
// TODO Auto-generated method stub
return null;
}