get rid of verbosity flag

Author: Vladimir Kotal

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

@@ -163,7 +163,6 @@ public final class Configuration {
      * Lucene 4.x uses 16MB and 8 threads, so below is a nice tunable.
      */
     private double ramBufferSize;
-    private boolean verbose;
     /**
      * If below is set, then we count how many files per project we need to
      * process and print percentage of completion per project.
@@ -465,7 +464,6 @@ public Configuration() {
         // Set to empty string so we can append it to the URL
         // unconditionally later.
         setUserPageSuffix("");
-        setVerbose(false);
         setWebappLAF("default");
     }
 
@@ -847,14 +845,6 @@ public void setRamBufferSize(double ramBufferSize) {
         this.ramBufferSize = ramBufferSize;
     }
 
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
     public boolean isPrintProgress() {
         return printProgress;
     }

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

@@ -821,24 +821,6 @@ public void setPluginStack(AuthorizationStack pluginStack) {
         threadConfig.get().setPluginStack(pluginStack);
     }
 
-    /**
-     * Is the verbosity flag turned on?
-     *
-     * @return true if we can print extra information
-     */
-    public boolean isVerbose() {
-        return threadConfig.get().isVerbose();
-    }
-
-    /**
-     * Set the verbosity flag (to add extra debug information in output)
-     *
-     * @param verbose new value
-     */
-    public void setVerbose(boolean verbose) {
-        threadConfig.get().setVerbose(verbose);
-    }
-
     /**
      * Is the progress print flag turned on?
      *

opengrok-indexer/src/main/java/org/opengrok/indexer/history/ClearCaseRepository.java

@@ -59,33 +59,13 @@ public class ClearCaseRepository extends Repository {
      */
     public static final String CMD_FALLBACK = "cleartool";
 
-    private boolean verbose;
-
     public ClearCaseRepository() {
         type = "ClearCase";
         datePatterns = new String[]{
             "yyyyMMdd.HHmmss"
         };
     }
 
-    /**
-     * Use verbose log messages, or just the summary
-     *
-     * @return true if verbose log messages are used for this repository
-     */
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    /**
-     * Specify if verbose log messages or just the summary should be used
-     *
-     * @param verbose set to true if verbose messages should be used
-     */
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
     /**
      * Get an executor to be used for retrieving the history log for the named
      * file.

opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryGuru.java

@@ -413,10 +413,8 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
                         }
                     }
                 } else {
-                    if (RuntimeEnvironment.getInstance().isVerbose()) {
-                        LOGGER.log(Level.CONFIG, "Adding <{0}> repository: <{1}>",
-                                new Object[]{repository.getClass().getName(), path});
-                    }
+                    LOGGER.log(Level.CONFIG, "Adding <{0}> repository: <{1}>",
+                            new Object[]{repository.getClass().getName(), path});
 
                     repoList.add(new RepositoryInfo(repository));
                     putRepository(repository);
@@ -497,19 +495,15 @@ public Collection<RepositoryInfo> getRepositories() {
      * Update the source contents in all repositories.
      */
     public void updateRepositories() {
-        boolean verbose = RuntimeEnvironment.getInstance().isVerbose();
-
         for (Map.Entry<String, Repository> entry : repositories.entrySet()) {
             Repository repository = entry.getValue();
 
             String path = entry.getKey();
             String type = repository.getClass().getSimpleName();
 
             if (repository.isWorking()) {
-                if (verbose) {
-                    LOGGER.info(String.format("Update %s repository in %s",
-                            type, path));
-                }
+                LOGGER.info(String.format("Update %s repository in %s",
+                        type, path));
 
                 try {
                     repository.update();
@@ -533,18 +527,14 @@ public void updateRepositories() {
      * @param paths A list of files/directories to update
      */
     public void updateRepositories(Collection<String> paths) {
-        boolean verbose = RuntimeEnvironment.getInstance().isVerbose();
-
         List<Repository> repos = getReposFromString(paths);
 
         for (Repository repository : repos) {
             String type = repository.getClass().getSimpleName();
 
             if (repository.isWorking()) {
-                if (verbose) {
-                    LOGGER.info(String.format("Update %s repository in %s", type,
-                            repository.getDirectoryName()));
-                }
+                LOGGER.info(String.format("Update %s repository in %s", type,
+                        repository.getDirectoryName()));
 
                 try {
                     repository.update();
@@ -575,13 +565,10 @@ private void createCache(Repository repository, String sinceRevision) {
         }
 
         if (repository.isWorking()) {
-            boolean verbose = RuntimeEnvironment.getInstance().isVerbose();
             Statistics elapsed = new Statistics();
 
-            if (verbose) {
-                LOGGER.log(Level.INFO, "Creating historycache for {0} ({1})",
-                        new Object[]{path, type});
-            }
+            LOGGER.log(Level.INFO, "Creating historycache for {0} ({1})",
+                    new Object[]{path, type});
 
             try {
                 repository.createCache(historyCache, sinceRevision);
@@ -591,9 +578,7 @@ private void createCache(Repository repository, String sinceRevision) {
                         + type + ")", e);
             }
 
-            if (verbose) {
-                elapsed.report(LOGGER, "Done historycache for " + path);
-            }
+            elapsed.report(LOGGER, "Done historycache for " + path);
         } else {
             LOGGER.log(Level.WARNING,
                     "Skipping creation of historycache of {0} repository in {1}: Missing SCM dependencies?",
@@ -935,11 +920,8 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, b
         Map<String, Repository> newrepos =
             Collections.synchronizedMap(new HashMap<>(repos.size()));
         Statistics elapsed = new Statistics();
-        boolean verbose = RuntimeEnvironment.getInstance().isVerbose();
 
-        if (verbose) {
-            LOGGER.log(Level.FINE, "invalidating {0} repositories", repos.size());
-        }
+        LOGGER.log(Level.FINE, "invalidating {0} repositories", repos.size());
 
         /*
          * getRepository() below does various checks of the repository
@@ -994,9 +976,7 @@ public void run() {
         repositories.clear();
         newrepos.forEach((_key, repo) -> { putRepository(repo); });
 
-        if (verbose) {
-            elapsed.report(LOGGER, "done invalidating repositories");
-        }
+        elapsed.report(LOGGER, "done invalidating repositories");
     }
 
     /**

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

@@ -105,6 +105,7 @@ public final class Indexer {
     private static String host = null;
 
     private static OptionParser optParser = null;
+    private static boolean verbose = false;
 
     public static Indexer getInstance() {
         return index;
@@ -164,7 +165,7 @@ public static void main(String argv[]) {
             }
 
             // Logging starts here.
-            if (cfg.isVerbose()) {
+            if (verbose) {
                 String fn = LoggerUtil.getFileHandlerPattern();
                 if (fn != null) {
                     System.out.println("Logging filehandler pattern: " + fn);
@@ -639,7 +640,6 @@ public static String[] parseOptions(String[] argv) throws ParseException {
             });
 
             parser.on("-q", "--quiet", "Run as quietly as possible.").Do( v -> {
-                cfg.setVerbose(false);
                 LoggerUtil.setBaseConsoleLogLevel(Level.WARNING);
             });
 
@@ -758,7 +758,7 @@ public static String[] parseOptions(String[] argv) throws ParseException {
             });
 
             parser.on("-v", "--verbose", "Print progress information as we go along.").Do( v -> {
-                cfg.setVerbose(true);
+                verbose = true;
                 LoggerUtil.setBaseConsoleLogLevel(Level.INFO);
             });
 

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/executables/JarAnalyzerTest.java

@@ -81,7 +81,6 @@ public static void setUpClass() throws Exception {
         env.setDataRoot(repository.getDataRoot());
         RepositoryFactory.initializeIgnoredNames(env);
 
-        env.setVerbose(false);
         env.setHistoryEnabled(false);
         IndexChangedListener progress = new DefaultIndexChangedListener();
         Indexer.getInstance().prepareIndexer(env, true, true,

opengrok-indexer/src/test/java/org/opengrok/indexer/configuration/RuntimeEnvironmentTest.java

@@ -293,14 +293,6 @@ public void testRamBufferSize() {
         assertEquals(256, instance.getRamBufferSize(), 0);
     }
 
-    @Test
-    public void testVerbose() {
-        RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
-        assertFalse(instance.isVerbose());
-        instance.setVerbose(true);
-        assertTrue(instance.isVerbose());
-    }
-
     @Test
     public void testAllowLeadingWildcard() {
         RuntimeEnvironment instance = RuntimeEnvironment.getInstance();

opengrok-indexer/src/test/java/org/opengrok/indexer/history/HistoryGuruTest.java

@@ -70,8 +70,6 @@ public static void setUpClass() throws Exception {
                 FILES, true);
         Assert.assertNotEquals(0, FILES.size());
 
-        env.setVerbose(true);
-
         HistoryGuru histGuru = HistoryGuru.getInstance();
         assertNotNull(histGuru);
         Assert.assertEquals(0, histGuru.getRepositories().size());

opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexVersionTest.java

@@ -88,7 +88,6 @@ public void tearDown() throws IOException {
      * @throws Exception 
      */
     private void testIndexVersion(boolean projectsEnabled, List<String> subFiles) throws Exception {
-        env.setVerbose(true);
         env.setHistoryEnabled(false);
         env.setProjectsEnabled(projectsEnabled);
         Indexer.getInstance().prepareIndexer(env, true, true, null,

opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerTest.java

@@ -117,7 +117,6 @@ public void testIndexGeneration() throws Exception {
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
         env.setSourceRoot(repository.getSourceRoot());
         env.setDataRoot(repository.getDataRoot());
-        env.setVerbose(true);
         env.setHistoryEnabled(false);
         Indexer.getInstance().prepareIndexer(env, true, true, new TreeSet<>(Collections.singletonList("/c")),
                 false, false, null, null, new ArrayList<>(), false);