[refactor] Remove reflection

Author: adamretter

exist-core/src/main/java/org/exist/storage/journal/Journal.java

@@ -203,7 +203,8 @@ public final class Journal implements Closeable {
      */
     @ConfigurationFieldAsAttribute("minSize")
     //TODO: conf.xml refactoring <recovery minSize=""> => <journal minSize="">
-    private final long journalSizeMin;
+    // package-private accessibility for testing
+    long journalSizeMin;
 
     /**
      * size limit for the journal file. A checkpoint will be triggered if the file

exist-core/src/main/java/org/exist/storage/journal/JournalManager.java

@@ -61,7 +61,8 @@ public class JournalManager implements BrokerPoolService {
 
     @GuardedBy("this") private Path journalDir;
     @GuardedBy("this") private boolean groupCommits;
-    @GuardedBy("this") private Journal journal;
+    // package-private accessibility for testing
+    @GuardedBy("this") Journal journal;
     @GuardedBy("this") private boolean journallingDisabled = false;
     @GuardedBy("this") private boolean initialized = false;
 

exist-core/src/test/java/org/exist/storage/journal/AbstractJournalTest.java

@@ -65,10 +65,6 @@
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -1414,19 +1410,12 @@ protected void assertPartialOrdered(final List<ExpectedLoggable> expectedPartial
     /**
      * Check point's the journal, and forces switching to a new journal file.
      */
-    protected void checkpointJournalAndSwitchFile() throws NoSuchFieldException, IllegalAccessException, TransactionException {
+    protected void checkpointJournalAndSwitchFile() throws TransactionException {
+        final Journal journal = existEmbeddedServer.getBrokerPool().getJournalManager().get().journal;
 
         //set Journal#journalMinSize = 0, so that switch files will always happen
-        final Field fldMinReplace = Journal.class.getDeclaredField("journalSizeMin");
-        fldMinReplace.setAccessible(true);
-        final Field modifiersField = JDKCompatibility.getModifiersField();
-        modifiersField.setAccessible( true );
-        modifiersField.setInt( fldMinReplace, fldMinReplace.getModifiers() & ~Modifier.FINAL );
-        final Field fldJournal = JournalManager.class.getDeclaredField("journal");
-        fldJournal.setAccessible(true);
-        final Journal journal = (Journal)fldJournal.get(existEmbeddedServer.getBrokerPool().getJournalManager().get());
-        final long existingMinReplaceValue = fldMinReplace.getLong(journal);
-        fldMinReplace.setLong(journal, 0);
+        final long existingMinReplaceValue = journal.journalSizeMin;
+        journal.journalSizeMin = 0;
 
         // checkpoint the journal and switch file
         final BrokerPool pool = existEmbeddedServer.getBrokerPool();
@@ -1435,7 +1424,7 @@ protected void checkpointJournalAndSwitchFile() throws NoSuchFieldException, Ill
         }
 
         //restore the Journal#journalMinSize to its previous value
-        fldMinReplace.set(journal, existingMinReplaceValue);
+        journal.journalSizeMin = existingMinReplaceValue;
     }
 
     protected List<Loggable> readLatestJournalEntries() throws IOException, LogException {

exist-core/src/test/java/org/exist/storage/journal/JournalXmlTest.java

@@ -97,7 +97,7 @@ public static void storeTempXmlDocs() throws IOException {
     }
 
     @Test
-    public void largeJournalEntry_nonCorrupt() throws IllegalAccessException, EXistException, NoSuchFieldException, LockException, SAXException, PermissionDeniedException, IOException, InterruptedException {
+    public void largeJournalEntry_nonCorrupt() throws EXistException, LockException, SAXException, PermissionDeniedException, IOException, InterruptedException {
         checkpointJournalAndSwitchFile();
 
         // generate a string filled with random a-z characters which is larger than the journal buffer
@@ -126,7 +126,7 @@ public void largeJournalEntry_nonCorrupt() throws IllegalAccessException, EXistE
     }
 
     @Test
-    public void largeJournalEntry_corrupt() throws IllegalAccessException, EXistException, NoSuchFieldException, LockException, SAXException, PermissionDeniedException, IOException, InterruptedException {
+    public void largeJournalEntry_corrupt() throws EXistException, LockException, SAXException, PermissionDeniedException, IOException, InterruptedException {
         checkpointJournalAndSwitchFile();
 
         // generate a string filled with random a-z characters which is larger than the journal buffer