[MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#205)
Continuation of https://issues.apache.org/jira/browse/MNG-6829
Review requested of @elharo
Use this link to re-run the recipe: https://public.moderne.io/recipes/org.openrewrite.java.migrate.apache.commons.lang.IsNotEmptyToJdk?organizationId=QXBhY2hlIE1hdmVu
Co-authored-by: Moderne <team@moderne.io>
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
index 53987c9..75a88fb 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
@@ -478,9 +478,9 @@
* @return the list of source paths for the given project.
*/
protected List<String> getProjectSourceRoots(MavenProject p) {
- return (p.getCompileSourceRoots() == null
+ return p.getCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<>(p.getCompileSourceRoots()));
+ : new LinkedList<>(p.getCompileSourceRoots());
}
/**
@@ -490,9 +490,9 @@
* if any
*/
protected List<String> getCompileClasspathElements(MavenProject p) throws DependencyResolutionRequiredException {
- return (p.getCompileClasspathElements() == null
+ return p.getCompileClasspathElements() == null
? Collections.<String>emptyList()
- : new LinkedList<>(p.getCompileClasspathElements()));
+ : new LinkedList<>(p.getCompileClasspathElements());
}
/**
@@ -512,7 +512,7 @@
*/
private void init() {
// defaultAuthor
- if (StringUtils.isEmpty(defaultAuthor)) {
+ if (defaultAuthor == null || defaultAuthor.isEmpty()) {
defaultAuthor = System.getProperty("user.name");
}
@@ -550,7 +550,7 @@
fixTagsSplitted = StringUtils.split(fixTags, ",");
// encoding
- if (StringUtils.isEmpty(encoding)) {
+ if (encoding == null || encoding.isEmpty()) {
if (getLog().isWarnEnabled()) {
getLog().warn("File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
+ ", i.e. build is platform dependent!");
@@ -1027,7 +1027,7 @@
String javadocComment = trimRight(extractOriginalJavadoc(originalContent, entity));
String extraComment = javadocComment.substring(javadocComment.indexOf(END_JAVADOC) + END_JAVADOC.length());
- if (StringUtils.isNotEmpty(extraComment)) {
+ if (extraComment != null && !extraComment.isEmpty()) {
if (extraComment.contains(EOL)) {
stringWriter.write(extraComment.substring(extraComment.indexOf(EOL) + EOL.length()));
} else {
@@ -1082,7 +1082,7 @@
}
if (LEVEL_PROTECTED.equalsIgnoreCase(level.trim())) {
- return (modifiers.contains(LEVEL_PUBLIC) || modifiers.contains(LEVEL_PROTECTED));
+ return modifiers.contains(LEVEL_PUBLIC) || modifiers.contains(LEVEL_PROTECTED);
}
if (LEVEL_PACKAGE.equalsIgnoreCase(level.trim())) {
@@ -1887,7 +1887,7 @@
return;
}
- if (StringUtils.isNotEmpty(originalJavadocTag)
+ if ((originalJavadocTag != null && !originalJavadocTag.isEmpty())
&& javaMethod.getReturns() != null
&& !javaMethod.getReturns().isVoid()) {
sb.append(originalJavadocTag);
@@ -3044,7 +3044,7 @@
* @return the indentation for the given line.
*/
private static String autodetectIndentation(final String line) {
- if (StringUtils.isEmpty(line)) {
+ if (line == null || line.isEmpty()) {
return "";
}
@@ -3084,7 +3084,7 @@
* @return the text trimmed on left side or empty if text is null.
*/
private static String trimLeft(final String text) {
- if (StringUtils.isEmpty(text) || StringUtils.isEmpty(text.trim())) {
+ if ((text == null || text.isEmpty()) || StringUtils.isEmpty(text.trim())) {
return "";
}
@@ -3106,7 +3106,7 @@
* @return the text trimmed on tight side or empty if text is null.
*/
private static String trimRight(final String text) {
- if (StringUtils.isEmpty(text) || StringUtils.isEmpty(text.trim())) {
+ if ((text == null || text.isEmpty()) || StringUtils.isEmpty(text.trim())) {
return "";
}
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index e9f38d5..8374125 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -1733,9 +1733,9 @@
return Collections.emptyList();
}
- return (p.getCompileSourceRoots() == null
+ return p.getCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<>(p.getCompileSourceRoots()));
+ : new LinkedList<>(p.getCompileSourceRoots());
}
/**
@@ -1747,9 +1747,9 @@
return Collections.emptyList();
}
- return (p.getExecutionProject().getCompileSourceRoots() == null
+ return p.getExecutionProject().getCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<>(p.getExecutionProject().getCompileSourceRoots()));
+ : new LinkedList<>(p.getExecutionProject().getCompileSourceRoots());
}
/**
@@ -1791,21 +1791,21 @@
* @return the charset attribute or the value of {@link #getDocencoding()} if <code>null</code>.
*/
private String getCharset() {
- return (StringUtils.isEmpty(charset)) ? getDocencoding() : charset;
+ return (charset == null || charset.isEmpty()) ? getDocencoding() : charset;
}
/**
* @return the docencoding attribute or <code>UTF-8</code> if <code>null</code>.
*/
private String getDocencoding() {
- return (StringUtils.isEmpty(docencoding)) ? ReaderFactory.UTF_8 : docencoding;
+ return (docencoding == null || docencoding.isEmpty()) ? ReaderFactory.UTF_8 : docencoding;
}
/**
* @return the encoding attribute or the value of <code>file.encoding</code> system property if <code>null</code>.
*/
private String getEncoding() {
- return (StringUtils.isEmpty(encoding)) ? ReaderFactory.FILE_ENCODING : encoding;
+ return (encoding == null || encoding.isEmpty()) ? ReaderFactory.FILE_ENCODING : encoding;
}
@Override
@@ -1930,7 +1930,7 @@
addMemoryArg(cmd, "-Xms", this.minmemory);
addProxyArg(cmd);
- if (StringUtils.isNotEmpty(additionalJOption)) {
+ if (additionalJOption != null && !additionalJOption.isEmpty()) {
cmd.createArg().setValue(additionalJOption);
}
@@ -1946,7 +1946,7 @@
List<String> standardDocletArguments = new ArrayList<>();
Set<OfflineLink> offlineLinks;
- if (StringUtils.isEmpty(doclet) || useStandardDocletOptions) {
+ if ((doclet == null || doclet.isEmpty()) || useStandardDocletOptions) {
offlineLinks = getLinkofflines();
addStandardDocletOptions(javadocOutputDirectory, standardDocletArguments, offlineLinks);
} else {
@@ -1982,7 +1982,7 @@
// getFiles(...) returns an empty list when subpackages are specified.
boolean includesExcludesActive = (sourceFileIncludes != null && !sourceFileIncludes.isEmpty())
|| (sourceFileExcludes != null && !sourceFileExcludes.isEmpty());
- if (includesExcludesActive && !StringUtils.isEmpty(subpackages)) {
+ if (includesExcludesActive && !(subpackages == null || subpackages.isEmpty())) {
getLog().warn("sourceFileIncludes and sourceFileExcludes have no effect when subpackages are specified!");
includesExcludesActive = false;
}
@@ -2068,7 +2068,7 @@
*/
protected Map<Path, Collection<String>> getFiles(Collection<Path> sourcePaths) throws MavenReportException {
Map<Path, Collection<String>> mappedFiles = new LinkedHashMap<>(sourcePaths.size());
- if (StringUtils.isEmpty(subpackages)) {
+ if (subpackages == null || subpackages.isEmpty()) {
Collection<String> excludedPackages = getExcludedPackages();
final boolean autoExclude;
@@ -2106,7 +2106,7 @@
protected Collection<JavadocModule> getSourcePaths() throws MavenReportException {
Collection<JavadocModule> mappedSourcePaths = new ArrayList<>();
- if (StringUtils.isEmpty(sourcepath)) {
+ if (sourcepath == null || sourcepath.isEmpty()) {
if (!"pom".equals(project.getPackaging())) {
Set<Path> sourcePaths =
new LinkedHashSet<>(JavadocUtil.pruneDirs(project, getProjectSourceRoots(project)));
@@ -2351,7 +2351,7 @@
}
}
- return !StringUtils.isEmpty(subpackages);
+ return !(subpackages == null || subpackages.isEmpty());
}
// ----------------------------------------------------------------------
@@ -2369,14 +2369,14 @@
private String getExcludedPackages(Collection<Path> sourcePaths) throws MavenReportException {
List<String> excludedNames = null;
- if (StringUtils.isNotEmpty(sourcepath) && StringUtils.isNotEmpty(subpackages)) {
+ if ((sourcepath != null && !sourcepath.isEmpty()) && (subpackages != null && !subpackages.isEmpty())) {
Collection<String> excludedPackages = getExcludedPackages();
excludedNames = JavadocUtil.getExcludedPackages(sourcePaths, excludedPackages);
}
String excludeArg = "";
- if (StringUtils.isNotEmpty(subpackages) && excludedNames != null) {
+ if ((subpackages != null && !subpackages.isEmpty()) && excludedNames != null) {
// add the excludedpackage names
excludeArg = StringUtils.join(excludedNames.iterator(), ":");
}
@@ -2395,7 +2395,7 @@
private String getSourcePath(Collection<Path> sourcePaths) {
String sourcePath = null;
- if (StringUtils.isEmpty(subpackages) || StringUtils.isNotEmpty(sourcepath)) {
+ if ((subpackages == null || subpackages.isEmpty()) || (sourcepath != null && !sourcepath.isEmpty())) {
sourcePath = StringUtils.join(sourcePaths.iterator(), File.pathSeparator);
}
@@ -2431,7 +2431,7 @@
}
// for the specified excludePackageNames
- if (StringUtils.isNotEmpty(excludePackageNames)) {
+ if (excludePackageNames != null && !excludePackageNames.isEmpty()) {
List<String> packageNames = Arrays.asList(excludePackageNames.split("[,:;]"));
excluded.addAll(trimValues(packageNames));
}
@@ -2443,7 +2443,7 @@
List<String> result = new ArrayList<>(items.size());
for (String item : items) {
String trimmed = item.trim();
- if (StringUtils.isEmpty(trimmed)) {
+ if (trimmed == null || trimmed.isEmpty()) {
continue;
}
result.add(trimmed);
@@ -2712,7 +2712,7 @@
* @see #getResource(List, String)
*/
private Optional<File> getStylesheetFile(final File javadocOutputDirectory) {
- if (StringUtils.isEmpty(stylesheetfile)) {
+ if (stylesheetfile == null || stylesheetfile.isEmpty()) {
if ("java".equalsIgnoreCase(stylesheet)) {
// use the default Javadoc tool stylesheet
return Optional.empty();
@@ -2750,7 +2750,7 @@
private Optional<File> getAddStylesheet(final File javadocOutputDirectory, final String stylesheet)
throws MavenReportException {
- if (StringUtils.isEmpty(stylesheet)) {
+ if (stylesheet == null || stylesheet.isEmpty()) {
return Optional.empty();
}
@@ -2784,7 +2784,7 @@
* @since 2.6
*/
private Optional<File> getHelpFile(final File javadocOutputDirectory) {
- if (StringUtils.isEmpty(helpfile)) {
+ if (helpfile == null || helpfile.isEmpty()) {
return Optional.empty();
}
@@ -2844,7 +2844,7 @@
StringBuilder path = new StringBuilder();
path.append(StringUtils.join(bootclassPath.iterator(), File.pathSeparator));
- if (StringUtils.isNotEmpty(bootclasspath)) {
+ if (bootclasspath != null && !bootclasspath.isEmpty()) {
path.append(JavadocUtil.unifyPathSeparator(bootclasspath));
}
@@ -2873,13 +2873,13 @@
}
}
- if (!StringUtils.isEmpty(docletPath)) {
+ if (!(docletPath == null || docletPath.isEmpty())) {
pathParts.add(JavadocUtil.unifyPathSeparator(docletPath));
}
String path = StringUtils.join(pathParts.iterator(), File.pathSeparator);
- if (StringUtils.isEmpty(path) && getLog().isWarnEnabled()) {
+ if ((path == null || path.isEmpty()) && getLog().isWarnEnabled()) {
getLog().warn("No docletpath option was found. Please review <docletpath/> or <docletArtifact/>"
+ " or <doclets/>.");
}
@@ -2946,7 +2946,7 @@
StringBuilder path = new StringBuilder();
path.append(StringUtils.join(pathParts.iterator(), File.pathSeparator));
- if (StringUtils.isNotEmpty(tagletpath)) {
+ if (tagletpath != null && !tagletpath.isEmpty()) {
path.append(JavadocUtil.unifyPathSeparator(tagletpath));
}
@@ -3288,7 +3288,7 @@
* @see JavadocUtil#parseJavadocMemory(String)
*/
private void addMemoryArg(Commandline cmd, String arg, String memory) {
- if (StringUtils.isNotEmpty(memory)) {
+ if (memory != null && !memory.isEmpty()) {
try {
cmd.createArg().setValue("-J" + arg + JavadocUtil.parseJavadocMemory(memory));
} catch (IllegalArgumentException e) {
@@ -3385,7 +3385,7 @@
// ----------------------------------------------------------------------
// The javadoc executable is defined by the user
// ----------------------------------------------------------------------
- if (StringUtils.isNotEmpty(javadocExecutable)) {
+ if (javadocExecutable != null && !javadocExecutable.isEmpty()) {
javadocExe = new File(javadocExecutable);
if (javadocExe.isDirectory()) {
@@ -3462,7 +3462,7 @@
if (!javadocExe.exists() || !javadocExe.isFile()) {
Properties env = CommandLineUtils.getSystemEnvVars();
String javaHome = env.getProperty("JAVA_HOME");
- if (StringUtils.isEmpty(javaHome)) {
+ if (javaHome == null || javaHome.isEmpty()) {
throw new IOException("The environment variable JAVA_HOME is not correctly set.");
}
if ((!new File(javaHome).getCanonicalFile().exists())
@@ -3502,7 +3502,7 @@
jVersion = JAVA_VERSION;
}
- if (StringUtils.isNotEmpty(javadocVersion)) {
+ if (javadocVersion != null && !javadocVersion.isEmpty()) {
try {
javadocRuntimeVersion = JavaVersion.parse(javadocVersion);
} catch (NumberFormatException e) {
@@ -3603,7 +3603,7 @@
boolean repeatKey,
boolean splitValue,
JavaVersion requiredJavaVersion) {
- if (StringUtils.isNotEmpty(value)) {
+ if (value != null && !value.isEmpty()) {
if (isJavaDocVersionAtLeast(requiredJavaVersion)) {
addArgIfNotEmpty(arguments, key, value, repeatKey, splitValue);
} else {
@@ -3629,8 +3629,8 @@
*/
private void addArgIfNotEmpty(
List<String> arguments, String key, String value, boolean repeatKey, boolean splitValue) {
- if (StringUtils.isNotEmpty(value)) {
- if (StringUtils.isNotEmpty(key)) {
+ if (value != null && !value.isEmpty()) {
+ if (key != null && !key.isEmpty()) {
arguments.add(key);
}
@@ -3639,7 +3639,7 @@
while (token.hasMoreTokens()) {
String current = token.nextToken().trim();
- if (StringUtils.isNotEmpty(current)) {
+ if (current != null && !current.isEmpty()) {
arguments.add(current);
if (token.hasMoreTokens() && repeatKey) {
@@ -3696,7 +3696,7 @@
*/
private void addArgIfNotEmpty(
List<String> arguments, String key, String value, JavaVersion requiredJavaVersion, boolean repeatKey) {
- if (StringUtils.isNotEmpty(value)) {
+ if (value != null && !value.isEmpty()) {
if (isJavaDocVersionAtLeast(requiredJavaVersion)) {
addArgIfNotEmpty(arguments, key, value, repeatKey);
} else {
@@ -3724,13 +3724,13 @@
throws MavenReportException {
for (OfflineLink offlineLink : offlineLinksList) {
String url = offlineLink.getUrl();
- if (StringUtils.isEmpty(url)) {
+ if (url == null || url.isEmpty()) {
continue;
}
url = cleanUrl(url);
String location = offlineLink.getLocation();
- if (StringUtils.isEmpty(location)) {
+ if (location == null || location.isEmpty()) {
continue;
}
if (isValidJavadocLink(location, false)) {
@@ -3774,7 +3774,7 @@
Set<String> links = collectLinks();
for (String link : links) {
- if (StringUtils.isEmpty(link)) {
+ if (link == null || link.isEmpty()) {
continue;
}
@@ -3933,7 +3933,7 @@
private List<String> getPackageNames(Map<Path, Collection<String>> sourcePaths) {
List<String> returnList = new ArrayList<>();
- if (!StringUtils.isEmpty(sourcepath)) {
+ if (!(sourcepath == null || sourcepath.isEmpty())) {
return returnList;
}
@@ -3971,7 +3971,7 @@
*/
private Collection<String> getPackageNamesRespectingJavaModules(Collection<JavadocModule> javadocModules)
throws MavenReportException {
- if (!StringUtils.isEmpty(sourcepath)) {
+ if (!(sourcepath == null || sourcepath.isEmpty())) {
return Collections.emptyList();
}
@@ -4029,7 +4029,7 @@
private List<String> getFilesWithUnnamedPackages(Map<Path, Collection<String>> sourcePaths) {
List<String> returnList = new ArrayList<>();
- if (!StringUtils.isEmpty(sourcepath)) {
+ if (!(sourcepath == null || sourcepath.isEmpty())) {
return returnList;
}
@@ -4063,7 +4063,7 @@
* @return a list of files
*/
private List<String> getSpecialFiles(Map<Path, Collection<String>> sourcePaths) {
- if (!StringUtils.isEmpty(sourcepath)) {
+ if (!(sourcepath == null || sourcepath.isEmpty())) {
return new ArrayList<>();
}
@@ -4238,7 +4238,7 @@
}
// locale
- if (StringUtils.isNotEmpty(this.locale)) {
+ if (this.locale != null && !this.locale.isEmpty()) {
StringTokenizer tokenizer = new StringTokenizer(this.locale, "_");
final int maxTokens = 3;
if (tokenizer.countTokens() > maxTokens) {
@@ -4318,7 +4318,7 @@
}
// helpfile
- if (StringUtils.isNotEmpty(helpfile) && nohelp) {
+ if ((helpfile != null && !helpfile.isEmpty()) && nohelp) {
throw new MavenReportException("Option <nohelp/> conflicts with <helpfile/>");
}
@@ -4333,7 +4333,7 @@
}
// stylesheet
- if (StringUtils.isNotEmpty(stylesheet)
+ if ((stylesheet != null && !stylesheet.isEmpty())
&& !(stylesheet.equalsIgnoreCase("maven") || stylesheet.equalsIgnoreCase("java"))) {
throw new MavenReportException("Option <stylesheet/> supports only \"maven\" or \"java\" value.");
}
@@ -4611,12 +4611,12 @@
false);
}
- if (StringUtils.isNotEmpty(doclet)) {
+ if (doclet != null && !doclet.isEmpty()) {
addArgIfNotEmpty(arguments, "-doclet", JavadocUtil.quotedArgument(doclet));
addArgIfNotEmpty(arguments, "-docletpath", JavadocUtil.quotedPathArgument(getDocletPath()));
}
- if (StringUtils.isEmpty(encoding)) {
+ if (encoding == null || encoding.isEmpty()) {
getLog().warn("Source files encoding has not been set, using platform encoding "
+ ReaderFactory.FILE_ENCODING + ", i.e. build is platform dependent!");
}
@@ -4645,7 +4645,7 @@
addArgIfNotEmpty(arguments, "-source", JavadocUtil.quotedArgument(source), SINCE_JAVADOC_1_4);
}
- if ((StringUtils.isEmpty(sourcepath)) && (StringUtils.isNotEmpty(subpackages))) {
+ if ((sourcepath == null || sourcepath.isEmpty()) && (subpackages != null && !subpackages.isEmpty())) {
sourcepath = StringUtils.join(sourcePaths.iterator(), File.pathSeparator);
}
@@ -4658,7 +4658,7 @@
arguments, "--module-source-path", JavadocUtil.quotedPathArgument(moduleSourceDir.toString()));
}
- if (StringUtils.isNotEmpty(sourcepath) && isJavaDocVersionAtLeast(SINCE_JAVADOC_1_5)) {
+ if ((sourcepath != null && !sourcepath.isEmpty()) && isJavaDocVersionAtLeast(SINCE_JAVADOC_1_5)) {
addArgIfNotEmpty(arguments, "-subpackages", subpackages, SINCE_JAVADOC_1_5);
}
@@ -4745,7 +4745,7 @@
addArgIf(arguments, docfilessubdirs, "-docfilessubdirs", SINCE_JAVADOC_1_4);
- addArgIf(arguments, StringUtils.isNotEmpty(doclint), "-Xdoclint:" + getDoclint(), SINCE_JAVADOC_1_8);
+ addArgIf(arguments, (doclint != null && !doclint.isEmpty()), "-Xdoclint:" + getDoclint(), SINCE_JAVADOC_1_8);
addArgIfNotEmpty(arguments, "-doctitle", JavadocUtil.quotedArgument(getDoctitle()), false, false);
@@ -4836,7 +4836,7 @@
addAddStyleSheets(arguments);
- if (StringUtils.isNotEmpty(sourcepath) && !isJavaDocVersionAtLeast(SINCE_JAVADOC_1_5)) {
+ if ((sourcepath != null && !sourcepath.isEmpty()) && !isJavaDocVersionAtLeast(SINCE_JAVADOC_1_5)) {
addArgIfNotEmpty(arguments, "-subpackages", subpackages, SINCE_JAVADOC_1_4);
}
@@ -5114,9 +5114,9 @@
try {
int exitCode = CommandLineUtils.executeCommandLine(cmd, out, err);
- String output = (StringUtils.isEmpty(out.getOutput())
+ String output = StringUtils.isEmpty(out.getOutput())
? null
- : '\n' + out.getOutput().trim());
+ : '\n' + out.getOutput().trim();
if (exitCode != 0) {
if (cmdLine == null) {
@@ -5124,7 +5124,7 @@
}
writeDebugJavadocScript(cmdLine, javadocOutputDirectory);
- if (StringUtils.isNotEmpty(output)
+ if ((output != null && !output.isEmpty())
&& StringUtils.isEmpty(err.getOutput())
&& isJavadocVMInitError(output)) {
throw new MavenReportException(output + '\n' + '\n' + JavadocUtil.ERROR_INIT_VM + '\n'
@@ -5135,7 +5135,7 @@
+ "' dir.\n");
}
- if (StringUtils.isNotEmpty(output)) {
+ if (output != null && !output.isEmpty()) {
getLog().info(output);
}
@@ -5166,7 +5166,7 @@
throw new MavenReportException(msg.toString());
}
- if (StringUtils.isNotEmpty(output)) {
+ if (output != null && !output.isEmpty()) {
getLog().info(output);
}
} catch (CommandLineException e) {
@@ -5203,7 +5203,7 @@
private boolean containsWarnings(String output) {
// JDK-8268774 / JDK-8270831
if (this.javadocRuntimeVersion.isBefore("17")) {
- return StringUtils.isNotEmpty(output);
+ return output != null && !output.isEmpty();
} else {
return Arrays.stream(output.split("\\R"))
.reduce((first, second) -> second) // last line
@@ -5417,7 +5417,7 @@
StringBuilder sb = new StringBuilder();
sb.append("org.apache.maven.plugins:maven-javadoc-plugin:");
- if (StringUtils.isNotEmpty(javadocPluginVersion)) {
+ if (javadocPluginVersion != null && !javadocPluginVersion.isEmpty()) {
sb.append(javadocPluginVersion).append(":");
}
@@ -6050,7 +6050,7 @@
* @return <code>true</code> if the module need to be skipped from aggregate generation
*/
protected boolean isSkippedModule(MavenProject mavenProject) {
- if (StringUtils.isEmpty(this.skippedModules)) {
+ if (this.skippedModules == null || this.skippedModules.isEmpty()) {
return false;
}
List<String> modulesToSkip = Arrays.asList(StringUtils.split(this.skippedModules, ','));
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
index 14e138e..50a8a82 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
@@ -39,7 +39,6 @@
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.reporting.MavenMultiPageReport;
import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.plexus.util.StringUtils;
/**
* Generates documentation for the <code>Java code</code> in an <b>NON aggregator</b> project using the standard
@@ -100,7 +99,7 @@
/** {@inheritDoc} */
@Override
public String getName(Locale locale) {
- if (StringUtils.isEmpty(name)) {
+ if (name == null || name.isEmpty()) {
return getBundle(locale).getString("report.javadoc.name");
}
@@ -110,7 +109,7 @@
/** {@inheritDoc} */
@Override
public String getDescription(Locale locale) {
- if (StringUtils.isEmpty(description)) {
+ if (description == null || description.isEmpty()) {
return getBundle(locale).getString("report.javadoc.description");
}
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index c520aae..ccb13c8 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -210,7 +210,7 @@
protected static String quotedArgument(String value) {
String arg = value;
- if (StringUtils.isNotEmpty(arg)) {
+ if (arg != null && !arg.isEmpty()) {
if (arg.contains("'")) {
arg = StringUtils.replace(arg, "'", "\\'");
}
@@ -233,7 +233,7 @@
protected static String quotedPathArgument(String value) {
String path = value;
- if (StringUtils.isNotEmpty(path)) {
+ if (path != null && !path.isEmpty()) {
path = path.replace('\\', '/');
if (path.contains("'")) {
StringBuilder pathBuilder = new StringBuilder();
@@ -275,7 +275,7 @@
List<String> excludes = new ArrayList<>(Arrays.asList(FileUtils.getDefaultExcludes()));
- if (StringUtils.isNotEmpty(excludedocfilessubdir)) {
+ if (excludedocfilessubdir != null && !excludedocfilessubdir.isEmpty()) {
StringTokenizer st = new StringTokenizer(excludedocfilessubdir, ":");
String current;
while (st.hasMoreTokens()) {
@@ -518,7 +518,7 @@
* @throws IllegalArgumentException if the output is null
*/
protected static String extractJavadocVersion(String output) throws IllegalArgumentException {
- if (StringUtils.isEmpty(output)) {
+ if (output == null || output.isEmpty()) {
throw new IllegalArgumentException("The output could not be null.");
}
@@ -578,7 +578,7 @@
* @throws IllegalArgumentException if the <code>memory</code> parameter is null or doesn't match any pattern.
*/
protected static String parseJavadocMemory(String memory) throws IllegalArgumentException {
- if (StringUtils.isEmpty(memory)) {
+ if (memory == null || memory.isEmpty()) {
throw new IllegalArgumentException("The memory could not be null.");
}
@@ -617,7 +617,7 @@
* @return <code>true</code> if the given charset is supported by the JVM, <code>false</code> otherwise.
*/
protected static boolean validateEncoding(String charsetName) {
- if (StringUtils.isEmpty(charsetName)) {
+ if (charsetName == null || charsetName.isEmpty()) {
return false;
}
@@ -741,7 +741,7 @@
}
String mavenHome = getMavenHome(log);
- if (StringUtils.isEmpty(mavenHome)) {
+ if (mavenHome == null || mavenHome.isEmpty()) {
String msg = "Could NOT invoke Maven because no Maven Home is defined. You need to have set the M2_HOME "
+ "system env variable or a maven.home Java system properties.";
if (log != null) {
@@ -907,7 +907,7 @@
Matcher matcher = pattern.matcher(jarEntry.getName());
if (matcher.matches()) {
String version = matcher.group("v");
- if (StringUtils.isEmpty(version) || JavaVersion.JAVA_VERSION.isAtLeast(version)) {
+ if ((version == null || version.isEmpty()) || JavaVersion.JAVA_VERSION.isAtLeast(version)) {
String name = matcher.group("n");
classes.add(name.replaceAll("/", "\\."));
@@ -1176,7 +1176,7 @@
}
static List<String> toList(String src, String elementPrefix, String elementSuffix) {
- if (StringUtils.isEmpty(src)) {
+ if (src == null || src.isEmpty()) {
return null;
}
@@ -1186,13 +1186,13 @@
StringBuilder sb = new StringBuilder(256);
while (st.hasMoreTokens()) {
sb.setLength(0);
- if (StringUtils.isNotEmpty(elementPrefix)) {
+ if (elementPrefix != null && !elementPrefix.isEmpty()) {
sb.append(elementPrefix);
}
sb.append(st.nextToken());
- if (StringUtils.isNotEmpty(elementSuffix)) {
+ if (elementSuffix != null && !elementSuffix.isEmpty()) {
sb.append(elementSuffix);
}
@@ -1426,7 +1426,7 @@
}
private static boolean isValidPackageName(String str) {
- if (StringUtils.isEmpty(str)) {
+ if (str == null || str.isEmpty()) {
// unnamed package is valid (even if bad practice :) )
return true;
}
@@ -1444,7 +1444,7 @@
}
private static boolean isValidClassName(String str) {
- if (StringUtils.isEmpty(str) || !Character.isJavaIdentifierStart(str.charAt(0))) {
+ if ((str == null || str.isEmpty()) || !Character.isJavaIdentifierStart(str.charAt(0))) {
return false;
}
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java
index 743fea1..bc19608 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.plugins.javadoc;
-import org.codehaus.plexus.util.StringUtils;
-
/**
* Once the plugin requires Java9, this class can be replaced with java.lang.Runtime.Version
* <p>
@@ -36,7 +34,7 @@
private String rawVersion;
private JavadocVersion(String rawVersion) {
- if (StringUtils.isEmpty(rawVersion)) {
+ if (rawVersion == null || rawVersion.isEmpty()) {
throw new IllegalArgumentException("The rawVersion could not be null.");
}
this.rawVersion = rawVersion;
@@ -70,7 +68,7 @@
}
}
- return (thisSegments.length - otherSegments.length);
+ return thisSegments.length - otherSegments.length;
}
@Override
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
index efcf135..c65085b 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
@@ -155,7 +155,7 @@
@Override
public String getName(Locale locale) {
- if (StringUtils.isEmpty(testName)) {
+ if (testName == null || testName.isEmpty()) {
return getBundle(locale).getString("report.test-javadoc.name");
}
@@ -164,7 +164,7 @@
@Override
public String getDescription(Locale locale) {
- if (StringUtils.isEmpty(testDescription)) {
+ if (testDescription == null || testDescription.isEmpty()) {
return getBundle(locale).getString("report.test-javadoc.description");
}
@@ -235,9 +235,9 @@
return Collections.emptyList();
}
- return (p.getTestCompileSourceRoots() == null
+ return p.getTestCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<>(p.getTestCompileSourceRoots()));
+ : new LinkedList<>(p.getTestCompileSourceRoots());
}
@Override
@@ -246,9 +246,9 @@
return Collections.emptyList();
}
- return (p.getExecutionProject().getTestCompileSourceRoots() == null
+ return p.getExecutionProject().getTestCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<>(p.getExecutionProject().getTestCompileSourceRoots()));
+ : new LinkedList<>(p.getExecutionProject().getTestCompileSourceRoots());
}
@Override
