Author: chetanm
Date: Wed Oct 19 15:08:21 2016
New Revision: 1765627
URL: http://svn.apache.org/viewvc?rev=1765627&view=rev
Log:
OAK-1312 - [bundling] Bundle nodes into a document
Handle child node name case for leaf entry in bundled document
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtilsTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java?rev=1765627&r1=1765626&r2=1765627&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java
Wed Oct 19 15:08:21 2016
@@ -91,6 +91,7 @@ public final class BundlorUtils {
int depth = elements.size() - 1;
if (depth == expectedDepth
+ && key.startsWith(matcher.getMatchedPath())
&& elements.get(elements.size() -
1).equals(META_PROP_NODE)){
//Child node name is the second last element
//[jcr:content/:self -> [jcr:content, :self]
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtilsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtilsTest.java?rev=1765627&r1=1765626&r2=1765627&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtilsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtilsTest.java
Wed Oct 19 15:08:21 2016
@@ -94,6 +94,9 @@ public class BundlorUtilsTest {
names = BundlorUtils.getChildNodeNames(testData,
m.next("jcr:content"));
assertThat(names, hasItems("metadata", "comments"));
+
+ names = BundlorUtils.getChildNodeNames(testData,
m.next("jcr:content").next("metadata"));
+ assertTrue(names.isEmpty());
}
private Map<String, PropertyState> create(String ... keyNames){
