Author: frm
Date: Tue Jan 24 12:50:29 2017
New Revision: 1780071
URL: http://svn.apache.org/viewvc?rev=1780071&view=rev
Log:
OAK-5505 - Delete o.a.j.o.segment.http.HttpStore
Removed:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreBuilders.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreBuilders.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreBuilders.java?rev=1780071&r1=1780070&r2=1780071&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreBuilders.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreBuilders.java
Tue Jan 24 12:50:29 2017
@@ -24,7 +24,6 @@ import javax.annotation.Nonnull;
import
org.apache.jackrabbit.oak.segment.SegmentNodeStore.SegmentNodeStoreBuilder;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore;
-import org.apache.jackrabbit.oak.segment.http.HttpStore;
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
/**
@@ -51,15 +50,6 @@ public final class SegmentNodeStoreBuild
return SegmentNodeStore.builder(store.getRevisions(),
store.getReader(), store.getWriter(), store.getBlobStore());
}
-
- /**
- * Create a {@code SegmentNodeStoreBuilder} based on a {@code HttpStore}.
- */
- @Nonnull
- public static SegmentNodeStoreBuilder builder(@Nonnull HttpStore store) {
- return SegmentNodeStore.builder(store.getRevisions(),
- store.getReader(), store.getWriter(), store.getBlobStore());
- }
/**
* Create a {@code SegmentNodeStoreBuilder} based on a {@code
ReadOnlyFileStore@}.
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java?rev=1780071&r1=1780070&r2=1780071&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java
Tue Jan 24 12:50:29 2017
@@ -28,7 +28,6 @@ import com.google.common.base.Suppliers;
import org.apache.jackrabbit.oak.segment.WriterCacheManager.Empty;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore;
-import org.apache.jackrabbit.oak.segment.http.HttpStore;
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
/**
@@ -193,20 +192,6 @@ public final class SegmentWriterBuilder
);
}
- /**
- * Build a {@code SegmentWriter} for a {@code HttpStore}.
- */
- @Nonnull
- public SegmentWriter build(@Nonnull HttpStore store) {
- return new SegmentWriter(
- checkNotNull(store),
- store.getReader(),
- store.getBlobStore(),
- cacheManager,
- createWriter(store, pooled)
- );
- }
-
@Nonnull
private WriteOperationHandler createWriter(@Nonnull FileStore store,
boolean pooled) {
if (pooled) {
@@ -233,27 +218,6 @@ public final class SegmentWriterBuilder
if (pooled) {
return new SegmentBufferWriterPool(
store,
- store.getTracker(),
- store.getReader(),
- name,
- generation
- );
- } else {
- return new SegmentBufferWriter(
- store,
- store.getTracker().getSegmentCounter(),
- store.getReader(),
- name,
- generation.get()
- );
- }
- }
-
- @Nonnull
- private WriteOperationHandler createWriter(@Nonnull HttpStore store,
boolean pooled) {
- if (pooled) {
- return new SegmentBufferWriterPool(
- store,
store.getTracker(),
store.getReader(),
name,
