Remove JournalReader.getCurrentIndex()

This method is used only in tests and has the weird 'or 0' return.
Refactor test asserts and remove this method.

Change-Id: If397f2398e75d08de867cf4c674a1dd14e8add30
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 54cfea6258d62114fea95acdc20514dbad079c2a)

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalReader.java
index d873b6df5b8e0bdd8444d9f4467a00db5b818215..700f40d1b632ac504ba2d0fae1e885f97414acf5 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalReader.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalReader.java
@@ -44,13 +44,6 @@ public interface JournalReader<E> extends AutoCloseable {
      */
     long getFirstIndex();
 
-    /**
-     * Returns the current reader index.
-     *
-     * @return The current reader index.
-     */
-    long getCurrentIndex();
-
     /**
      * Returns the last read entry.
      *

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 de57d520e2896eb164707b1504eecdc83dc30844..2549f0ebb82f5d70c095b72022313e5be886fec6 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
@@ -42,11 +42,6 @@ sealed class SegmentedJournalReader<E> implements JournalReader<E> permits Commi
         return journal.getFirstSegment().index();
     }
 
-    @Override
-    public final long getCurrentIndex() {
-        return currentEntry != null ? currentEntry.index() : 0;
-    }
-
     @Override
     public final Indexed<E> getCurrentEntry() {
         return currentEntry;

diff --git a/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
index a82d9449b2f6eaebcd71ba76229da598e44c7b85..14e59e5d7a757ecc9927546de9b8b8e375da897e 100644 (file)
--- a/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
+++ b/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
@@ -120,7 +120,6 @@ public abstract class AbstractJournalTest {
             assertNotNull(entry1);
             assertEquals(1, entry1.index());
             assertEquals(entry1, reader.getCurrentEntry());
-            assertEquals(1, reader.getCurrentIndex());
 
             // Test reading a second entry
             assertEquals(2, reader.getNextIndex());
@@ -128,7 +127,6 @@ public abstract class AbstractJournalTest {
             assertNotNull(entry2);
             assertEquals(2, entry2.index());
             assertEquals(entry2, reader.getCurrentEntry());
-            assertEquals(2, reader.getCurrentIndex());
             assertEquals(3, reader.getNextIndex());
             assertNull(reader.tryNext());
 
@@ -138,14 +136,12 @@ public abstract class AbstractJournalTest {
             assertNotNull(entry1);
             assertEquals(1, entry1.index());
             assertEquals(entry1, reader.getCurrentEntry());
-            assertEquals(1, reader.getCurrentIndex());
 
             assertEquals(2, reader.getNextIndex());
             entry2 = reader.tryNext();
             assertNotNull(entry2);
             assertEquals(2, entry2.index());
             assertEquals(entry2, reader.getCurrentEntry());
-            assertEquals(2, reader.getCurrentIndex());
             assertNull(reader.tryNext());
 
             // Reset the reader.
@@ -157,14 +153,12 @@ public abstract class AbstractJournalTest {
             assertNotNull(entry1);
             assertEquals(1, entry1.index());
             assertEquals(entry1, reader.getCurrentEntry());
-            assertEquals(1, reader.getCurrentIndex());
 
             assertEquals(2, reader.getNextIndex());
             entry2 = reader.tryNext();
             assertNotNull(entry2);
             assertEquals(2, entry2.index());
             assertEquals(entry2, reader.getCurrentEntry());
-            assertEquals(2, reader.getCurrentIndex());
             assertNull(reader.tryNext());
 
             // Truncate the journal and write a different entry.
@@ -179,15 +173,14 @@ public abstract class AbstractJournalTest {
             // Reset the reader to a specific index and read the last entry again.
             reader.reset(2);
 
-            assertNotNull(reader.getCurrentEntry());
-            assertEquals(1, reader.getCurrentIndex());
-            assertEquals(1, reader.getCurrentEntry().index());
+            final var current = reader.getCurrentEntry();
+            assertNotNull(current);
+            assertEquals(1, current.index());
             assertEquals(2, reader.getNextIndex());
             entry2 = reader.tryNext();
             assertNotNull(entry2);
             assertEquals(2, entry2.index());
             assertEquals(entry2, reader.getCurrentEntry());
-            assertEquals(2, reader.getCurrentIndex());
             assertNull(reader.tryNext());
         }
     }
@@ -283,9 +276,9 @@ public abstract class AbstractJournalTest {
 
                 if (i > 6) {
                     reader.reset(i - 5);
-                    assertNotNull(reader.getCurrentEntry());
-                    assertEquals(i - 6, reader.getCurrentIndex());
-                    assertEquals(i - 6, reader.getCurrentEntry().index());
+                    final var current = reader.getCurrentEntry();
+                    assertNotNull(current);
+                    assertEquals(i - 6, current.index());
                     assertEquals(i - 5, reader.getNextIndex());
                     reader.reset(i + 1);
                 }
@@ -366,14 +359,12 @@ public abstract class AbstractJournalTest {
             journal.compact(entriesPerSegment * 5 + 1);
 
             assertNull(uncommittedReader.getCurrentEntry());
-            assertEquals(0, uncommittedReader.getCurrentIndex());
             assertEquals(entriesPerSegment * 5 + 1, uncommittedReader.getNextIndex());
             var entry = uncommittedReader.tryNext();
             assertNotNull(entry);
             assertEquals(entriesPerSegment * 5 + 1, entry.index());
 
             assertNull(committedReader.getCurrentEntry());
-            assertEquals(0, committedReader.getCurrentIndex());
             assertEquals(entriesPerSegment * 5 + 1, committedReader.getNextIndex());
             entry = committedReader.tryNext();
             assertNotNull(entry);