Remove unnecessary stripCount parameter

Author: idodeclare

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

@@ -19,7 +19,7 @@
 
  /*
   * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
-  * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+  * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
   */
 package org.opengrok.indexer.configuration;
 
@@ -424,7 +424,7 @@ public void setSourceRoot(String sourceRoot) {
      */
     public String getPathRelativeToSourceRoot(File file)
             throws IOException, ForbiddenSymlinkException {
-        return PathUtils.getPathRelativeToSourceRoot(file, 0);
+        return PathUtils.getPathRelativeToSourceRoot(file);
     }
 
     /**
@@ -1457,7 +1457,7 @@ private void generateProjectRepositoriesMap() throws IOException {
             String repoPath;
             try {
                 repoPath = PathUtils.getPathRelativeToSourceRoot(
-                        new File(r.getDirectoryName()), 0);
+                        new File(r.getDirectoryName()));
             } catch (ForbiddenSymlinkException e) {
                 LOGGER.log(Level.FINER, e.getMessage());
                 continue;

opengrok-indexer/src/main/java/org/opengrok/indexer/util/PathUtils.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2017, Chris Fraire <[email protected]>.
+ * Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
  */
 
 package org.opengrok.indexer.util;
@@ -189,15 +189,14 @@ private static boolean isAllowedSymlink(String canonicalFile,
      * source root.
      *
      * @param file A file to resolve
-     * @param stripCount Number of characters past source root to strip
      * @return Path relative to source root
      * @throws IOException if an IO error occurs
      * @throws FileNotFoundException if the file is not relative to source root
      * @throws ForbiddenSymlinkException if symbolic-link checking encounters
      * an ineligible link
      * @throws InvalidPathException if the path cannot be decoded
      */
-    public static String getPathRelativeToSourceRoot(File file, int stripCount)
+    public static String getPathRelativeToSourceRoot(File file)
             throws IOException, ForbiddenSymlinkException, FileNotFoundException,
             InvalidPathException {
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
@@ -215,7 +214,7 @@ public static String getPathRelativeToSourceRoot(File file, int stripCount)
             // elsewhere directly appended to env.getSourceRootPath() and also
             // stored as such.
             maybeRelPath = File.separator + maybeRelPath;
-            return maybeRelPath.substring(stripCount);
+            return maybeRelPath;
         }
 
         throw new FileNotFoundException("Failed to resolve [" + file.getPath()