svn commit: r1800032 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: SegmentNodeBuilder.java SegmentNodeState.java

[md...@apache.org]

Author: mduerig
Date: Tue Jun 27 08:47:21 2017
New Revision: 1800032

URL: http://svn.apache.org/viewvc?rev=1800032&view=rev
Log:
OAK-6378: Move the SegmentWriter API to its own interface
Nullability annotations

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java?rev=1800032&r1=1800031&r2=1800032&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java Tue Jun 27 08:47:21 2017
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
@@ -48,8 +49,10 @@ public class SegmentNodeBuilder extends
     private static final int UPDATE_LIMIT =
             Integer.getInteger("update.limit", 10000);
 
+    @Nullable
     private final BlobStore blobStore;
 
+    @Nonnull
     private final SegmentReader reader;
 
     @Nonnull
@@ -69,7 +72,11 @@ public class SegmentNodeBuilder extends
      */
     private long updateCount;
 
-    SegmentNodeBuilder(@Nonnull SegmentNodeState base, BlobStore blobStore, SegmentReader reader, @Nonnull SegmentWriter writer) {
+    SegmentNodeBuilder(
+            @Nonnull SegmentNodeState base,
+            @Nullable BlobStore blobStore,
+            @Nonnull SegmentReader reader,
+            @Nonnull SegmentWriter writer) {
         super(base);
         this.blobStore = blobStore;
         this.reader = reader;
@@ -77,7 +84,12 @@ public class SegmentNodeBuilder extends
         this.updateCount = 0;
     }
 
-    private SegmentNodeBuilder(SegmentNodeBuilder parent, String name, BlobStore blobStore, SegmentReader reader, @Nonnull SegmentWriter writer) {
+    private SegmentNodeBuilder(
+            @Nonnull SegmentNodeBuilder parent,
+            @Nonnull String name,
+            @Nullable BlobStore blobStore,
+            @Nonnull SegmentReader reader,
+            @Nonnull SegmentWriter writer) {
         super(parent, name);
         this.blobStore = blobStore;
         this.reader = reader;

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java?rev=1800032&r1=1800031&r2=1800032&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java Tue Jun 27 08:47:21 2017
@@ -43,6 +43,7 @@ import java.util.UUID;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
@@ -64,6 +65,7 @@ public class SegmentNodeState extends Re
     @Nonnull
     private final SegmentReader reader;
 
+    @Nullable
     private final BlobStore blobStore;
 
     @Nonnull
@@ -76,7 +78,7 @@ public class SegmentNodeState extends Re
     SegmentNodeState(
             @Nonnull SegmentReader reader,
             @Nonnull Supplier<SegmentWriter> writer,
-            BlobStore blobStore,
+            @Nullable BlobStore blobStore,
             @Nonnull RecordId id) {
         super(id);
         this.reader = checkNotNull(reader);
@@ -87,7 +89,7 @@ public class SegmentNodeState extends Re
     public SegmentNodeState(
             @Nonnull SegmentReader reader,
             @Nonnull SegmentWriter writer,
-            BlobStore blobStore,
+            @Nullable BlobStore blobStore,
             @Nonnull RecordId id) {
         this(reader, Suppliers.ofInstance(writer), blobStore, id);
     }