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

#121) 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>
apache · May 22, 2023 · 9ebda63 · 9ebda63
1 parent 472ed5a
commit 9ebda63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
@@ -34,7 +34,6 @@
 import com.puppycrawl.tools.checkstyle.api.AuditListener;
 import com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
@@ -602,7 +601,7 @@ private List<Artifact> getCheckstylePluginDependenciesAsArtifacts(Map<String, Pl
     protected AuditListener getListener() throws MavenReportException {
         AuditListener listener = null;
 
-        if (StringUtils.isNotEmpty(outputFileFormat)) {
+        if (outputFileFormat != null && !outputFileFormat.isEmpty()) {
             File resultFile = outputFile;
 
             OutputStream out = getOutputStream(resultFile);

diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
@@ -37,7 +37,6 @@
 import com.puppycrawl.tools.checkstyle.api.AuditListener;
 import com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
@@ -772,7 +771,7 @@ private OutputStream getOutputStream(File file) throws MojoExecutionException {
     private AuditListener getListener() throws MojoFailureException, MojoExecutionException {
         AuditListener listener = null;
 
-        if (StringUtils.isNotEmpty(outputFileFormat)) {
+        if (outputFileFormat != null && !outputFileFormat.isEmpty()) {
             File resultFile = outputFile;
 
             OutputStream out = getOutputStream(resultFile);

diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java
@@ -402,7 +402,7 @@ private Properties getOverridingProperties(CheckstyleExecutorRequest request) th
                 getLogger().debug("headerLocation " + headerLocation);
             }
 
-            if (StringUtils.isNotEmpty(headerLocation)) {
+            if (headerLocation != null && !headerLocation.isEmpty()) {
                 try {
                     File headerFile = licenseLocator.getResourceAsFile(headerLocation, "checkstyle-header.txt");
 
@@ -551,15 +551,15 @@ private void addResourceFilesToProcess(
                     if (resourcesDirectory.equals(request.getProject().getBasedir())) {
                         String resourceIncludes =
                                 StringUtils.join(resource.getIncludes().iterator(), ",");
-                        if (StringUtils.isEmpty(includes)) {
+                        if (includes == null || includes.isEmpty()) {
                             includes = resourceIncludes;
                         } else {
                             includes += "," + resourceIncludes;
                         }
 
                         String resourceExcludes =
                                 StringUtils.join(resource.getExcludes().iterator(), ",");
-                        if (StringUtils.isEmpty(excludes)) {
+                        if (excludes == null || excludes.isEmpty()) {
                             excludes = resourceExcludes;
                         } else {
                             excludes += "," + resourceExcludes;
@@ -594,7 +594,7 @@ private FilterSet getSuppressionsFilterSet(final String suppressionsFilePath) th
 
     private String getSuppressionsFilePath(final CheckstyleExecutorRequest request) throws CheckstyleExecutorException {
         final String suppressionsLocation = request.getSuppressionsLocation();
-        if (StringUtils.isEmpty(suppressionsLocation)) {
+        if (suppressionsLocation == null || suppressionsLocation.isEmpty()) {
             return null;
         }