simplify stencil.fs.unix-path

Author: erdos

java-src/io/github/erdos/stencil/impl/FileHelper.java

@@ -2,10 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
 import java.util.UUID;
-import java.util.regex.Pattern;
 
 import static java.lang.System.getProperty;
 
@@ -101,29 +98,6 @@ public static void forceDelete(final File file) {
         file.delete();
     }
 
-    /**
-     * Returns a string representation of path with unix separators ("/") instead of the
-     * system-dependent separators (which is backslash on Windows).
-     *
-     * @param path not null path object
-     * @return string of path with slash separators
-     * @throws IllegalArgumentException if path is null
-     */
-    public static String toUnixSeparatedString(Path path) {
-        if (path == null) {
-            throw new IllegalArgumentException("Path must not be null!");
-        } else {
-            final String separator = FileSystems.getDefault().getSeparator();
-            if (separator.equals("/")) {
-                // on unix systems
-                return path.toString();
-            } else {
-                // on Windows systems we replace backslash with slashes
-                return path.toString().replaceAll(Pattern.quote(separator), "/");
-            }
-        }
-    }
-
     private static <T> T requireNonNullElse(T first, T second) {
         return first == null ? second : first;
     }

src/stencil/fs.clj

@@ -10,8 +10,13 @@
 (defn directory? [^File file]
   (.isDirectory file))
 
-(defn unix-path ^String [^File f]
-  (some-> f .toPath FileHelper/toUnixSeparatedString))
+(defn unix-path
+  "Returns a string representation of path with unix separators ('/')
+   instead of the system-dependent separators (which is backslash on Windows)."  
+  ^String [^File f]
+  (when f
+    (let [path (.toPath f)]
+      (.replace (str path) (.getSeparator (.getFileSystem path)) "/"))))
 
 (defn parent-file ^File [^File f]
   (.getParentFile f))