keep the subFiles in a Set

fixes #3904

Author: vladak

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

@@ -33,6 +33,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -1604,10 +1605,10 @@ public void setConfiguration(Configuration configuration, CommandTimeoutType cmd
      * Sets the configuration and performs necessary actions.
      *
      * @param configuration new configuration
-     * @param subFileList   list of repositories
+     * @param subFileList   collection of repositories
      * @param cmdType       command timeout type
      */
-    public synchronized void setConfiguration(Configuration configuration, List<String> subFileList, CommandTimeoutType cmdType) {
+    public synchronized void setConfiguration(Configuration configuration, Collection<String> subFileList, CommandTimeoutType cmdType) {
         try (ResourceLock resourceLock = configLock.writeLockAsResource()) {
             //noinspection ConstantConditions to avoid warning of no reference to auto-closeable
             assert resourceLock != null;

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

@@ -804,10 +804,10 @@ public void removeRepositories(Collection<String> repos) {
     /**
      * Set list of known repositories which match the list of directories.
      * @param repos list of repositories
-     * @param dirs list of directories that might correspond to the repositories
+     * @param dirs collection of directories that might correspond to the repositories
      * @param cmdType command timeout type
      */
-    public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, List<String> dirs, CommandTimeoutType cmdType) {
+    public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, Collection<String> dirs, CommandTimeoutType cmdType) {
         if (repos != null && !repos.isEmpty() && dirs != null && !dirs.isEmpty()) {
             List<RepositoryInfo> newrepos = new ArrayList<>();
             for (RepositoryInfo i : repos) {

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

@@ -25,7 +25,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
+import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.lucene.index.SegmentInfos;
@@ -77,13 +77,12 @@ private IndexCheck() {
     /**
      * Check if version of index(es) matches major Lucene version.
      * @param configuration configuration based on which to perform the check
-     * @param subFilesList list of paths. If non-empty, only projects matching these paths will be checked.
+     * @param subFilesList collection of paths. If non-empty, only projects matching these paths will be checked.
      * @return true on success, false on failure
      */
-    public static boolean check(@NotNull Configuration configuration, List<String> subFilesList) {
+    public static boolean check(@NotNull Configuration configuration, Collection<String> subFilesList) {
         File indexRoot = new File(configuration.getDataRoot(), IndexDatabase.INDEX_DIR);
-        LOGGER.log(Level.FINE, "Checking for Lucene index version mismatch in {0}",
-                indexRoot);
+        LOGGER.log(Level.FINE, "Checking for Lucene index version mismatch in {0}", indexRoot);
         int ret = 0;
 
         if (!subFilesList.isEmpty()) {

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

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2011, Jens Elkner.
  * Portions Copyright (c) 2017, 2020, Chris Fraire <[email protected]>.
  */
@@ -164,7 +164,7 @@ public static void main(String[] argv) {
 
         Executor.registerErrorHandler();
         List<String> subFiles = RuntimeEnvironment.getInstance().getSubFiles();
-        ArrayList<String> subFilesList = new ArrayList<>();
+        Set<String> subFilesArgs = new HashSet<>();
 
         boolean createDict = false;
 
@@ -242,10 +242,11 @@ public static void main(String[] argv) {
             cfg.setCanonicalRoots(canonicalRoots);
 
             // Assemble the unprocessed command line arguments (possibly a list of paths).
-            // This will be used to perform more fine-grained checking in invalidateRepositories().
+            // This will be used to perform more fine-grained checking in invalidateRepositories()
+            // called from the setConfiguration() below.
             for (String arg : argv) {
                 String path = Paths.get(cfg.getSourceRoot(), arg).toString();
-                subFilesList.add(path);
+                subFilesArgs.add(path);
             }
 
             // If a user used customizations for projects he perhaps just
@@ -266,10 +267,10 @@ public static void main(String[] argv) {
                     System.exit(1);
                 }
 
-                if (!IndexCheck.check(cfg, subFilesList)) {
+                if (!IndexCheck.check(cfg, subFilesArgs)) {
                     System.err.printf("Index check failed%n");
                     System.err.print("You might want to remove " +
-                            (!subFilesList.isEmpty() ? "data for projects " + String.join(",", subFilesList) :
+                            (!subFilesArgs.isEmpty() ? "data for projects " + String.join(",", subFilesArgs) :
                                     "all data") + " under the data root and reindex\n");
                     System.exit(1);
                 }
@@ -278,7 +279,7 @@ public static void main(String[] argv) {
             }
 
             // Set updated configuration in RuntimeEnvironment.
-            env.setConfiguration(cfg, subFilesList, CommandTimeoutType.INDEXER);
+            env.setConfiguration(cfg, subFilesArgs, CommandTimeoutType.INDEXER);
 
             // Let repository types to add items to ignoredNames.
             // This changes env so is called after the setConfiguration()
@@ -299,7 +300,7 @@ public static void main(String[] argv) {
              * directory and not per project data root directory).
              * For the check we need to have 'env' already set.
              */
-            for (String path : subFilesList) {
+            for (String path : subFilesArgs) {
                 String srcPath = env.getSourceRootPath();
                 if (srcPath == null) {
                     System.err.println("Error getting source root from environment. Exiting.");
@@ -326,7 +327,7 @@ public static void main(String[] argv) {
                 }
             }
 
-            if (!subFilesList.isEmpty() && subFiles.isEmpty()) {
+            if (!subFilesArgs.isEmpty() && subFiles.isEmpty()) {
                 System.err.println("None of the paths were added, exiting");
                 System.exit(1);
             }