Move entry serialization back to ByteBufWriter

[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 f28390c84b9f592d4098996124eb8b2e98ca0e5e..db0531acec56350076a538434c90e9f917e859aa 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
@@ -18,11 +18,13 @@ package io.atomix.storage.journal;
 
 import static java.util.Objects.requireNonNull;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * A {@link JournalReader} backed by a {@link ByteBufReader}.
  */
+@NonNullByDefault
 final class SegmentedJournalReader<E> implements JournalReader<E> {
     private final ByteBufMapper<E> mapper;
     private final ByteBufReader reader;
@@ -54,9 +56,10 @@ final class SegmentedJournalReader<E> implements JournalReader<E> {
 
     @Override
     public <T> @Nullable T tryNext(final EntryMapper<E, T> entryMapper) {
-        return reader.tryNext(
-            (index, buf) -> requireNonNull(entryMapper.mapEntry(index, mapper.bytesToObject(buf), buf.readableBytes()))
-        );
+        return reader.tryNext((index, buf) -> {
+            final var size = buf.readableBytes();
+            return requireNonNull(entryMapper.mapEntry(index, mapper.bytesToObject(index, buf), size));
+        });
     }
 
     @Override