remove repository listing in indexer

Author: Vladimir Kotal

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

@@ -95,7 +95,6 @@ public final class Indexer {
     private static final Indexer index = new Indexer();
     private static Configuration cfg = null;
     private static boolean checkIndexVersion = false;
-    private static boolean listRepos = false;
     private static boolean runIndex = true;
     private static boolean optimizedChanged = false;
     private static boolean addProjects = false;
@@ -313,15 +312,10 @@ public static void main(String[] argv) {
             LOGGER.log(Level.INFO, "Indexer version {0} ({1})",
                     new Object[]{Info.getVersion(), Info.getRevision()});
 
-            // Get history first.
+            // Create history cache first.
             getInstance().prepareIndexer(env, searchRepositories, addProjects,
                     defaultProjects,
-                    listFiles, createDict, runIndex, subFiles, new ArrayList<>(repositories),
-                    listRepos);
-
-            if (listRepos) {
-                return;
-            }
+                    listFiles, createDict, runIndex, subFiles, new ArrayList<>(repositories));
 
             // And now index it all.
             if (runIndex || (optimizedChanged && env.isOptimizeDatabase())) {
@@ -551,10 +545,6 @@ public static String[] parseOptions(String[] argv) throws ParseException {
                 cfg.setAllowLeadingWildcard((Boolean)v);
             });
 
-            parser.on("--listRepos", "List all repository paths and exit.").Do(v -> {
-                listRepos = true;
-            });
-
             parser.on("-m", "--memory", "=number", Double.class,
                 "Amount of memory that may be used for buffering added documents and",
                 "deletions before they are flushed to the directory (default " + Configuration.defaultRamBufferSize + "MB).",
@@ -890,10 +880,9 @@ public void prepareIndexer(RuntimeEnvironment env,
                                boolean listFiles,
                                boolean createDict,
                                List<String> subFiles,
-                               List<String> repositories,
-                               boolean listRepoPaths) throws IndexerException, IOException {
+                               List<String> repositories) throws IndexerException, IOException {
         prepareIndexer(env, searchRepositories, addProjects, defaultProjects, listFiles, createDict, true,
-                subFiles, repositories, listRepoPaths);
+                subFiles, repositories);
     }
 
     /**
@@ -915,7 +904,6 @@ public void prepareIndexer(RuntimeEnvironment env,
      * @param createHistoryCache create history cache flag
      * @param subFiles list of directories
      * @param repositories list of repositories
-     * @param listRepoPaths print repository paths to standard output
      * @throws IndexerException indexer exception
      * @throws IOException I/O exception
      */
@@ -928,8 +916,7 @@ public void prepareIndexer(RuntimeEnvironment env,
             boolean createDict,
             boolean createHistoryCache,
             List<String> subFiles,
-            List<String> repositories,
-            boolean listRepoPaths) throws IndexerException, IOException {
+            List<String> repositories) throws IndexerException, IOException {
 
         if (env.getDataRootPath() == null) {
             throw new IndexerException("ERROR: Please specify a DATA ROOT path");
@@ -979,30 +966,12 @@ public void prepareIndexer(RuntimeEnvironment env,
             }
         }
 
-        if (searchRepositories || listRepoPaths) {
+        if (searchRepositories) {
             LOGGER.log(Level.INFO, "Scanning for repositories...");
             Statistics stats = new Statistics();
             env.setRepositories(env.getSourceRootPath());
             stats.report(LOGGER, String.format("Done scanning for repositories, found %d repositories",
                     env.getRepositories().size()));
-            
-            if (listRepoPaths) {
-                List<RepositoryInfo> repos = env.getRepositories();
-                String prefix = env.getSourceRootPath();
-                if (listRepoPaths) {
-                    if (repos.isEmpty()) {
-                        System.out.println("No repositories found.");
-                        return;
-                    }
-                    System.out.println("Repositories in " + prefix + ":");
-                    for (RepositoryInfo info : env.getRepositories()) {
-                        String dir = info.getDirectoryName();
-                        System.out.println(String.format("%s (%s)", dir.substring(prefix.length()), info.getType()));
-                    }
-                }
-
-                return;
-            }
         }
 
         if (listFiles) {

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

@@ -85,7 +85,7 @@ public static void setUpClass() throws Exception {
         IndexChangedListener progress = new DefaultIndexChangedListener();
         Indexer.getInstance().prepareIndexer(env, true, true,
                 new TreeSet<>(Collections.singletonList("/c")),
-                false, false, null, null, false);
+                false, false, null, null);
 
         Indexer.getInstance().doIndexerExecution(true, null, progress);
 

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

@@ -88,7 +88,7 @@ public static void setUpClass() throws Exception {
         Indexer indexer = Indexer.getInstance();
         indexer.prepareIndexer(
                 env, true, true, new TreeSet<>(Arrays.asList(new String[]{"/c"})),
-                false, false, null, null, false);
+                false, false, null, null);
         indexer.doIndexerExecution(true, null, null);
     }
 

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

@@ -91,7 +91,7 @@ private void testIndexVersion(boolean projectsEnabled, List<String> subFiles) th
         env.setHistoryEnabled(false);
         env.setProjectsEnabled(projectsEnabled);
         Indexer.getInstance().prepareIndexer(env, true, true, null,
-                false, false, null, null, false);
+                false, false, null, null);
         Indexer.getInstance().doIndexerExecution(true, null, null);
 
         IndexVersion.check(subFiles);

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

@@ -142,8 +142,7 @@ private void testPerProjectHistory(boolean globalOn) throws IndexerException, IO
                 false, // don't list files
                 false, // don't create dictionary
                 null, // subFiles - not needed since we don't list files
-                null, // repositories - not needed when not refreshing history
-                false); // don't list repos
+                null); // repositories - not needed when not refreshing history
 
         File repoRoot = new File(env.getSourceRootFile(), "git");
         File fileInRepo = new File(repoRoot, "main.c");
