Merge pull request #50 from ethauvin/main

More cleanups to jlink, jmod & jpackage operations, options and tests
rife2 · Aug 29, 2024 · a07db3f · a07db3f
2 parents c7ca0e2 + 5da9e4b
commit a07db3f
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 196 deletions.
diff --git a/src/main/java/rife/bld/operations/AbstractToolProviderOperation.java b/src/main/java/rife/bld/operations/AbstractToolProviderOperation.java
@@ -97,10 +97,8 @@ public List<String> cmdFiles() {
      * @param files one or more files
      * @return this operation instance
      */
-    @SuppressWarnings({"unchecked"})
     public T cmdFilesPaths(List<Path> files) {
-        cmdFiles_.addAll(files.stream().map(Path::toFile).map(File::getAbsolutePath).toList());
-        return (T) this;
+        return cmdFilesStrings(files.stream().map(Path::toFile).map(File::getAbsolutePath).toList());
     }
 
     /**

diff --git a/src/main/java/rife/bld/operations/JlinkOptions.java b/src/main/java/rife/bld/operations/JlinkOptions.java
@@ -207,7 +207,7 @@ public JlinkOptions modulePath(File path) {
      * @return this map of options
      */
     public JlinkOptions modulePath(Path path) {
-        return modulePath(path.toFile());
+        return modulePath(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -268,7 +268,7 @@ public JlinkOptions output(File path) {
      * @return this map of options
      */
     public JlinkOptions output(Path path) {
-        return output(path.toFile());
+        return output(path.toFile().getAbsolutePath());
     }
 
     /**

diff --git a/src/main/java/rife/bld/operations/JmodOperation.java b/src/main/java/rife/bld/operations/JmodOperation.java
@@ -70,8 +70,7 @@ public JmodOperation jmodFile(String file) {
      * @return this operation instance
      */
     public JmodOperation jmodFile(File file) {
-        jmodFile_ = file.getAbsolutePath();
-        return this;
+        return jmodFile(file.getAbsolutePath());
     }
 
     /**
@@ -83,7 +82,7 @@ public JmodOperation jmodFile(File file) {
      * @return this operation instance
      */
     public JmodOperation jmodFile(Path file) {
-        return jmodFile(file.toFile());
+        return jmodFile(file.toFile().getAbsolutePath());
     }
 
     /**

diff --git a/src/main/java/rife/bld/operations/JmodOptions.java b/src/main/java/rife/bld/operations/JmodOptions.java
@@ -60,7 +60,7 @@ public JmodOptions cmds(File path) {
      * @return this map of options
      */
     public JmodOptions cmds(Path path) {
-        return cmds(path.toFile());
+        return cmds(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -110,7 +110,7 @@ public JmodOptions config(File path) {
      * @return this map of options
      */
     public JmodOptions config(Path path) {
-        return config(path.toFile());
+        return config(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -152,7 +152,7 @@ public JmodOptions dir(File path) {
      * @return this map of options
      */
     public JmodOptions dir(Path path) {
-        return dir(path.toFile());
+        return dir(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -256,7 +256,7 @@ public JmodOptions headerFiles(File path) {
      * @return this map of options
      */
     public JmodOptions headerFiles(Path path) {
-        return headerFiles(path.toFile());
+        return headerFiles(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -288,7 +288,7 @@ public JmodOptions legalNotices(File path) {
      * @return this map of options
      */
     public JmodOptions legalNotices(Path path) {
-        return legalNotices(path.toFile());
+        return legalNotices(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -320,7 +320,7 @@ public JmodOptions libs(File path) {
      * @return this map of options
      */
     public JmodOptions libs(Path path) {
-        return libs(path.toFile());
+        return libs(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -363,7 +363,7 @@ public JmodOptions manPages(File path) {
      * @return this map of options
      */
     public JmodOptions manPages(Path path) {
-        return manPages(path.toFile());
+        return manPages(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -394,7 +394,7 @@ public JmodOptions modulePath(File path) {
      * @return this map of options
      */
     public JmodOptions modulePath(Path path) {
-        return modulePath(path.toFile());
+        return modulePath(path.toFile().getAbsolutePath());
     }
 
     /**

diff --git a/src/main/java/rife/bld/operations/JpackageOperation.java b/src/main/java/rife/bld/operations/JpackageOperation.java
@@ -118,7 +118,7 @@ public Launcher(String name, File path) {
         }
 
         public Launcher(String name, Path path) {
-            this(name, path.toFile());
+            this(name, path.toFile().getAbsolutePath());
         }
     }
 }
diff --git a/src/main/java/rife/bld/operations/JpackageOptions.java b/src/main/java/rife/bld/operations/JpackageOptions.java
@@ -112,7 +112,7 @@ public JpackageOptions appImage(File path) {
      */
     @SuppressWarnings("UnusedReturnValue")
     public JpackageOptions appImage(Path path) {
-        return appImage(path.toFile());
+        return appImage(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -204,7 +204,7 @@ public JpackageOptions dest(File path) {
      * @return this map of options
      */
     public JpackageOptions dest(Path path) {
-        return dest(path.toFile());
+        return dest(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -271,7 +271,7 @@ public JpackageOptions fileAssociations(List<File> paths) {
      * @return this map of options
      */
     public JpackageOptions fileAssociationsPaths(List<Path> paths) {
-        return fileAssociations(paths.stream().map(Path::toFile).toList());
+        return fileAssociationsStrings(paths.stream().map(Path::toFile).map(File::getAbsolutePath).toList());
     }
 
     /**
@@ -316,7 +316,7 @@ public JpackageOptions icon(File path) {
      * @return this map of options
      */
     public JpackageOptions icon(Path path) {
-        return icon(path.toFile());
+        return icon(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -354,7 +354,7 @@ public JpackageOptions input(File path) {
      */
     @SuppressWarnings("UnusedReturnValue")
     public JpackageOptions input(Path path) {
-        return input(path.toFile());
+        return input(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -386,7 +386,7 @@ public JpackageOptions installDir(File path) {
      * @return this map of options
      */
     public JpackageOptions installDir(Path path) {
-        return installDir(path.toFile());
+        return installDir(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -472,7 +472,7 @@ public JpackageOptions licenseFile(File path) {
      * @return this map of options
      */
     public JpackageOptions licenseFile(Path path) {
-        return licenseFile(path.toFile());
+        return licenseFile(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -634,8 +634,7 @@ public JpackageOptions macDmgContent(String... additionalContents) {
      */
     @SuppressWarnings("UnusedReturnValue")
     public JpackageOptions macDmgContent(List<File> additionalContents) {
-        put("--mac-dmg-content", String.join(",", additionalContents.stream().map(File::getAbsolutePath).toList()));
-        return this;
+        return macDmgContentStrings(additionalContents.stream().map(File::getAbsolutePath).toList());
     }
 
     /**
@@ -656,9 +655,7 @@ public JpackageOptions macDmgContent(File... additionalContents) {
      * @return this map of options
      */
     public JpackageOptions macDmgContentPaths(List<Path> additionalContents) {
-        put("--mac-dmg-content", String.join(",",
-                additionalContents.stream().map(Path::toFile).map(File::getAbsolutePath).toList()));
-        return this;
+       return macDmgContentStrings(additionalContents.stream().map(Path::toFile).map(File::getAbsolutePath).toList());
     }
 
     /**
@@ -711,7 +708,7 @@ public JpackageOptions macEntitlements(File path) {
      * @return this map of options
      */
     public JpackageOptions macEntitlements(Path path) {
-        return macEntitlements(path.toFile());
+        return macEntitlements(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -969,7 +966,7 @@ public JpackageOptions modulePath(Path... paths) {
      * @return this map of options
      */
     public JpackageOptions modulePathPaths(List<Path> paths) {
-        return modulePath(paths.stream().map(Path::toFile).toList());
+        return modulePathStrings(paths.stream().map(Path::toFile).map(File::getAbsolutePath).toList());
     }
 
     /**
@@ -1031,7 +1028,7 @@ public JpackageOptions resourceDir(File path) {
      * @return this map of options
      */
     public JpackageOptions resourceDir(Path path) {
-        return resourceDir(path.toFile());
+        return resourceDir(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -1084,7 +1081,7 @@ public JpackageOptions runtimeImage(File path) {
      * @return this map of options
      */
     public JpackageOptions runtimeImage(Path path) {
-        return runtimeImage(path.toFile());
+        return runtimeImage(path.toFile().getAbsolutePath());
     }
 
     /**
@@ -1143,7 +1140,7 @@ public JpackageOptions temp(File path) {
      * @return this map of options
      */
     public JpackageOptions temp(Path path) {
-        return temp(path.toFile());
+        return temp(path.toFile().getAbsolutePath());
     }
 
     /**

diff --git a/src/test/java/rife/bld/operations/TestJlinkOperation.java b/src/test/java/rife/bld/operations/TestJlinkOperation.java
@@ -161,13 +161,13 @@ void testModulePath() {
         options.modulePath("foo");
         assertEquals("foo", options.get("--module-path"));
 
-        var barPath = Path.of("bar");
-        options.modulePath(barPath);
-        assertEquals(barPath.toFile().getAbsolutePath(), options.get("--module-path"));
+        var bar = Path.of("bar");
+        options = options.modulePath(bar);
+        assertEquals(bar.toFile().getAbsolutePath(), options.get("--module-path"));
 
-        var fooFile = new File("foo");
-        options.modulePath(fooFile);
-        assertEquals(fooFile.getAbsolutePath(), options.get("--module-path"));
+        var foo = new File("foo");
+        options = options.modulePath(foo);
+        assertEquals(foo.getAbsolutePath(), options.get("--module-path"));
     }
 
     @Test
@@ -184,13 +184,13 @@ void testOutput() {
         options.output("foo");
         assertEquals("foo", options.get("--output"));
 
-        var barPath = Path.of("bar");
-        options.output(barPath);
-        assertEquals(barPath.toFile().getAbsolutePath(), options.get("--output"));
+        var bar = Path.of("bar");
+        options = options.output(bar);
+        assertEquals(bar.toFile().getAbsolutePath(), options.get("--output"));
 
-        var fooFile = new File("foo");
-        options.output(fooFile);
-        assertEquals(fooFile.getAbsolutePath(), options.get("--output"));
+        var foo = new File("foo");
+        options = options.output(foo);
+        assertEquals(foo.getAbsolutePath(), options.get("--output"));
     }
 
     @Test