Author: chetanm
Date: Thu Nov 24 14:01:22 2016
New Revision: 1771132
URL: http://svn.apache.org/viewvc?rev=1771132&view=rev
Log:
OAK-4898 - Allow for external changes to have a CommitInfo attached
-- Switch to Nonnull annotation for CommitInfo param
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1771132&r1=1771131&r2=1771132&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Thu Nov 24 14:01:22 2016
@@ -1773,8 +1773,8 @@ public class AsyncIndexUpdateTest {
List<CommitInfo> infos = Lists.newArrayList();
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable
CommitInfo info) {
- if (info != null){
+ public void contentChanged(@Nonnull NodeState root, @Nonnull
CommitInfo info) {
+ if (info != CommitInfo.EMPTY_EXTERNAL){
infos.add(info);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java?rev=1771132&r1=1771131&r2=1771132&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java
Thu Nov 24 14:01:22 2016
@@ -34,6 +34,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import javax.annotation.Nonnull;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
@@ -85,7 +86,7 @@ public class ChangeCollectorProviderTest
List<ContentChange> changes = new LinkedList<ContentChange>();
@Override
- public void contentChanged(NodeState root, CommitInfo info) {
+ public void contentChanged(@Nonnull NodeState root,@Nonnull CommitInfo
info) {
changes.add(new ContentChange(root, info));
}
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java?rev=1771132&r1=1771131&r2=1771132&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
Thu Nov 24 14:01:22 2016
@@ -191,7 +191,7 @@ public class CommitContextTest extends O
CommitInfo info;
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable
CommitInfo info) {
+ public void contentChanged(@Nonnull NodeState root, @Nonnull
CommitInfo info) {
this.info = info;
}
}
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java?rev=1771132&r1=1771131&r2=1771132&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
Thu Nov 24 14:01:22 2016
@@ -96,7 +96,7 @@ public class CheckpointTest extends OakB
final AtomicInteger invocationCount = new AtomicInteger();
((Observable)store).addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable
CommitInfo info) {
+ public void contentChanged(@Nonnull NodeState root, @Nonnull
CommitInfo info) {
invocationCount.incrementAndGet();
}
});
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1771132&r1=1771131&r2=1771132&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
Thu Nov 24 14:01:22 2016
@@ -230,7 +230,7 @@ public class NodeStoreTest extends OakBa
((Observable) store).addObserver(new Observer() {
@Override
public void contentChanged(
- @Nonnull NodeState root, @Nullable CommitInfo info) {
+ @Nonnull NodeState root, @Nonnull CommitInfo info) {
if (root.getChildNode("test").hasChildNode("newNode")) {
observedRoot.set(checkNotNull(root));
latch.countDown();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1771132&r1=1771131&r2=1771132&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Thu Nov 24 14:01:22 2016
@@ -713,7 +713,7 @@ public class LuceneIndexTest {
tracker = new IndexTracker();
((Observable)nodeStore).addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable
CommitInfo info) {
+ public void contentChanged(@Nonnull NodeState root, @Nonnull
CommitInfo info) {
tracker.update(root);
}
});
