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/11/26 11:06:38 UTC
svn commit: r1545593 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter:
EventGenerator.java EventIterator.java
Author: mduerig
Date: Tue Nov 26 10:06:37 2013
New Revision: 1545593
URL: http://svn.apache.org/r1545593
Log:
OAK-1133: Observation listener PLUS
Null checks and @Nonnull
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventGenerator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventIterator.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventGenerator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventGenerator.java?rev=1545593&r1=1545592&r2=1545593&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventGenerator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventGenerator.java Tue Nov 26 10:06:37 2013
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
+import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import javax.annotation.CheckForNull;
@@ -180,9 +181,9 @@ public class EventGenerator implements M
* @param filter filter for filtering changes
* @param listener listener for listening to the filtered changes
*/
- public EventGenerator(Filter filter, Listener listener) {
- this.filter = filter;
- this.listener = listener;
+ public EventGenerator(@Nonnull Filter filter, @Nonnull Listener listener) {
+ this.filter = checkNotNull(filter);
+ this.listener = checkNotNull(listener);
}
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventIterator.java?rev=1545593&r1=1545592&r2=1545593&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventIterator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventIterator.java Tue Nov 26 10:06:37 2013
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
+import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterators.concat;
import static com.google.common.collect.Lists.newArrayList;
@@ -92,14 +93,14 @@ public class EventIterator<T> extends Ev
* @param filter filter for filtering changes
* @param listener listener for listening to the filtered changes
*/
- public EventIterator(NodeState before, NodeState after, String path,
- Filter filter, IterableListener<T> listener) {
+ public EventIterator(@Nonnull NodeState before, @Nonnull NodeState after,
+ @Nonnull String path, @Nonnull Filter filter, @Nonnull IterableListener<T> listener) {
super(filter, listener);
- this.before = before;
- this.after = after;
- this.path = path;
- this.filter = filter;
- this.listener = listener;
+ this.before = checkNotNull(before);
+ this.after = checkNotNull(after);
+ this.path = checkNotNull(path);
+ this.filter = checkNotNull(filter);
+ this.listener = checkNotNull(listener);
}
//------------------------------------------------------------< EventGenerator >---