Match paths with regex instead of glob to eliminate false matches

Author: sbabcoc

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

@@ -80,7 +80,7 @@ public static Path getNextPath(Path targetPath, String baseName, String extensio
             throw new IllegalArgumentException("[extension] must specify a non-empty string");
         }
 
-        PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher("glob:" + baseName + "*." + extension);
+        PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher("regex:" + baseName + "(-\\d+)?\\." + extension);
 
         try (Stream<Path> stream = Files.walk(targetPath, 1)) {
             int ext = extension.length() + 1;

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

@@ -30,12 +30,14 @@ public void testNextPath() throws IOException {
             Files.createDirectories(targetPath);
         }
 
-        Path path1 = PathUtils.getNextPath(targetPath, "test", "txt");
-        assertEquals(path1.getFileName().toString(), "test.txt");
+        Path path1 = PathUtils.getNextPath(targetPath, "testNextPath", "txt");
+        assertEquals(path1.getFileName().toString(), "testNextPath.txt");
 
         path1.toFile().createNewFile();
-        Path path2 = PathUtils.getNextPath(targetPath, "test", "txt");
-        assertEquals(path2.getFileName().toString(), "test-2.txt");
+        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");
     }
 
     private Path getOutputPath() {