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 md...@apache.org on 2013/12/03 22:38:36 UTC
svn commit: r1547595 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/observation/
main/java/org/apache/jackrabbit/oak/plugins/observation/filter/
test/java/org/apache/jackrabbit/oak/plugins/observation/filter/
Author: mduerig
Date: Tue Dec 3 21:38:35 2013
New Revision: 1547595
URL: http://svn.apache.org/r1547595
Log:
OAK-1133: Observation listener PLUS Replace NodeTypeFilter with UniversalFilter
Replace ImmutableTree with Tree in filter APIs
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/NodeTypePredicate.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/SelectorTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java Tue Dec 3 21:38:35 2013
@@ -35,7 +35,6 @@ import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
import org.apache.jackrabbit.oak.plugins.observation.filter.ACFilter;
import org.apache.jackrabbit.oak.plugins.observation.filter.EventGenerator.Filter;
@@ -107,7 +106,7 @@ public class JcrFilterProvider implement
}
@Override
- public Filter getFilter(ImmutableTree beforeTree, ImmutableTree afterTree) {
+ public Filter getFilter(Tree beforeTree, Tree afterTree) {
String relPath = PathUtils.relativize(afterTree.getPath(), path);
String pathPattern = deep
? PathUtils.concat(relPath, STAR_STAR)
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java Tue Dec 3 21:38:35 2013
@@ -24,7 +24,7 @@ import static com.google.common.base.Pre
import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.observation.filter.EventGenerator.Filter;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -33,8 +33,8 @@ import org.apache.jackrabbit.oak.spi.sta
* {@code EventTypeFilter} filters based on the access rights of the observing session.
*/
public class ACFilter implements Filter {
- private final ImmutableTree beforeTree;
- private final ImmutableTree afterTree;
+ private final Tree beforeTree;
+ private final Tree afterTree;
private final TreePermission treePermission;
/**
@@ -45,7 +45,7 @@ public class ACFilter implements Filter
* @param afterTree after state of the node being filtered
* @param treePermission tree permission for the node being filtered
*/
- public ACFilter(@Nonnull ImmutableTree beforeTree, @Nonnull ImmutableTree afterTree,
+ public ACFilter(@Nonnull Tree beforeTree, @Nonnull Tree afterTree,
@Nonnull TreePermission treePermission) {
this.beforeTree = checkNotNull(beforeTree);
this.afterTree = checkNotNull(afterTree);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java Tue Dec 3 21:38:35 2013
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.plugin
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.observation.filter.EventGenerator.Filter;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -54,11 +54,11 @@ public interface FilterProvider {
* @return new {@code Filter} instance
*/
@Nonnull
- Filter getFilter(@Nonnull ImmutableTree beforeTree, @Nonnull ImmutableTree afterTree);
+ Filter getFilter(@Nonnull Tree beforeTree, @Nonnull Tree afterTree);
/**
* Path of the subtree to which the the filter returned by
- * {@link #getFilter(ImmutableTree, ImmutableTree)} applies.
+ * {@link #getFilter(Tree, Tree)} applies.
* @return path to which the filter applies.
*/
@Nonnull
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java Tue Dec 3 21:38:35 2013
@@ -28,7 +28,7 @@ import javax.annotation.Nonnull;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.observation.filter.EventGenerator.Filter;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -62,13 +62,13 @@ public class GlobbingPathFilter implemen
public static final String STAR = "*";
public static final String STAR_STAR = "**";
- private final ImmutableTree beforeTree;
- private final ImmutableTree afterTree;
+ private final Tree beforeTree;
+ private final Tree afterTree;
private final ImmutableList<String> pattern;
private GlobbingPathFilter(
- @Nonnull ImmutableTree beforeTree,
- @Nonnull ImmutableTree afterTree,
+ @Nonnull Tree beforeTree,
+ @Nonnull Tree afterTree,
@Nonnull Iterable<String> pattern) {
this.beforeTree = checkNotNull(beforeTree);
this.afterTree = checkNotNull(afterTree);
@@ -76,8 +76,8 @@ public class GlobbingPathFilter implemen
}
public GlobbingPathFilter(
- @Nonnull ImmutableTree beforeTree,
- @Nonnull ImmutableTree afterTree,
+ @Nonnull Tree beforeTree,
+ @Nonnull Tree afterTree,
@Nonnull String pattern) {
this(beforeTree, afterTree, elements(pattern));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/NodeTypePredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/NodeTypePredicate.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/NodeTypePredicate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/NodeTypePredicate.java Tue Dec 3 21:38:35 2013
@@ -24,7 +24,7 @@ import static com.google.common.base.Pre
import javax.annotation.Nonnull;
import com.google.common.base.Predicate;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
/**
@@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.plugins
* of any of the node types whose names has been passed to the predicate's
* constructor.
*/
-public class NodeTypePredicate implements Predicate<ImmutableTree> {
+public class NodeTypePredicate implements Predicate<Tree> {
private final ReadOnlyNodeTypeManager ntManager;
private final String[] ntNames;
@@ -49,7 +49,7 @@ public class NodeTypePredicate implement
}
@Override
- public boolean apply(ImmutableTree tree) {
+ public boolean apply(Tree tree) {
for (String ntName : ntNames) {
if (ntManager.isNodeType(tree, ntName)) {
return true;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java Tue Dec 3 21:38:35 2013
@@ -21,14 +21,14 @@ package org.apache.jackrabbit.oak.plugin
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
+import org.apache.jackrabbit.oak.api.Tree;
/**
* Predicate on property values. This property holds if and only if
* the tree has a property of the given {@code name} and the given
* {@code propertyPredicate} holds on that property.
*/
-public class PropertyPredicate implements Predicate<ImmutableTree> {
+public class PropertyPredicate implements Predicate<Tree> {
private final String name;
private final Predicate<PropertyState> propertyPredicate;
@@ -42,7 +42,7 @@ public class PropertyPredicate implement
}
@Override
- public boolean apply(ImmutableTree tree) {
+ public boolean apply(Tree tree) {
PropertyState property = tree.getProperty(name);
return property != null && propertyPredicate.apply(property);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java Tue Dec 3 21:38:35 2013
@@ -28,6 +28,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.core.ImmutableTree;
import org.apache.jackrabbit.oak.plugins.observation.filter.UniversalFilter.Selector;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -55,20 +56,20 @@ public class RelativePathSelector implem
@Nonnull
@Override
- public ImmutableTree select(@Nonnull UniversalFilter filter,
+ public Tree select(@Nonnull UniversalFilter filter,
@CheckForNull PropertyState before, @CheckForNull PropertyState after) {
return select(selector.select(filter, before, after));
}
@Nonnull
@Override
- public ImmutableTree select(@Nonnull UniversalFilter filter,
+ public Tree select(@Nonnull UniversalFilter filter,
@Nonnull String name, @Nonnull NodeState before, @Nonnull NodeState after) {
return select(selector.select(filter, name, before, after));
}
- private ImmutableTree select(ImmutableTree parent) {
- ImmutableTree tree = parent;
+ private Tree select(Tree parent) {
+ Tree tree = parent;
for (String name : elements(path)) {
if (denotesParent(name)) {
tree = tree.isRoot() ? MISSING_TREE : tree.getParent();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java Tue Dec 3 21:38:35 2013
@@ -25,6 +25,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.core.ImmutableTree;
import org.apache.jackrabbit.oak.plugins.observation.filter.UniversalFilter.Selector;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -51,13 +52,13 @@ public final class Selectors {
private static class ThisSelector implements Selector {
@Override
- public ImmutableTree select(@Nonnull UniversalFilter filter,
+ public Tree select(@Nonnull UniversalFilter filter,
@CheckForNull PropertyState before, @CheckForNull PropertyState after) {
return new ImmutableTree(MISSING_NODE);
}
@Override
- public ImmutableTree select(@Nonnull UniversalFilter filter, @Nonnull String name,
+ public Tree select(@Nonnull UniversalFilter filter, @Nonnull String name,
@Nonnull NodeState before, @Nonnull NodeState after) {
return after.exists()
? filter.getAfterTree().getChild(name)
@@ -67,7 +68,7 @@ public final class Selectors {
private static class ParentSelector implements Selector {
@Override
- public ImmutableTree select(@Nonnull UniversalFilter filter,
+ public Tree select(@Nonnull UniversalFilter filter,
@CheckForNull PropertyState before, @CheckForNull PropertyState after) {
return after != null
? filter.getAfterTree()
@@ -75,7 +76,7 @@ public final class Selectors {
}
@Override
- public ImmutableTree select(@Nonnull UniversalFilter filter, @Nonnull String name,
+ public Tree select(@Nonnull UniversalFilter filter, @Nonnull String name,
@Nonnull NodeState before, @Nonnull NodeState after) {
return after.exists()
? filter.getAfterTree()
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java Tue Dec 3 21:38:35 2013
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.observation.filter.EventGenerator.Filter;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -38,11 +38,11 @@ import org.apache.jackrabbit.oak.spi.sta
* determining whether to include or to exclude the respective event.
*/
public class UniversalFilter implements Filter {
- private final ImmutableTree beforeTree;
- private final ImmutableTree afterTree;
+ private final Tree beforeTree;
+ private final Tree afterTree;
private final Selector selector;
- private final Predicate<ImmutableTree> predicate;
+ private final Predicate<Tree> predicate;
/**
* Create a new instance of an universal filter rooted at the passed trees.
@@ -53,10 +53,10 @@ public class UniversalFilter implements
* @param predicate predicate for determining whether to include or to exclude an event
*/
public UniversalFilter(
- @Nonnull ImmutableTree beforeRootTree,
- @Nonnull ImmutableTree afterRootTree,
+ @Nonnull Tree beforeRootTree,
+ @Nonnull Tree afterRootTree,
@Nonnull Selector selector,
- @Nonnull Predicate<ImmutableTree> predicate) {
+ @Nonnull Predicate<Tree> predicate) {
this.predicate = checkNotNull(predicate);
this.beforeTree = checkNotNull(beforeRootTree);
this.afterTree = checkNotNull(afterRootTree);
@@ -79,7 +79,7 @@ public class UniversalFilter implements
* @return a tree instance for basing the filtering criterion (predicate) upon
*/
@Nonnull
- ImmutableTree select(@Nonnull UniversalFilter filter,
+ Tree select(@Nonnull UniversalFilter filter,
@CheckForNull PropertyState before, @CheckForNull PropertyState after);
/**
@@ -92,21 +92,21 @@ public class UniversalFilter implements
* @return a tree instance for basing the filtering criterion (predicate) upon
*/
@Nonnull
- ImmutableTree select(@Nonnull UniversalFilter filter, @Nonnull String name,
+ Tree select(@Nonnull UniversalFilter filter, @Nonnull String name,
@Nonnull NodeState before, @Nonnull NodeState after);
}
/**
* @return before tree this filter acts upon
*/
- public ImmutableTree getBeforeTree() {
+ public Tree getBeforeTree() {
return beforeTree;
}
/**
* @return after tree this filter acts upon
*/
- public ImmutableTree getAfterTree() {
+ public Tree getAfterTree() {
return afterTree;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java Tue Dec 3 21:38:35 2013
@@ -26,8 +26,8 @@ import javax.annotation.Nonnull;
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.core.ImmutableTree;
/**
* A predicate for matching against a list of UUIDs. This predicate holds
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.core.Im
* property and the value of that property matches any of the UUIDs that
* has been passed to the predicate's constructor.
*/
-public class UuidPredicate implements Predicate<ImmutableTree> {
+public class UuidPredicate implements Predicate<Tree> {
private final String[] uuids;
/**
@@ -46,7 +46,7 @@ public class UuidPredicate implements Pr
}
@Override
- public boolean apply(ImmutableTree tree) {
+ public boolean apply(Tree tree) {
if (uuids.length == 0) {
return false;
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/SelectorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/SelectorTest.java?rev=1547595&r1=1547594&r2=1547595&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/SelectorTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/SelectorTest.java Tue Dec 3 21:38:35 2013
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import com.google.common.base.Predicate;
+import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.core.ImmutableTree;
import org.apache.jackrabbit.oak.plugins.observation.filter.UniversalFilter.Selector;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -32,7 +33,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Test;
public class SelectorTest {
- public static final Predicate<ImmutableTree> ALL = alwaysTrue();
+ public static final Predicate<Tree> ALL = alwaysTrue();
private final NodeState root; {
NodeBuilder builder = EMPTY_NODE.builder();