Handle null values in path and comma-separated options via stream filters

src/main/java/rife/bld/operations/JavacOptions.java

@@ -11,6 +11,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static rife.bld.operations.CompileOperation.COMPILE_OPTION_MODULE_PATH;
@@ -88,26 +89,34 @@ public class JavacOptions extends ArrayList<String> {
         return collection != null && !collection.isEmpty();
     }
 
+    /**
+     * Helper method to add delimited options
+     */
+    private JavacOptions addDelimitedOption(String option, Collection<String> values, String separator) {
+        if (isNotEmpty(values)) {
+            var joined = values.stream()
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.joining(separator));
+            if (!joined.isEmpty()) {
+                add(option);
+                add(joined);
+            }
+        }
+        return this;
+    }
+
     /**
      * Helper method to add path-based options
      */
     private JavacOptions addPathOption(String option, Collection<String> paths) {
-        if (isNotEmpty(paths)) {
-            add(option);
-            add(String.join(File.pathSeparator, paths));
-        }
-        return this;
+        return addDelimitedOption(option, paths, File.pathSeparator);
     }
 
     /**
      * Helper method to add comma-separated options
      */
     private JavacOptions addCommaSeparatedOption(String option, Collection<String> values) {
-        if (isNotEmpty(values)) {
-            add(option);
-            add(String.join(",", values));
-        }
-        return this;
+        return addDelimitedOption(option, values, ",");
     }
 
     /**
@@ -145,7 +154,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions addExports(Collection<String> modules) {
-        return addCommaSeparatedOption("--add-exports", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--add-exports", modules);
+        }
+        return this;
     }
 
     /**
@@ -168,7 +180,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions addReads(Collection<String> modules) {
-        return addCommaSeparatedOption("--add-reads", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--add-reads", modules);
+        }
+        return this;
     }
 
     /**
@@ -193,7 +208,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions addModules(Collection<String> modules) {
-        return addCommaSeparatedOption("--add-modules", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--add-modules", modules);
+        }
+        return this;
     }
 
     /**
@@ -263,7 +281,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions endorsedDirs(Collection<File> dirs) {
-        return endorsedDirsStrings(dirs.stream().map(File::getAbsolutePath).toList());
+        if (isNotEmpty(dirs)) {
+            return endorsedDirsStrings(dirs.stream().map(File::getAbsolutePath).toList());
+        }
+        return this;
     }
 
     /**
@@ -286,7 +307,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions endorsedDirsPaths(Collection<Path> dirs) {
-        return endorsedDirs(dirs.stream().map(Path::toFile).toList());
+        if (isNotEmpty(dirs)) {
+            return endorsedDirs(dirs.stream().map(Path::toFile).toList());
+        }
+        return this;
     }
 
     /**
@@ -309,11 +333,7 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions endorsedDirsStrings(Collection<String> dirs) {
-        if (isNotEmpty(dirs)) {
-            add("-endorseddirs");
-            add(String.join(",", dirs));
-        }
-        return this;
+        return addCommaSeparatedOption("-endorseddirs", dirs);
     }
 
     /**
@@ -336,7 +356,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions extDirs(Collection<File> dirs) {
-        return extDirsStrings(dirs.stream().map(File::getAbsolutePath).toList());
+        if (isNotEmpty(dirs)) {
+            return extDirsStrings(dirs.stream().map(File::getAbsolutePath).toList());
+        }
+        return this;
     }
 
     /**
@@ -359,7 +382,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions extDirsPaths(Collection<Path> dirs) {
-        return extDirs(dirs.stream().map(Path::toFile).toList());
+        if (isNotEmpty(dirs)) {
+            return extDirs(dirs.stream().map(Path::toFile).toList());
+        }
+        return this;
     }
 
     /**
@@ -382,11 +408,7 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions extDirsStrings(Collection<String> dirs) {
-        if (isNotEmpty(dirs)) {
-            add("-extdirs");
-            add(String.join(",", dirs));
-        }
-        return this;
+        return addCommaSeparatedOption("-extdirs", dirs);
     }
 
     /**
@@ -526,7 +548,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions limitModules(Collection<String> modules) {
-        return addCommaSeparatedOption("--limit-modules", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--limit-modules", modules);
+        }
+        return this;
     }
 
     /**
@@ -549,7 +574,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions module(Collection<String> modules) {
-        return addCommaSeparatedOption("--module", modules);
+        if (isNotEmpty(modules)) {
+            return addCommaSeparatedOption("--module", modules);
+        }
+        return this;
     }
 
     /**
@@ -573,7 +601,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.6.2
      */
     public JavacOptions modulePath(Collection<File> paths) {
-        return modulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        if (isNotEmpty(paths)) {
+            return modulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        }
+        return this;
     }
 
     /**
@@ -596,7 +627,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions modulePathPaths(Collection<Path> paths) {
-        return modulePathStrings(paths.stream().map(Path::toString).toList());
+        if (isNotEmpty(paths)) {
+            return modulePathStrings(paths.stream().map(Path::toString).toList());
+        }
+        return this;
     }
 
     /**
@@ -619,7 +653,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.1
      */
     public JavacOptions modulePathStrings(Collection<String> paths) {
-        return addPathOption(COMPILE_OPTION_MODULE_PATH, paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption(COMPILE_OPTION_MODULE_PATH, paths);
+        }
+        return this;
     }
 
     /**
@@ -629,7 +666,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions moduleSourcePathStrings(Collection<String> paths) {
-        return addPathOption("--module-source-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--module-source-path", paths);
+        }
+        return this;
     }
 
     /**
@@ -639,7 +679,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions moduleSourcePathPaths(Collection<Path> paths) {
-        return moduleSourcePathStrings(paths.stream().map(Path::toString).toList());
+        if (isNotEmpty(paths)) {
+            return moduleSourcePathStrings(paths.stream().map(Path::toString).toList());
+        }
+        return this;
     }
 
     /**
@@ -649,7 +692,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions moduleSourcePath(Collection<File> paths) {
-        return moduleSourcePathStrings(paths.stream().map(File::getPath).toList());
+        if (isNotEmpty(paths)) {
+            return moduleSourcePathStrings(paths.stream().map(File::getPath).toList());
+        }
+        return this;
     }
 
     /**
@@ -756,7 +802,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 1.5.18
      */
     public JavacOptions processors(Collection<String> classnames) {
-        return addCommaSeparatedOption("-processor", classnames);
+        if (isNotEmpty(classnames)) {
+            return addCommaSeparatedOption("-processor", classnames);
+        }
+        return this;
     }
 
     /**
@@ -805,7 +854,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorModulePathPaths(Collection<Path> paths) {
-        return processorModulePathStrings(paths.stream().map(Path::toString).toList());
+        if (isNotEmpty(paths)) {
+            return processorModulePathStrings(paths.stream().map(Path::toString).toList());
+        }
+        return this;
     }
 
     /**
@@ -815,7 +867,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorModulePathStrings(Collection<String> paths) {
-        return addPathOption("--processor-module-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--processor-module-path", paths);
+        }
+        return this;
     }
 
     /**
@@ -825,7 +880,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorModulePath(Collection<File> paths) {
-        return processorModulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        if (isNotEmpty(paths)) {
+            return processorModulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        }
+        return this;
     }
 
     /**
@@ -874,7 +932,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorPathStrings(Collection<String> paths) {
-        return addPathOption("--processor-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--processor-path", paths);
+        }
+        return this;
     }
 
     /**
@@ -884,7 +945,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorPath(Collection<File> paths) {
-        return processorPathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        if (isNotEmpty(paths)) {
+            return processorPathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        }
+        return this;
     }
 
     /**
@@ -894,7 +958,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions processorPathPaths(Collection<Path> paths) {
-        return processorPathStrings(paths.stream().map(Path::toString).toList());
+        if (isNotEmpty(paths)) {
+            return processorPathStrings(paths.stream().map(Path::toString).toList());
+        }
+        return this;
     }
 
     /**
@@ -1002,7 +1069,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions upgradeModulePathStrings(Collection<String> paths) {
-        return addPathOption("--upgrade-module-path", paths);
+        if (isNotEmpty(paths)) {
+            return addPathOption("--upgrade-module-path", paths);
+        }
+        return this;
     }
 
     /**
@@ -1012,7 +1082,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions upgradeModulePath(Collection<File> paths) {
-        return upgradeModulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        if (isNotEmpty(paths)) {
+            return upgradeModulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
+        }
+        return this;
     }
 
     /**
@@ -1022,7 +1095,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions upgradeModulePathPaths(Collection<Path> paths) {
-        return upgradeModulePathStrings(paths.stream().map(Path::toString).toList());
+        if (isNotEmpty(paths)) {
+            return upgradeModulePathStrings(paths.stream().map(Path::toString).toList());
+        }
+        return this;
     }
 
     /**
@@ -1067,7 +1143,10 @@ public class JavacOptions extends ArrayList<String> {
      * @since 2.3.1
      */
     public JavacOptions xLint(Collection<XLintKey> keys) {
-        return addXLintOption(keys, "");
+        if (isNotEmpty(keys)) {
+            return addXLintOption(keys, "");
+        }
+        return this;
     }
 
     /**