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 st...@apache.org on 2016/11/01 08:33:32 UTC
svn commit: r1767445 - in /jackrabbit/oak/trunk/oak-jcr/src:
main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java
test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
Author: stefanegli
Date: Tue Nov 1 08:33:32 2016
New Revision: 1767445
URL: http://svn.apache.org/viewvc?rev=1767445&view=rev
Log:
OAK-5019 : supporting setting glob paths multiple times too
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java?rev=1767445&r1=1767444&r2=1767445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java Tue Nov 1 08:33:32 2016
@@ -22,6 +22,7 @@ import static com.google.common.base.Pre
import static com.google.common.collect.Lists.newArrayList;
import static javax.jcr.observation.Event.NODE_REMOVED;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -451,13 +452,14 @@ public class OakEventFilterImpl extends
@Override
public OakEventFilter withIncludeGlobPaths(String... globPaths) {
- if (this.globPaths != null) {
- throw new IllegalStateException("can only set globPaths once");
+ if (this.globPaths == null) {
+ this.globPaths = globPaths;
+ } else {
+ List<String> combo = new LinkedList<String>();
+ combo.addAll(Arrays.asList(this.globPaths));
+ combo.addAll(Arrays.asList(globPaths));
+ this.globPaths = combo.toArray(new String[combo.size()]);
}
-// for (String aGlobPath : globPaths) {
-// return or(builder().path(aGlobPath));
-// }
- this.globPaths = globPaths;
return this;
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java?rev=1767445&r1=1767444&r2=1767445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java Tue Nov 1 08:33:32 2016
@@ -1433,6 +1433,35 @@ public class ObservationTest extends Abs
unexpected = listener.getUnexpected();
assertTrue("Unexpected events: " + unexpected, unexpected.isEmpty());
}
+
+ @Test
+ public void testConsecutiveGlobPaths() throws Exception {
+ Node testNode = getNode(TEST_PATH);
+ Node a1 = testNode.addNode("a1");
+ a1.addNode("b1").addNode("c1");
+ a1.addNode("b2").addNode("c2");
+ testNode.addNode("a2").addNode("b").addNode("c");
+ testNode.getSession().save();
+
+ ObservationManagerImpl oManager = (ObservationManagerImpl) observationManager;
+ ExpectationListener listener = new ExpectationListener();
+
+ JackrabbitEventFilter filter = new JackrabbitEventFilter();
+ filter.setEventTypes(ALL_EVENTS);
+ filter = FilterFactory.wrap(filter).withIncludeGlobPaths(TEST_PATH + "/a2/**").withIncludeGlobPaths(TEST_PATH + "/a1/**");
+
+ oManager.addEventListener(listener, filter);
+
+ listener.expectRemove(testNode.getNode("a1").getNode("b2")).remove();
+ listener.expectRemove(testNode.getNode("a2").getNode("b")).remove();
+ testNode.getSession().save();
+
+ Thread.sleep(1000);
+ List<Expectation> missing = listener.getMissing(TIME_OUT, TimeUnit.SECONDS);
+ assertTrue("Missing events: " + missing, missing.isEmpty());
+ List<Event> unexpected = listener.getUnexpected();
+ assertTrue("Unexpected events: " + unexpected, unexpected.isEmpty());
+ }
@Test
public void testAggregate1() throws Exception {