@@ -207,10 +206,9 @@ public void testSymlinks() throws IndexerException, IOException {
                 false, // don't list files
                 false, // don't create dictionary
                 null, // subFiles - not needed since we don't list files
-                null, // repositories - not needed when not refreshing history
-                false); // don't list repos
+                null); // repositories - not needed when not refreshing history
 
-        // Check the respository paths.
+        // Check the repository paths.
         List<RepositoryInfo> repos = env.getRepositories();
         assertEquals(repos.size(), 1);
         RepositoryInfo repo = repos.get(0);

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

@@ -121,7 +121,7 @@ public void testIndexGeneration() throws Exception {
         env.setDataRoot(repository.getDataRoot());
         env.setHistoryEnabled(false);
         Indexer.getInstance().prepareIndexer(env, true, true, new TreeSet<>(Collections.singletonList("/c")),
-                false, false, null, null, false);
+                false, false, null, null);
         Indexer.getInstance().doIndexerExecution(true, null, null);
     }
 
@@ -158,8 +158,7 @@ public void testRescanProjects() throws Exception {
                 false, // don't list files
                 false, // don't create dictionary
                 null, // subFiles - not needed since we don't list files
-                null, // repositories - not needed when not refreshing history
-                false); // don't list repos
+                null); // repositories - not needed when not refreshing history
 
         List<Project> newProjects = env.getProjectList();
 
@@ -486,7 +485,7 @@ public void testDefaultProjectsSingleProject() throws Exception {
         Indexer.getInstance().prepareIndexer(env, true, true, new TreeSet<>(Arrays.asList(new String[]{
                         Paths.get("/c").toString()
                 })),
-                false, false, null, null,false);
+                false, false, null, null);
         assertEquals(1, env.getDefaultProjects().size());
         assertEquals(new TreeSet<>(Arrays.asList(new String[]{"c"})),
                 env.getDefaultProjects().stream().map((Project p) -> p.getName()).collect(Collectors.toSet()));
@@ -512,7 +511,7 @@ public void testDefaultProjectsNonExistent() throws Exception {
                         Paths.get("/data").toString(),
                         Paths.get("/no-project-x32ds1").toString()
                 })),
-                false, false, null, null, false);
+                false, false, null, null);
         assertEquals(4, env.getDefaultProjects().size());
         assertEquals(new TreeSet<>(Arrays.asList(new String[]{"lisp", "pascal", "perl", "data"})),
                 env.getDefaultProjects().stream().map((Project p) -> p.getName()).collect(Collectors.toSet()));
@@ -536,7 +535,7 @@ public void testDefaultProjectsAll() throws Exception {
                         Paths.get("__all__").toString(),
                         Paths.get("/no-project-x32ds1").toString()
                 })),
-                false, false, null, null, false);
+                false, false, null, null);
         Set<String> projects = new TreeSet<>(Arrays.asList(new File(repository.getSourceRoot()).list()));
         assertEquals(projects.size(), env.getDefaultProjects().size());
         assertEquals(projects, env.getDefaultProjects().stream().map((Project p) -> p.getName()).collect(Collectors.toSet()));

opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchEngineTest.java

@@ -75,7 +75,7 @@ public static void setUpClass() throws Exception {
         env.setHistoryEnabled(false);
         Indexer.getInstance().prepareIndexer(env, true, true,
                 new TreeSet<>(Collections.singletonList("/c")),
-                false, false, null, null, false);
+                false, false, null, null);
         Indexer.getInstance().doIndexerExecution(true, null, null);
 
 

opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/SearchAndContextFormatterTest.java

@@ -89,7 +89,7 @@ public static void setUpClass() throws Exception {
         env.setHistoryEnabled(false);
         Indexer.getInstance().prepareIndexer(env, true, true,
                 new TreeSet<>(Collections.singletonList("/c")),
-                false, false, null, null, false);
+                false, false, null, null);
         Indexer.getInstance().doIndexerExecution(true, null, null);
 
         configFile = File.createTempFile("configuration", ".xml");

opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/SearchAndContextFormatterTest2.java

@@ -128,7 +128,7 @@ public static void setUpClass() throws Exception {
         env.setHistoryEnabled(false);
         Indexer.getInstance().prepareIndexer(env, true, true,
                 new TreeSet<>(Collections.singletonList("/c")),
-                false, false, null, null, false);
+                false, false, null, null);
 
         Project proj1 = env.getProjects().get(SYMLINK1);
         assertNotNull("symlink1 project", proj1);

opengrok-indexer/src/test/java/org/opengrok/indexer/web/SearchHelperTest.java

@@ -76,7 +76,7 @@ private void reindex() throws Exception {
 
         Indexer.getInstance().prepareIndexer(env, true, true,
             new TreeSet<>(Collections.singletonList("/c")),
-            false, false, null, null, false);
+            false, false, null, null);
         Indexer.getInstance().doIndexerExecution(true, null, null);
     }