Author: chetanm
Date: Thu Nov 24 14:01:59 2016
New Revision: 1771135
URL: http://svn.apache.org/viewvc?rev=1771135&view=rev
Log:
OAK-4898 - Allow for external changes to have a CommitInfo attached
-- Switch to Nonnull annotation for CommitInfo param
-- Replace usage of CommitInfo == null with CommitInfo.isExternal
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1771135&r1=1771134&r2=1771135&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
Thu Nov 24 14:01:59 2016
@@ -72,7 +72,7 @@ public class LuceneIndexProvider impleme
//----------------------------------------------------------< Observer >--
@Override
- public void contentChanged(NodeState root, CommitInfo info) {
+ public void contentChanged(@Nonnull NodeState root,@Nonnull CommitInfo
info) {
tracker.update(root);
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java?rev=1771135&r1=1771134&r2=1771135&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
Thu Nov 24 14:01:59 2016
@@ -39,9 +39,8 @@ public class LocalIndexObserver implemen
}
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable CommitInfo
info) {
- //TODO [hybrid] Do external diff?
- if (info == null){
+ public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo
info) {
+ if (info.isExternal()){
return;
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java?rev=1771135&r1=1771134&r2=1771135&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserverTest.java
Thu Nov 24 14:01:59 2016
@@ -53,8 +53,8 @@ public class LocalIndexObserverTest {
}
@Test
- public void nullCommitInfo() throws Exception{
- observer.contentChanged(EMPTY_NODE, null);
+ public void externalCommitInfo() throws Exception{
+ observer.contentChanged(EMPTY_NODE, CommitInfo.EMPTY_EXTERNAL);
}
@Test
