You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2016/10/19 15:09:19 UTC
svn commit: r1765632 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/
main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/
test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/
Author: chetanm
Date: Wed Oct 19 15:09:18 2016
New Revision: 1765632
URL: http://svn.apache.org/viewvc?rev=1765632&view=rev
Log:
OAK-1312 - [bundling] Bundle nodes into a document
Rename Matcher.matchesChildren -> Matcher.matchesAllChildren
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeMatcher.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Matcher.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcherTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/MatcherTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java Wed Oct 19 15:09:18 2016
@@ -258,7 +258,7 @@ public class DocumentNodeState extends A
}
int bundledChildCount = bundlingContext.getBundledChildNodeNames().size();
- if (bundlingContext.matcher.matchesChildren()){
+ if (bundlingContext.matcher.matchesAllChildren()){
return bundledChildCount;
}
@@ -295,7 +295,7 @@ public class DocumentNodeState extends A
return new Iterable<ChildNodeEntry>() {
@Override
public Iterator<ChildNodeEntry> iterator() {
- if (bundlingContext.matcher.matchesChildren()){
+ if (bundlingContext.matcher.matchesAllChildren()){
return getBundledChildren();
}
return Iterators.concat(getBundledChildren(), new ChildNodeEntryIterator());
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java Wed Oct 19 15:09:18 2016
@@ -80,9 +80,9 @@ class CompositeMatcher implements Matche
}
@Override
- public boolean matchesChildren() {
+ public boolean matchesAllChildren() {
for (Matcher m : matchers){
- if (m.matchesChildren()){
+ if (m.matchesAllChildren()){
return true;
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java Wed Oct 19 15:09:18 2016
@@ -43,6 +43,7 @@ import static com.google.common.base.Pre
* </ul>
*/
public class Include {
+ //TODO Restrict to * and have * == **
private static final String STAR = "*";
private static final String STAR_STAR = "**";
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java Wed Oct 19 15:09:18 2016
@@ -56,7 +56,7 @@ class IncludeAllMatcher implements Match
}
@Override
- public boolean matchesChildren() {
+ public boolean matchesAllChildren() {
return true;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeMatcher.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeMatcher.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeMatcher.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeMatcher.java Wed Oct 19 15:09:18 2016
@@ -73,7 +73,7 @@ class IncludeMatcher implements Matcher
}
@Override
- public boolean matchesChildren() {
+ public boolean matchesAllChildren() {
if (hasMore()){
return include.matchAny(nextElementIndex());
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Matcher.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Matcher.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Matcher.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Matcher.java Wed Oct 19 15:09:18 2016
@@ -42,7 +42,7 @@ public interface Matcher {
}
@Override
- public boolean matchesChildren() {
+ public boolean matchesAllChildren() {
return false;
}
@@ -82,5 +82,5 @@ public interface Matcher {
* case if IncludeMatcher with '*' or '**' as pattern for
* child nodes
*/
- boolean matchesChildren();
+ boolean matchesAllChildren();
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcherTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcherTest.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcherTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcherTest.java Wed Oct 19 15:09:18 2016
@@ -70,8 +70,8 @@ public class CompositeMatcherTest {
new Include("x/*").createMatcher())
);
- assertFalse(m.matchesChildren());
- assertTrue(m.next("x").matchesChildren());
+ assertFalse(m.matchesAllChildren());
+ assertTrue(m.next("x").matchesAllChildren());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeTest.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeTest.java Wed Oct 19 15:09:18 2016
@@ -93,13 +93,13 @@ public class IncludeTest {
public void matchChildren() throws Exception{
Include i0 = new Include("x/*");
Matcher m = i0.createMatcher();
- assertFalse(m.matchesChildren());
- assertTrue(m.next("x").matchesChildren());
+ assertFalse(m.matchesAllChildren());
+ assertTrue(m.next("x").matchesAllChildren());
Include i1 = new Include("x/**");
m = i1.createMatcher();
- assertFalse(m.matchesChildren());
- assertTrue(m.next("x").matchesChildren());
+ assertFalse(m.matchesAllChildren());
+ assertTrue(m.next("x").matchesAllChildren());
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/MatcherTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/MatcherTest.java?rev=1765632&r1=1765631&r2=1765632&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/MatcherTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/MatcherTest.java Wed Oct 19 15:09:18 2016
@@ -40,12 +40,12 @@ public class MatcherTest {
public void includeAll() throws Exception{
Matcher m = new IncludeAllMatcher("x", 1);
assertTrue(m.isMatch());
- assertTrue(m.matchesChildren());
+ assertTrue(m.matchesAllChildren());
assertEquals("x", m.getMatchedPath());
assertEquals(1, m.depth());
assertTrue(m.next("y").isMatch());
- assertTrue(m.next("y").matchesChildren());
+ assertTrue(m.next("y").matchesAllChildren());
assertEquals("x/y", m.next("y").getMatchedPath());
assertEquals(2, m.next("y").depth());
}