Merge pull request #1 from Nordstrom/pr/fix-next-path-bug

Fix bug in getNextPath

Author: sbabcoc

src/main/java/com/nordstrom/common/file/PathUtils.java

@@ -10,8 +10,6 @@
 import java.util.Comparator;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 /**
@@ -173,25 +171,23 @@ public static Path getNextPath(Path targetPath, String baseName, String extensio
         PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher("regex:" + baseName + "(-\\d+)?\\." + extension);
 
         try (Stream<Path> stream = Files.walk(targetPath, 1)) {
+        	int base = baseName.length();
             int ext = extension.length() + 1;
 
-            Optional<String> optional =
+            Optional<Integer> optional =
                 stream
                 .map(Path::getFileName)
                 .filter(pathMatcher::matches)
                 .map(String::valueOf)
-                .map(s -> s.substring(0, s.length() - ext))
+                .map(s -> "0" + s.substring(base, s.length() - ext))
+                .map(s -> s.replace("0-", ""))
+                .map(Integer::valueOf)
+                .map(i -> i + 1)
                 .sorted(Comparator.reverseOrder())
                 .findFirst();
 
             if (optional.isPresent()) {
-                int index = 1;
-                Pattern pattern = Pattern.compile(baseName + "-(\\d+)");
-                Matcher matcher = pattern.matcher(optional.get());
-                if (matcher.matches()) {
-                    index = Integer.parseInt(matcher.group(1));
-                }
-                newName = baseName + "-" + Integer.toString(index + 1) + "." + extension;
+                newName = baseName + "-" + optional.get() + "." + extension;
             } else {
                 newName = baseName + "." + extension;
             }

src/test/java/com/nordstrom/common/file/PathUtilsTest.java

@@ -36,9 +36,17 @@ public void testNextPath() throws IOException {
         path1.toFile().createNewFile();
 
         Path path2 = PathUtils.getNextPath(targetPath, "testNextPath", "txt");
-        assertEquals(path2.getFileName().toString(), "testNextPath-2.txt");
-        Path path3 = PathUtils.getNextPath(targetPath, "test", "txt");
-        assertEquals(path3.getFileName().toString(), "test.txt");
+        assertEquals(path2.getFileName().toString(), "testNextPath-1.txt");
+        
+        path2.toFile().createNewFile();
+        targetPath.resolve("testNextPath-9.txt").toFile().createNewFile();
+        targetPath.resolve("testNextPath-10.txt").toFile().createNewFile();
+        
+        Path path3 = PathUtils.getNextPath(targetPath, "testNextPath", "txt");
+        assertEquals(path3.getFileName().toString(), "testNextPath-11.txt");
+        
+        Path path4 = PathUtils.getNextPath(targetPath, "test", "txt");
+        assertEquals(path4.getFileName().toString(), "test.txt");
     }
 
     private Path getOutputPath() {