Use try-with-resources in testCompactAndRecover

Eclipse is flagging a warning here, make sure we silence it.

Change-Id: I7bfa9d490e8b9b71bf04511bc42d6d101345b179
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 5f94b4541a4ba5213e4dd763799c0fec3faaf54c..f2ef0b131265e2e6503a8e6c875aad3afe9ee2e2 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
@@ -68,7 +68,7 @@ public abstract class AbstractJournalTest {
         var runs = new ArrayList<Object[]>();
         for (int i = 1; i <= 10; i++) {
             for (int j = 1; j <= 10; j++) {
-                runs.add(new Object[]{64 + i * (NAMESPACE.serialize(ENTRY).length + 8) + j});
+                runs.add(new Object[] { 64 + i * (NAMESPACE.serialize(ENTRY).length + 8) + j });
             }
         }
         return runs;
@@ -370,36 +370,34 @@ public abstract class AbstractJournalTest {
      */
     @Test
     public void testCompactAndRecover() throws Exception {
-        SegmentedJournal<TestEntry> journal = createJournal();
+        try (var journal = createJournal()) {
+            // Write three segments to the journal.
+            final var writer = journal.writer();
+            for (int i = 0; i < entriesPerSegment * 3; i++) {
+                writer.append(ENTRY);
+            }
 
-        // Write three segments to the journal.
-        JournalWriter<TestEntry> writer = journal.writer();
-        for (int i = 0; i < entriesPerSegment * 3; i++) {
-            writer.append(ENTRY);
+            // Commit the entries and compact the first segment.
+            writer.commit(entriesPerSegment * 3);
+            journal.compact(entriesPerSegment + 1);
         }
 
-        // Commit the entries and compact the first segment.
-        writer.commit(entriesPerSegment * 3);
-        journal.compact(entriesPerSegment + 1);
-
-        // Close the journal.
-        journal.close();
-
         // Reopen the journal and create a reader.
-        journal = createJournal();
-        writer = journal.writer();
-        JournalReader<TestEntry> reader = journal.openReader(1, JournalReader.Mode.COMMITS);
-        writer.append(ENTRY);
-        writer.append(ENTRY);
-        writer.commit(entriesPerSegment * 3);
-
-        // Ensure the reader starts at the first physical index in the journal.
-        assertEquals(entriesPerSegment + 1, reader.getNextIndex());
-        assertEquals(reader.getFirstIndex(), reader.getNextIndex());
-        assertTrue(reader.hasNext());
-        assertEquals(entriesPerSegment + 1, reader.getNextIndex());
-        assertEquals(reader.getFirstIndex(), reader.getNextIndex());
-        assertEquals(entriesPerSegment + 1, reader.next().index());
+        try (var journal = createJournal()) {
+            final var writer = journal.writer();
+            final var reader = journal.openReader(1, JournalReader.Mode.COMMITS);
+            writer.append(ENTRY);
+            writer.append(ENTRY);
+            writer.commit(entriesPerSegment * 3);
+
+            // Ensure the reader starts at the first physical index in the journal.
+            assertEquals(entriesPerSegment + 1, reader.getNextIndex());
+            assertEquals(reader.getFirstIndex(), reader.getNextIndex());
+            assertTrue(reader.hasNext());
+            assertEquals(entriesPerSegment + 1, reader.getNextIndex());
+            assertEquals(reader.getFirstIndex(), reader.getNextIndex());
+            assertEquals(entriesPerSegment + 1, reader.next().index());
+        }
     }
 
     @Before