move configuration check to Configuration class

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java

@@ -1535,4 +1535,45 @@ private static Configuration decodeObject(InputStream in) throws IOException {
 
         return conf;
     }
+
+    public static class ConfigurationException extends Exception {
+        static final long serialVersionUID = -1;
+
+        public ConfigurationException(String message) {
+            super(message);
+        }
+    }
+
+    /**
+     * Check if configuration is populated and self-consistent.
+     * @throws ConfigurationException on error
+     */
+    public void checkConfiguration() throws ConfigurationException {
+
+        if (getSourceRoot() == null) {
+            throw new ConfigurationException("Source root is not specified.");
+        }
+
+        if (getDataRoot() == null) {
+            throw new ConfigurationException("Data root is not specified.");
+        }
+
+        if (!new File(getSourceRoot()).canRead()) {
+            throw new ConfigurationException("Source root directory '" + getSourceRoot() + "' must be readable.");
+        }
+
+        if (!new File(getDataRoot()).canWrite()) {
+            throw new ConfigurationException("Data root directory '" + getDataRoot() + "' must be writable.");
+        }
+
+        if (!isHistoryEnabled() && isHistoryBasedReindex()) {
+            LOGGER.log(Level.INFO, "History based reindex is on, however history is off. " +
+                    "History has to be enabled for history based reindex.");
+        }
+
+        if (!isHistoryCache() && isHistoryBasedReindex()) {
+            LOGGER.log(Level.INFO, "History based reindex is on, however history cache is off. " +
+                    "History cache has to be enabled for history based reindex.");
+        }
+    }
 }

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

@@ -190,11 +190,7 @@ public static void main(String[] argv) {
                 exitWithHelp();
             }
 
-            try {
-                checkConfiguration();
-            } catch (ConfigurationException e) {
-                die(e.getMessage());
-            }
+            checkConfiguration();
 
             if (awaitProfiler) {
                 pauseToAwaitProfiler();
@@ -419,6 +415,22 @@ public static void main(String[] argv) {
         }
     }
 
+    private static void checkConfiguration() {
+        if (bareConfig && (env.getConfigURI() == null || env.getConfigURI().isEmpty())) {
+            die("Missing webappURI setting");
+        }
+
+        if (!repositories.isEmpty() && !cfg.isHistoryEnabled()) {
+            die("Repositories were specified; history is off however");
+        }
+
+        try {
+            cfg.checkConfiguration();
+        } catch (Configuration.ConfigurationException e) {
+            die(e.getMessage());
+        }
+    }
+
     /**
      * Parse OpenGrok Indexer options
      * This method was created so that it would be easier to write unit
@@ -887,52 +899,6 @@ public static String[] parseOptions(String[] argv) throws ParseException {
         return argv;
     }
 
-    static class ConfigurationException extends Exception {
-        static final long serialVersionUID = -1;
-
-        public ConfigurationException(String message) {
-            super(message);
-        }
-    }
-
-    // TODO: move this Configuration
-    private static void checkConfiguration() throws ConfigurationException {
-        env = RuntimeEnvironment.getInstance();
-
-        if (bareConfig && (env.getConfigURI() == null || env.getConfigURI().isEmpty())) {
-            throw new ConfigurationException("Missing webappURI setting");
-        }
-
-        if (!repositories.isEmpty() && !cfg.isHistoryEnabled()) {
-            throw new ConfigurationException("Repositories were specified; history is off however");
-        }
-
-        if (cfg.getSourceRoot() == null) {
-            throw new ConfigurationException("Please specify a SRC_ROOT with option -s !");
-        }
-        if (cfg.getDataRoot() == null) {
-            throw new ConfigurationException("Please specify a DATA ROOT path");
-        }
-
-        if (!new File(cfg.getSourceRoot()).canRead()) {
-            throw new ConfigurationException("Source root '" + cfg.getSourceRoot() + "' must be readable");
-        }
-
-        if (!new File(cfg.getDataRoot()).canWrite()) {
-            throw new ConfigurationException("Data root '" + cfg.getDataRoot() + "' must be writable");
-        }
-
-        if (!cfg.isHistoryEnabled() && cfg.isHistoryBasedReindex()) {
-            LOGGER.log(Level.INFO, "History based reindex is on, however history is off. " +
-                    "History has to be enabled for history based reindex.");
-        }
-
-        if (!cfg.isHistoryCache() && cfg.isHistoryBasedReindex()) {
-            LOGGER.log(Level.INFO, "History based reindex is on, however history cache is off. " +
-                    "History cache has to be enabled for history based reindex.");
-        }
-    }
-
     private static void die(String message) {
         System.err.println("ERROR: " + message);
         System.exit(1);