Filip/bld
1
0
Fork 0
mirror of https://github.com/rife2/bld synced 2026-04-27 02:04:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing null/empty checks

Browse source
This commit is contained in:
Erik C. Thauvin 2026-01-25 11:20:24 -08:00
parent 3160161299
commit 44144ce095
No known key found for this signature in database
GPG key ID: 776702A6A2DA330E
1 changed files with 104 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/main/java/rife/bld/operations/JavacOptions.java
View file

@ -145,8 +145,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions addExports(Collection<String> modules) {
if (isNotEmpty(modules)) {
return addCommaSeparatedOption("--add-exports", modules);
}
return this;
}
/**
* Specifies additional modules to be considered as required by a given module
@ -168,8 +171,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions addReads(Collection<String> modules) {
if (isNotEmpty(modules)) {
return addCommaSeparatedOption("--add-reads", modules);
}
return this;
}
/**
* Root modules to resolve in addition to the initial modules,
@ -193,8 +199,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 1.5.18
*/
public JavacOptions addModules(Collection<String> modules) {
if (isNotEmpty(modules)) {
return addCommaSeparatedOption("--add-modules", modules);
}
return this;
}
/**
* Specify character encoding used by source files
@ -263,8 +272,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 1.5.18
*/
public JavacOptions endorsedDirs(Collection<File> dirs) {
if (isNotEmpty(dirs)) {
return endorsedDirsStrings(dirs.stream().map(File::getAbsolutePath).toList());
}
return this;
}
/**
* Override location of endorsed standards path
@ -286,8 +298,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.1
*/
public JavacOptions endorsedDirsPaths(Collection<Path> dirs) {
if (isNotEmpty(dirs)) {
return endorsedDirs(dirs.stream().map(Path::toFile).toList());
}
return this;
}
/**
* Override location of endorsed standards path
@ -336,8 +351,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 1.5.18
*/
public JavacOptions extDirs(Collection<File> dirs) {
if (isNotEmpty(dirs)) {
return extDirsStrings(dirs.stream().map(File::getAbsolutePath).toList());
}
return this;
}
/**
* Override location of installed extensions
@ -359,8 +377,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.1
*/
public JavacOptions extDirsPaths(Collection<Path> dirs) {
if (isNotEmpty(dirs)) {
return extDirs(dirs.stream().map(Path::toFile).toList());
}
return this;
}
/**
* Override location of installed extensions
@ -526,8 +547,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 1.5.18
*/
public JavacOptions limitModules(Collection<String> modules) {
if (isNotEmpty(modules)) {
return addCommaSeparatedOption("--limit-modules", modules);
}
return this;
}
/**
* Compile only the specified module(s), check timestamps
@ -549,8 +573,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 1.5.18
*/
public JavacOptions module(Collection<String> modules) {
if (isNotEmpty(modules)) {
return addCommaSeparatedOption("--module", modules);
}
return this;
}
/**
* /**
@ -573,8 +600,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 1.6.2
*/
public JavacOptions modulePath(Collection<File> paths) {
if (isNotEmpty(paths)) {
return modulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
}
return this;
}
/**
* Specify where to find application modules
@ -596,8 +626,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.1
*/
public JavacOptions modulePathPaths(Collection<Path> paths) {
if (isNotEmpty(paths)) {
return modulePathStrings(paths.stream().map(Path::toString).toList());
}
return this;
}
/**
* Specify where to find application modules
@ -619,8 +652,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.1
*/
public JavacOptions modulePathStrings(Collection<String> paths) {
if (isNotEmpty(paths)) {
return addPathOption(COMPILE_OPTION_MODULE_PATH, paths);
}
return this;
}
/**
* Specify where to find input source files for multiple modules
@ -629,8 +665,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions moduleSourcePathStrings(Collection<String> paths) {
if (isNotEmpty(paths)) {
return addPathOption("--module-source-path", paths);
}
return this;
}
/**
* Specify where to find input source files for multiple modules
@ -639,8 +678,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions moduleSourcePathPaths(Collection<Path> paths) {
if (isNotEmpty(paths)) {
return moduleSourcePathStrings(paths.stream().map(Path::toString).toList());
}
return this;
}
/**
* Specify where to find input source files for multiple modules
@ -649,8 +691,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions moduleSourcePath(Collection<File> paths) {
if (isNotEmpty(paths)) {
return moduleSourcePathStrings(paths.stream().map(File::getPath).toList());
}
return this;
}
/**
* Specify where to find input source files for multiple modules
@ -756,8 +801,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 1.5.18
*/
public JavacOptions processors(Collection<String> classnames) {
if (isNotEmpty(classnames)) {
return addCommaSeparatedOption("-processor", classnames);
}
return this;
}
/**
* Specify a module path where to find annotation processors
@ -805,8 +853,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions processorModulePathPaths(Collection<Path> paths) {
if (isNotEmpty(paths)) {
return processorModulePathStrings(paths.stream().map(Path::toString).toList());
}
return this;
}
/**
* Specify a module path where to find annotation processors
@ -815,8 +866,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions processorModulePathStrings(Collection<String> paths) {
if (isNotEmpty(paths)) {
return addPathOption("--processor-module-path", paths);
}
return this;
}
/**
* Specify a module path where to find annotation processors
@ -825,8 +879,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions processorModulePath(Collection<File> paths) {
if (isNotEmpty(paths)) {
return processorModulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
}
return this;
}
/**
* Specify where to find annotation processors
@ -874,8 +931,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions processorPathStrings(Collection<String> paths) {
if (isNotEmpty(paths)) {
return addPathOption("--processor-path", paths);
}
return this;
}
/**
* Specify where to find annotation processors
@ -884,8 +944,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions processorPath(Collection<File> paths) {
if (isNotEmpty(paths)) {
return processorPathStrings(paths.stream().map(File::getAbsolutePath).toList());
}
return this;
}
/**
* Specify where to find annotation processors
@ -894,8 +957,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions processorPathPaths(Collection<Path> paths) {
if (isNotEmpty(paths)) {
return processorPathStrings(paths.stream().map(Path::toString).toList());
}
return this;
}
/**
* Check that the API used is available in the specified profile
@ -1002,8 +1068,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions upgradeModulePathStrings(Collection<String> paths) {
if (isNotEmpty(paths)) {
return addPathOption("--upgrade-module-path", paths);
}
return this;
}
/**
* Override location of upgradeable modules
@ -1012,8 +1081,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions upgradeModulePath(Collection<File> paths) {
if (isNotEmpty(paths)) {
return upgradeModulePathStrings(paths.stream().map(File::getAbsolutePath).toList());
}
return this;
}
/**
* Override location of upgradeable modules
@ -1022,8 +1094,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions upgradeModulePathPaths(Collection<Path> paths) {
if (isNotEmpty(paths)) {
return upgradeModulePathStrings(paths.stream().map(Path::toString).toList());
}
return this;
}
/**
* Terminate compilation if warnings occur
@ -1067,8 +1142,11 @@ public class JavacOptions extends ArrayList<String> {
* @since 2.3.1
*/
public JavacOptions xLint(Collection<XLintKey> keys) {
if (isNotEmpty(keys)) {
return addXLintOption(keys, "");
}
return this;
}
/**
* Warning categories to disable