Refactor JournalReader.tryNext()

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

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/CommitsSegmentJournalReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/CommitsSegmentJournalReader.java
index 65f4de64965498943134a4098d291205f5ed2ae4..767e67fa4630864fb60fc4fa9d5ae4ce221b5064 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/CommitsSegmentJournalReader.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/CommitsSegmentJournalReader.java
@@ -15,16 +15,19 @@
  */
 package io.atomix.storage.journal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * A {@link JournalReader} traversing only committed entries.
  */
+@NonNullByDefault
 final class CommitsSegmentJournalReader<E> extends SegmentedJournalReader<E> {
-    CommitsSegmentJournalReader(SegmentedJournal<E> journal, JournalSegment segment) {
+    CommitsSegmentJournalReader(final SegmentedJournal<E> journal, final JournalSegment segment) {
         super(journal, segment);
     }
 
     @Override
-    public Indexed<E> tryNext() {
-        return getNextIndex() <= journal.getCommitIndex() ? super.tryNext() : null;
+    public <T> T tryNext(final EntryMapper<E, T> mapper) {
+        return getNextIndex() <= journal.getCommitIndex() ? super.tryNext(mapper) : null;
     }
 }