Author: chetanm
Date: Fri Nov 25 14:20:25 2016
New Revision: 1771323
URL: http://svn.apache.org/viewvc?rev=1771323&view=rev
Log:
OAK-5126 - Support ChangeSet merging and serialization
Add truncated path in case its depth exceeds maxDepth
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilder.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilderTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilder.java?rev=1771323&r1=1771322&r2=1771323&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilder.java
Fri Nov 25 14:20:25 2016
@@ -59,9 +59,7 @@ public class ChangeSetBuilder {
}
public ChangeSetBuilder addParentPath(String path){
- if (PathUtils.getDepth(path) > maxPathDepth){
- return this;
- }
+ path = getPathWithMaxDepth(path, maxPathDepth);
parentPathOverflow = addAndCheckOverflow(parentPaths, path, maxItems,
parentPathOverflow);
return this;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilderTest.java?rev=1771323&r1=1771322&r2=1771323&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeSetBuilderTest.java
Fri Nov 25 14:20:25 2016
@@ -141,7 +141,7 @@ public class ChangeSetBuilderTest {
cb.addParentPath("/p/q/r");
ChangeSet cs = cb.build();
- assertThat(cs.getParentPaths(), containsInAnyOrder("/a/b", "/x"));
+ assertThat(cs.getParentPaths(), containsInAnyOrder("/a/b", "/x",
"/p/q"));
}
@Test
