commit 401c229952bce1842756fb72963ae9b343c2517f
author Tim te Beek <timtebeek@gmail.com> Mon May 22 13:32:58 2023 +0200
committer GitHub <noreply@github.com> Mon May 22 11:32:58 2023 +0000
tree 9c7e512d210150af4a5414c13a65c2e1e2e69caa
parent 4afec1d322e912b188982255de9801dcaf793186

[MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#189)

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>

src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java

diff --git a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
index be59fed..b297a2c 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
@@ -754,7 +754,7 @@
             return;
         }
 
-        if (StringUtils.isEmpty(encoding)) {
+        if (encoding == null || encoding.isEmpty()) {
             getLog().warn("File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
                     + ", i.e. build is platform dependent!");
         }
@@ -1477,7 +1477,7 @@
     private File interpolatePomFile(File pomFile, File basedir) throws MojoExecutionException {
         File interpolatedPomFile = null;
         if (pomFile != null) {
-            if (StringUtils.isNotEmpty(filteredPomPrefix)) {
+            if (filteredPomPrefix != null && !filteredPomPrefix.isEmpty()) {
                 interpolatedPomFile = new File(basedir, filteredPomPrefix + pomFile.getName());
                 buildInterpolatedFile(pomFile, interpolatedPomFile);
             } else {
@@ -1640,7 +1640,7 @@
      * @param interpolatedPomFile The interpolated pom file.
      */
     private void deleteInterpolatedPomFile(File interpolatedPomFile) {
-        if (interpolatedPomFile != null && StringUtils.isNotEmpty(filteredPomPrefix)) {
+        if (interpolatedPomFile != null && (filteredPomPrefix != null && !filteredPomPrefix.isEmpty())) {
             interpolatedPomFile.delete();
         }
     }

src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java

diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
index 0e08bba..40cc33b 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -260,8 +259,8 @@
     private String getBuildJobReportName(BuildJob buildJob) {
         String buildJobName = buildJob.getName();
         String buildJobDescription = buildJob.getDescription();
-        boolean emptyJobName = StringUtils.isEmpty(buildJobName);
-        boolean emptyJobDescription = StringUtils.isEmpty(buildJobDescription);
+        boolean emptyJobName = buildJobName == null || buildJobName.isEmpty();
+        boolean emptyJobDescription = buildJobDescription == null || buildJobDescription.isEmpty();
         boolean isReportJobNameComplete = !emptyJobName && !emptyJobDescription;
         if (isReportJobNameComplete) {
             return getFormattedName(buildJobName, buildJobDescription);