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 ch...@apache.org on 2016/12/08 05:32:28 UTC
svn commit: r1773184 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Thu Dec 8 05:32:28 2016
New Revision: 1773184
URL: http://svn.apache.org/viewvc?rev=1773184&view=rev
Log:
OAK-5220 - Remove usage of NodeBuilder in IndexDefinition
As indexPath is not optional making it a constructor argument
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1773184&r1=1773183&r2=1773184&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Thu Dec 8 05:32:28 2016
@@ -256,8 +256,8 @@ public final class IndexDefinition imple
//~--------------------------------------------------------< Builder >
- public static Builder newBuilder(NodeState root, NodeState defn){
- return new Builder(root, defn);
+ public static Builder newBuilder(NodeState root, NodeState defn, String indexPath){
+ return new Builder(root, defn, indexPath);
}
public static class Builder {
@@ -268,18 +268,14 @@ public final class IndexDefinition imple
private static final String DEFAULT_UID = "0";
private final NodeState root;
private final NodeState defn;
- private String indexPath;
+ private final String indexPath;
private IndexFormatVersion version;
private String uid;
- public Builder(NodeState root, NodeState defn) {
- this.root = root;
- this.defn = defn;
- }
-
- public Builder indexPath(String indexPath){
- this.indexPath = indexPath;
- return this;
+ public Builder(NodeState root, NodeState defn, String indexPath) {
+ this.root = checkNotNull(root);
+ this.defn = checkNotNull(defn);
+ this.indexPath = checkNotNull(indexPath);
}
public Builder version(IndexFormatVersion version){
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1773184&r1=1773183&r2=1773184&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java Thu Dec 8 05:32:28 2016
@@ -201,8 +201,7 @@ public class LuceneIndexEditorContext {
//Refresh the index definition based on update builder state
definition = IndexDefinition
- .newBuilder(root, defnState)
- .indexPath(indexingContext.getIndexPath())
+ .newBuilder(root, defnState, indexingContext.getIndexPath())
.version(version)
.uid(uid)
.build();
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1773184&r1=1773183&r2=1773184&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java Thu Dec 8 05:32:28 2016
@@ -885,11 +885,11 @@ public class IndexDefinitionTest {
@Test
public void uniqueIdForFreshIndex() throws Exception{
- IndexDefinition defn = IndexDefinition.newBuilder(root, builder.getNodeState()).indexPath("/foo").build();
+ IndexDefinition defn = IndexDefinition.newBuilder(root, builder.getNodeState(), "/foo").build();
assertEquals("0", defn.getUniqueId());
builder.child(":status");
- defn = IndexDefinition.newBuilder(root, builder.getNodeState()).indexPath("/foo").build();
+ defn = IndexDefinition.newBuilder(root, builder.getNodeState(),"/foo").build();
assertNull(defn.getUniqueId());
}