Opt parser private (#2265)

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java

@@ -104,7 +104,7 @@ public final class Indexer {
     private static RuntimeEnvironment env = null;
     private static String host = null;
 
-    public static OptionParser openGrok = null;
+    private static OptionParser optParser = null;
 
     public static Indexer getInstance() {
         return index;
@@ -319,7 +319,7 @@ public static void main(String argv[]) {
             System.exit(1);
         } catch (IndexerException ex) {
             LOGGER.log(Level.SEVERE, "Exception running indexer", ex);
-            System.err.println(openGrok.getUsage());
+            System.err.println(optParser.getUsage());
             System.exit(1);
         } catch (Throwable e) {
             LOGGER.log(Level.SEVERE, "Unexpected Exception", e);
@@ -402,7 +402,7 @@ public static String[] parseOptions(String[] argv) throws ParseException {
         // An example of how to add a data type for option parsing
         OptionParser.accept(WebAddress.class, s -> { return parseWebAddress(s); });
 
-        openGrok = OptionParser.Do(parser -> {
+        optParser = OptionParser.Do(parser -> {
             parser.setPrologue(
                 String.format("\nUsage: java -jar %s [options] [subDir1 [...]]\n", program));
 
@@ -779,7 +779,7 @@ public static String[] parseOptions(String[] argv) throws ParseException {
 
         cfg.setHistoryEnabled(false);  // force user to turn on history capture
 
-        argv = openGrok.parse(argv);
+        argv = optParser.parse(argv);
 
         return argv;
     }

opengrok-indexer/src/test/java/org/opengrok/indexer/util/OptionParserTest.java

@@ -29,6 +29,7 @@
 import org.junit.Test;
 import static org.junit.Assert.*;
 
+import java.lang.reflect.Field;
 import java.text.ParseException;
 import org.opengrok.indexer.index.Indexer;
 
@@ -524,12 +525,16 @@ public void catchNamelessOption() {
 
     // Fail options put into Indexer.java that do not have a description.
     @Test
-    public void catchIndexerOptionsWithoutDescription() {
+    public void catchIndexerOptionsWithoutDescription() throws NoSuchFieldException, IllegalAccessException {
         String[] argv = {"---unitTest"};
         try {
             Indexer.parseOptions(argv);
-            OptionParser op = Indexer.openGrok;
-            
+
+            // Use reflection to get the option parser from Indexer.
+            Field f = Indexer.class.getDeclaredField("optParser");
+            f.setAccessible(true);
+            OptionParser op = (OptionParser) f.get(Indexer.class);
+
             for (OptionParser.Option o : op.getOptionList()) {
                 if (o.description == null) {
                     fail("'"+o.names.get(0) + "' option needs description");