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

timtebeek · TeamModerne · web-flow · commit 7b9282c05422 · 2023-05-09T16:28:45.000-04:00
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/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
@@ -198,21 +198,21 @@ protected static String getVersionString(Version info, String buildSpecifier, St
             sb.append(joinDigitString(info.digits));
         }
 
-        if (StringUtils.isNotEmpty(info.annotation)) {
+        if (info.annotation != null && !info.annotation.isEmpty()) {
             sb.append(StringUtils.defaultString(info.annotationSeparator));
             sb.append(info.annotation);
         }
 
-        if (StringUtils.isNotEmpty(info.annotationRevision)) {
-            if (StringUtils.isEmpty(info.annotation)) {
+        if (info.annotationRevision != null && !info.annotationRevision.isEmpty()) {
+            if (info.annotation == null || info.annotation.isEmpty()) {
                 sb.append(StringUtils.defaultString(info.annotationSeparator));
             } else {
                 sb.append(StringUtils.defaultString(info.annotationRevSeparator));
             }
             sb.append(info.annotationRevision);
         }
 
-        if (StringUtils.isNotEmpty(buildSpecifier)) {
+        if (buildSpecifier != null && !buildSpecifier.isEmpty()) {
             sb.append(StringUtils.defaultString(buildSeparator));
             sb.append(buildSpecifier);
         }
@@ -240,7 +240,7 @@ private List<String> parseDigits(String strDigits) {
     }
 
     private static String nullIfEmpty(String s) {
-        return StringUtils.isEmpty(s) ? null : s;
+        return (s == null || s.isEmpty()) ? null : s;
     }
 
     /**
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -41,7 +41,6 @@
 import org.apache.maven.shared.release.phase.ReleasePhase;
 import org.apache.maven.shared.release.phase.ResourceGenerator;
 import org.apache.maven.shared.release.strategy.Strategy;
-import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -459,7 +458,7 @@ public ReleaseDescriptorBuilder addReleaseVersion(String key, String value) {
      * @return The working directory
      */
     protected File determineWorkingDirectory(File checkoutDirectory, String relativePathProjectDirectory) {
-        if (StringUtils.isNotEmpty(relativePathProjectDirectory)) {
+        if (relativePathProjectDirectory != null && !relativePathProjectDirectory.isEmpty()) {
             return new File(checkoutDirectory, relativePathProjectDirectory);
         } else {
             return checkoutDirectory;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -34,7 +34,6 @@
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.apache.maven.shared.release.util.MavenCrypto;
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.Commandline;
 
@@ -128,7 +127,7 @@ public void executeGoals(
                 cl.createArg().setValue("--batch-mode");
             }
 
-            if (!StringUtils.isEmpty(additionalArguments)) {
+            if (!(additionalArguments == null || additionalArguments.isEmpty())) {
                 cl.createArg().setLine(additionalArguments);
             }
 
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
@@ -48,7 +48,6 @@
 import org.codehaus.plexus.interpolation.PrefixedPropertiesValueSource;
 import org.codehaus.plexus.interpolation.RecursionInterceptor;
 import org.codehaus.plexus.interpolation.StringSearchInterpolator;
-import org.codehaus.plexus.util.StringUtils;
 
 import static java.util.Objects.requireNonNull;
 import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -201,7 +200,7 @@ public ReleaseResult execute(
                         tag = prompter.get()
                                 .prompt("What is the branch name for \"" + project.getName() + "\"? ("
                                         + buffer().project(project.getArtifactId()) + ")");
-                        if (StringUtils.isEmpty(tag)) {
+                        if (tag == null || tag.isEmpty()) {
                             throw new ReleaseExecutionException("No branch name was given.");
                         }
                     } else {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
@@ -39,7 +39,6 @@
 import org.apache.maven.shared.release.versions.VersionParseException;
 import org.codehaus.plexus.components.interactivity.Prompter;
 import org.codehaus.plexus.components.interactivity.PrompterException;
-import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 
 import static java.util.Objects.requireNonNull;
@@ -336,11 +335,11 @@ private String resolveSuggestedVersion(
     private String getDevelopmentVersion(String projectId, ReleaseDescriptor releaseDescriptor) {
         String projectVersion = releaseDescriptor.getProjectDevelopmentVersion(projectId);
 
-        if (StringUtils.isEmpty(projectVersion)) {
+        if (projectVersion == null || projectVersion.isEmpty()) {
             projectVersion = releaseDescriptor.getDefaultDevelopmentVersion();
         }
 
-        if (StringUtils.isEmpty(projectVersion)) {
+        if (projectVersion == null || projectVersion.isEmpty()) {
             return null;
         }
 
@@ -350,11 +349,11 @@ private String getDevelopmentVersion(String projectId, ReleaseDescriptor release
     private String getReleaseVersion(String projectId, ReleaseDescriptor releaseDescriptor) {
         String projectVersion = releaseDescriptor.getProjectReleaseVersion(projectId);
 
-        if (StringUtils.isEmpty(projectVersion)) {
+        if (projectVersion == null || projectVersion.isEmpty()) {
             projectVersion = releaseDescriptor.getDefaultReleaseVersion();
         }
 
-        if (StringUtils.isEmpty(projectVersion)) {
+        if (projectVersion == null || projectVersion.isEmpty()) {
             return null;
         }
 
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -409,7 +409,7 @@ private void transformDocument(
 
     private void rewriteBuildOutputTimestampProperty(Properties properties, ReleaseResult result) {
         String buildOutputTimestamp = properties.getProperty("project.build.outputTimestamp");
-        if (buildOutputTimestamp == null || StringUtils.isEmpty(buildOutputTimestamp)) {
+        if (buildOutputTimestamp == null || (buildOutputTimestamp == null || buildOutputTimestamp.isEmpty())) {
             // no Reproducible Builds output timestamp defined
             return;
         }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -74,7 +74,7 @@ protected ReleaseResult execute(
 
         try {
             String goals = getGoals(releaseDescriptor);
-            if (!StringUtils.isEmpty(goals)) {
+            if (!(goals == null || goals.isEmpty())) {
                 logInfo(result, "Executing goals '" + buffer().strong(goals) + "'...");
                 if (logArguments) {
                     // logging arguments may log secrets: should be activated only on dryRun
@@ -151,7 +151,7 @@ protected String getAdditionalArguments(ReleaseDescriptor releaseDescriptor) {
     protected File determineWorkingDirectory(File checkoutDirectory, String relativePathProjectDirectory) {
         File workingDirectory = checkoutDirectory;
 
-        if (StringUtils.isNotEmpty(relativePathProjectDirectory)) {
+        if (relativePathProjectDirectory != null && !relativePathProjectDirectory.isEmpty()) {
             workingDirectory = new File(checkoutDirectory, relativePathProjectDirectory);
         }
 
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
@@ -50,7 +50,6 @@
 import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.apache.maven.shared.release.util.ReleaseUtil;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
 
 import static java.util.Objects.requireNonNull;
 import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -208,7 +207,7 @@ private ReleaseResult performCheckout(
         }
 
         String scmRelativePathProjectDirectory = scmResult.getRelativePathProjectDirectory();
-        if (StringUtils.isEmpty(scmRelativePathProjectDirectory)) {
+        if (scmRelativePathProjectDirectory == null || scmRelativePathProjectDirectory.isEmpty()) {
             Path workingDirectory = Paths.get(releaseDescriptor.getWorkingDirectory());
 
             Path rootProjectBasedir;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
@@ -65,7 +65,7 @@ private ReleaseResult runLogic(
         String additionalArguments = getAdditionalArguments(releaseDescriptor);
 
         if (releaseDescriptor.isUseReleaseProfile()) {
-            if (!StringUtils.isEmpty(additionalArguments)) {
+            if (!(additionalArguments == null || additionalArguments.isEmpty())) {
                 additionalArguments = additionalArguments + " -DperformRelease=true";
             } else {
                 additionalArguments = "-DperformRelease=true";
@@ -79,7 +79,7 @@ private ReleaseResult runLogic(
 
         // ensure we don't use the release pom for the perform goals
         // ^^ paranoia? A MavenExecutor has already access to this. Probably worth refactoring.
-        if (!StringUtils.isEmpty(additionalArguments)) {
+        if (!(additionalArguments == null || additionalArguments.isEmpty())) {
             additionalArguments = additionalArguments + " -f " + pomFileName;
         } else {
             additionalArguments = "-f " + pomFileName;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
@@ -37,7 +37,6 @@
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.util.MavenCrypto;
 import org.apache.maven.shared.release.util.MavenCrypto.MavenCryptoException;
-import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -134,20 +133,20 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea
             }
         }
 
-        if (!StringUtils.isEmpty(username)) {
+        if (!(username == null || username.isEmpty())) {
             scmRepo.setUser(username);
         }
-        if (!StringUtils.isEmpty(password)) {
+        if (!(password == null || password.isEmpty())) {
             scmRepo.setPassword(password);
         }
 
         if (scmRepo instanceof ScmProviderRepositoryWithHost) {
             ScmProviderRepositoryWithHost repositoryWithHost = (ScmProviderRepositoryWithHost) scmRepo;
-            if (!StringUtils.isEmpty(privateKey)) {
+            if (!(privateKey == null || privateKey.isEmpty())) {
                 repositoryWithHost.setPrivateKey(privateKey);
             }
 
-            if (!StringUtils.isEmpty(passphrase)) {
+            if (!(passphrase == null || passphrase.isEmpty())) {
                 repositoryWithHost.setPassphrase(passphrase);
             }
         }
@@ -156,12 +155,12 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea
             SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();
 
             String tagBase = releaseDescriptor.getScmTagBase();
-            if (!StringUtils.isEmpty(tagBase)) {
+            if (!(tagBase == null || tagBase.isEmpty())) {
                 svnRepo.setTagBase(tagBase);
             }
 
             String branchBase = releaseDescriptor.getScmBranchBase();
-            if (!StringUtils.isEmpty(branchBase)) {
+            if (!(branchBase == null || branchBase.isEmpty())) {
                 svnRepo.setBranchBase(branchBase);
             }
         }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
@@ -26,7 +26,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Model;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -164,7 +163,7 @@ public static int getBaseWorkingDirectoryParentCount(final Path baseDirectory, f
     }
 
     public static String realignScmUrl(int parentLevels, String url) {
-        if (!StringUtils.isEmpty(url)) {
+        if (!(url == null || url.isEmpty())) {
             // normalize
             url = url.replaceAll("/\\./", "/")
                     .replaceAll("/\\.$", "")
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
@@ -332,21 +332,21 @@ protected static String getVersionString(DefaultVersionInfo info, String buildSp
             sb.append(joinDigitString(info.digits));
         }
 
-        if (StringUtils.isNotEmpty(info.annotation)) {
+        if (info.annotation != null && !info.annotation.isEmpty()) {
             sb.append(StringUtils.defaultString(info.annotationSeparator));
             sb.append(info.annotation);
         }
 
-        if (StringUtils.isNotEmpty(info.annotationRevision)) {
-            if (StringUtils.isEmpty(info.annotation)) {
+        if (info.annotationRevision != null && !info.annotationRevision.isEmpty()) {
+            if (info.annotation == null || info.annotation.isEmpty()) {
                 sb.append(StringUtils.defaultString(info.annotationSeparator));
             } else {
                 sb.append(StringUtils.defaultString(info.annotationRevSeparator));
             }
             sb.append(info.annotationRevision);
         }
 
-        if (StringUtils.isNotEmpty(buildSpecifier)) {
+        if (buildSpecifier != null && !buildSpecifier.isEmpty()) {
             sb.append(StringUtils.defaultString(buildSeparator));
             sb.append(buildSpecifier);
         }
@@ -379,7 +379,7 @@ private List<String> parseDigits(String strDigits) {
     // --------------------------------------------------
 
     private static String nullIfEmpty(String s) {
-        return StringUtils.isEmpty(s) ? null : s;
+        return (s == null || s.isEmpty()) ? null : s;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -198,21 +198,21 @@ protected static String getVersionString(Version info, String buildSpecifier, St`
`198`	`198`	`sb.append(joinDigitString(info.digits));`
`199`	`199`	`}`
`200`	`200`
`201`		`- if (StringUtils.isNotEmpty(info.annotation)) {`
	`201`	`+ if (info.annotation != null && !info.annotation.isEmpty()) {`
`202`	`202`	`sb.append(StringUtils.defaultString(info.annotationSeparator));`
`203`	`203`	`sb.append(info.annotation);`
`204`	`204`	`}`
`205`	`205`
`206`		`- if (StringUtils.isNotEmpty(info.annotationRevision)) {`
`207`		`- if (StringUtils.isEmpty(info.annotation)) {`
	`206`	`+ if (info.annotationRevision != null && !info.annotationRevision.isEmpty()) {`
	`207`	`+ if (info.annotation == null \|\| info.annotation.isEmpty()) {`
`208`	`208`	`sb.append(StringUtils.defaultString(info.annotationSeparator));`
`209`	`209`	`} else {`
`210`	`210`	`sb.append(StringUtils.defaultString(info.annotationRevSeparator));`
`211`	`211`	`}`
`212`	`212`	`sb.append(info.annotationRevision);`
`213`	`213`	`}`
`214`	`214`
`215`		`- if (StringUtils.isNotEmpty(buildSpecifier)) {`
	`215`	`+ if (buildSpecifier != null && !buildSpecifier.isEmpty()) {`
`216`	`216`	`sb.append(StringUtils.defaultString(buildSeparator));`
`217`	`217`	`sb.append(buildSpecifier);`
`218`	`218`	`}`
`@@ -240,7 +240,7 @@ private List<String> parseDigits(String strDigits) {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`private static String nullIfEmpty(String s) {`
`243`		`- return StringUtils.isEmpty(s) ? null : s;`
	`243`	`+ return (s == null \|\| s.isEmpty()) ? null : s;`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@`
`34`	`34`	`import org.apache.maven.shared.release.ReleaseResult;`
`35`	`35`	`import org.apache.maven.shared.release.env.ReleaseEnvironment;`
`36`	`36`	`import org.apache.maven.shared.release.util.MavenCrypto;`
`37`		`-import org.codehaus.plexus.util.StringUtils;`
`38`	`37`	`import org.codehaus.plexus.util.cli.CommandLineException;`
`39`	`38`	`import org.codehaus.plexus.util.cli.Commandline;`
`40`	`39`
`@@ -128,7 +127,7 @@ public void executeGoals(`
`128`	`127`	`cl.createArg().setValue("--batch-mode");`
`129`	`128`	`}`
`130`	`129`
`131`		`- if (!StringUtils.isEmpty(additionalArguments)) {`
	`130`	`+ if (!(additionalArguments == null \|\| additionalArguments.isEmpty())) {`
`132`	`131`	`cl.createArg().setLine(additionalArguments);`
`133`	`132`	`}`
`134`	`133`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ private void transformDocument(`
`409`	`409`
`410`	`410`	`private void rewriteBuildOutputTimestampProperty(Properties properties, ReleaseResult result) {`
`411`	`411`	`String buildOutputTimestamp = properties.getProperty("project.build.outputTimestamp");`
`412`		`- if (buildOutputTimestamp == null \|\| StringUtils.isEmpty(buildOutputTimestamp)) {`
	`412`	`+ if (buildOutputTimestamp == null \|\| (buildOutputTimestamp == null \|\| buildOutputTimestamp.isEmpty())) {`
`413`	`413`	`// no Reproducible Builds output timestamp defined`
`414`	`414`	`return;`
`415`	`415`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@`
`37`	`37`	`import org.apache.maven.shared.release.config.ReleaseDescriptor;`
`38`	`38`	`import org.apache.maven.shared.release.util.MavenCrypto;`
`39`	`39`	`import org.apache.maven.shared.release.util.MavenCrypto.MavenCryptoException;`
`40`		`-import org.codehaus.plexus.util.StringUtils;`
`41`	`40`	`import org.slf4j.Logger;`
`42`	`41`	`import org.slf4j.LoggerFactory;`
`43`	`42`
`@@ -134,20 +133,20 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea`
`134`	`133`	`}`
`135`	`134`	`}`
`136`	`135`
`137`		`- if (!StringUtils.isEmpty(username)) {`
	`136`	`+ if (!(username == null \|\| username.isEmpty())) {`
`138`	`137`	`scmRepo.setUser(username);`
`139`	`138`	`}`
`140`		`- if (!StringUtils.isEmpty(password)) {`
	`139`	`+ if (!(password == null \|\| password.isEmpty())) {`
`141`	`140`	`scmRepo.setPassword(password);`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`if (scmRepo instanceof ScmProviderRepositoryWithHost) {`
`145`	`144`	`ScmProviderRepositoryWithHost repositoryWithHost = (ScmProviderRepositoryWithHost) scmRepo;`
`146`		`- if (!StringUtils.isEmpty(privateKey)) {`
	`145`	`+ if (!(privateKey == null \|\| privateKey.isEmpty())) {`
`147`	`146`	`repositoryWithHost.setPrivateKey(privateKey);`
`148`	`147`	`}`
`149`	`148`
`150`		`- if (!StringUtils.isEmpty(passphrase)) {`
	`149`	`+ if (!(passphrase == null \|\| passphrase.isEmpty())) {`
`151`	`150`	`repositoryWithHost.setPassphrase(passphrase);`
`152`	`151`	`}`
`153`	`152`	`}`
`@@ -156,12 +155,12 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea`
`156`	`155`	`SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();`
`157`	`156`
`158`	`157`	`String tagBase = releaseDescriptor.getScmTagBase();`
`159`		`- if (!StringUtils.isEmpty(tagBase)) {`
	`158`	`+ if (!(tagBase == null \|\| tagBase.isEmpty())) {`
`160`	`159`	`svnRepo.setTagBase(tagBase);`
`161`	`160`	`}`
`162`	`161`
`163`	`162`	`String branchBase = releaseDescriptor.getScmBranchBase();`
`164`		`- if (!StringUtils.isEmpty(branchBase)) {`
	`163`	`+ if (!(branchBase == null \|\| branchBase.isEmpty())) {`
`165`	`164`	`svnRepo.setBranchBase(branchBase);`
`166`	`165`	`}`
`167`	`166`	`}`