You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/05/21 10:54:22 UTC
svn commit: r1680767 - in /sling/trunk/contrib/nosql:
couchbase-resourceprovider/ generic/
generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/
generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/
Author: sseifert
Date: Thu May 21 08:54:21 2015
New Revision: 1680767
URL: http://svn.apache.org/r1680767
Log:
SLING-4381 allow null map when creating a resource
Modified:
sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml
sling/trunk/contrib/nosql/generic/pom.xml
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
sling/trunk/contrib/nosql/generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java
Modified: sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml?rev=1680767&r1=1680766&r2=1680767&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml (original)
+++ sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml Thu May 21 08:54:21 2015
@@ -81,7 +81,13 @@
<version>1.2.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.nosql.generic</artifactId>
Modified: sling/trunk/contrib/nosql/generic/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/pom.xml?rev=1680767&r1=1680766&r2=1680767&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/generic/pom.xml (original)
+++ sling/trunk/contrib/nosql/generic/pom.xml Thu May 21 08:54:21 2015
@@ -132,6 +132,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>2.0</version>
Modified: sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java?rev=1680767&r1=1680766&r2=1680767&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java (original)
+++ sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java Thu May 21 08:54:21 2015
@@ -148,7 +148,8 @@ public class NoSqlResourceProvider imple
}
// create new resource in changeset
- NoSqlData data = new NoSqlData(path, NoSqlValueMap.convertForWriteAll(new HashMap<String, Object>(properties)));
+ Map<String, Object> writableMap = properties != null ? new HashMap<String, Object>(properties) : new HashMap<String, Object>();
+ NoSqlData data = new NoSqlData(path, NoSqlValueMap.convertForWriteAll(writableMap));
changedResources.put(path, data);
return new NoSqlResource(data, resolver, this);
}
Modified: sling/trunk/contrib/nosql/generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java?rev=1680767&r1=1680766&r2=1680767&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java (original)
+++ sling/trunk/contrib/nosql/generic/src/test/java/org/apache/sling/nosql/generic/resource/impl/AbstractNoSqlResourceProviderTest.java Thu May 21 08:54:21 2015
@@ -208,4 +208,10 @@ public abstract class AbstractNoSqlResou
assertEquals(JcrConstants.NT_UNSTRUCTURED, resource.getResourceType());
}
+ @Test
+ public void testCreateWithNullMap() throws IOException {
+ Resource resource1 = context.resourceResolver().getResource(testRoot().getPath() + "/node1");
+ context.resourceResolver().create(resource1, "nullMap", null);
+ }
+
}