Bump upstreams

[controller.git] / atomix-storage / src / main / java / io / atomix / storage / journal / SegmentedJournalReader.java

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 99fdbb64b1577e14bfe05e3ccf7e67e11cfe691c..4021518ef5273eba5486b36b5f0142f9bf040f07 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,16 +20,18 @@ import static java.util.Objects.requireNonNull;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.controller.raft.journal.EntryReader;
+import org.opendaylight.controller.raft.journal.FromByteBufMapper;
 
 /**
- * A {@link JournalReader} backed by a {@link ByteBufReader}.
+ * A {@link JournalReader} backed by a {@link EntryReader}.
  */
 @NonNullByDefault
 final class SegmentedJournalReader<E> implements JournalReader<E> {
-    private final ByteBufMapper<E> mapper;
-    private final ByteBufReader reader;
+    private final FromByteBufMapper<E> mapper;
+    private final EntryReader reader;
 
-    SegmentedJournalReader(final ByteBufReader reader, final ByteBufMapper<E> mapper) {
+    SegmentedJournalReader(final EntryReader reader, final FromByteBufMapper<E> mapper) {
         this.reader = requireNonNull(reader);
         this.mapper = requireNonNull(mapper);
     }