Hide SegmentedJournal{Reader,Writer}

These classes are define by Journal{Reader,Writer} interfaces, hide them
as they are pure implementation details.

JIRA: CONTROLLER-2098
Change-Id: I1149b970001cb64ffe503f128cce3864e396280a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
index f2d99eec533a094f36ef82476d8094f7f2ddd5cb..865daeee528574d17acaf2289f3a8f3b03d6018f 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
@@ -40,7 +40,6 @@ import static java.util.Objects.requireNonNull;
  * Segmented journal.
  */
 public final class SegmentedJournal<E> implements Journal<E> {
-
   /**
    * Returns a new Raft log builder.
    *
@@ -91,7 +90,7 @@ public final class SegmentedJournal<E> implements Journal<E> {
     this.indexDensity = indexDensity;
     this.flushOnCommit = flushOnCommit;
     open();
-    this.writer = openWriter();
+    this.writer = new SegmentedJournalWriter<>(this);
   }
 
   /**
@@ -194,13 +193,13 @@ public final class SegmentedJournal<E> implements Journal<E> {
   }
 
   @Override
-  public SegmentedJournalWriter<E> writer() {
+  public JournalWriter<E> writer() {
     return writer;
   }
 
   @Override
-  public SegmentedJournalReader<E> openReader(long index) {
-    return openReader(index, SegmentedJournalReader.Mode.ALL);
+  public JournalReader<E> openReader(long index) {
+    return openReader(index, JournalReader.Mode.ALL);
   }
 
   /**
@@ -210,21 +209,12 @@ public final class SegmentedJournal<E> implements Journal<E> {
    * @param mode The mode in which to read entries.
    * @return The Raft log reader.
    */
-  public SegmentedJournalReader<E> openReader(long index, SegmentedJournalReader.Mode mode) {
-    SegmentedJournalReader<E> reader = new SegmentedJournalReader<>(this, index, mode);
+  public JournalReader<E> openReader(long index, JournalReader.Mode mode) {
+    final var reader = new SegmentedJournalReader<>(this, index, mode);
     readers.add(reader);
     return reader;
   }
 
-  /**
-   * Opens a new journal writer.
-   *
-   * @return A new journal writer.
-   */
-  protected SegmentedJournalWriter<E> openWriter() {
-    return new SegmentedJournalWriter<>(this);
-  }
-
   /**
    * Opens the segments.
    */

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java
index f9e015f6867148046dfdf2d333179b9fa716dd04..32d72176c33bdf16d049df22c34dadd4f6a22866 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java
@@ -20,7 +20,7 @@ import java.util.NoSuchElementException;
 /**
  * Raft log reader.
  */
-public final class SegmentedJournalReader<E> implements JournalReader<E> {
+final class SegmentedJournalReader<E> implements JournalReader<E> {
   private final SegmentedJournal<E> journal;
   private JournalSegment<E> currentSegment;
   private Indexed<E> previousEntry;

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java
index 3d831da55f0e8dfa0dad2709a32745380f4f3b4d..ad900b003e84e67fc0334975794a8410732729c9 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java
@@ -20,7 +20,7 @@ import java.nio.BufferOverflowException;
 /**
  * Raft log writer.
  */
-public final class SegmentedJournalWriter<E> implements JournalWriter<E> {
+final class SegmentedJournalWriter<E> implements JournalWriter<E> {
   private final SegmentedJournal<E> journal;
   private JournalSegment<E> currentSegment;
   private JournalSegmentWriter<E> currentWriter;

diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java
index bef2121470761cfa8f9c410b814a9f3d5a37e67d..4351fd40ac8d49813d30043b438340db920abd7c 100644 (file)
--- a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java
@@ -11,10 +11,10 @@ import akka.actor.ActorSystem;
 import akka.persistence.PersistentRepr;
 import com.codahale.metrics.Histogram;
 import com.google.common.base.VerifyException;
+import io.atomix.storage.journal.JournalReader;
 import io.atomix.storage.journal.JournalSerdes;
+import io.atomix.storage.journal.JournalWriter;
 import io.atomix.storage.journal.SegmentedJournal;
-import io.atomix.storage.journal.SegmentedJournalReader;
-import io.atomix.storage.journal.SegmentedJournalWriter;
 import io.atomix.storage.journal.StorageLevel;
 import java.io.File;
 import java.io.Serializable;
@@ -80,8 +80,7 @@ final class DataJournalV0 extends DataJournal {
         }
     }
 
-    private void handleReplayMessages(final SegmentedJournalReader<DataJournalEntry> reader,
-            final ReplayMessages message) {
+    private void handleReplayMessages(final JournalReader<DataJournalEntry> reader, final ReplayMessages message) {
         int count = 0;
         while (reader.hasNext() && count < message.max) {
             final var next = reader.next();
@@ -132,7 +131,7 @@ final class DataJournalV0 extends DataJournal {
         return bytes;
     }
 
-    private long writePayload(final SegmentedJournalWriter<DataJournalEntry> writer, final List<PersistentRepr> reprs) {
+    private long writePayload(final JournalWriter<DataJournalEntry> writer, final List<PersistentRepr> reprs) {
         long bytes = 0;
         for (var repr : reprs) {
             final Object payload = repr.payload();