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

…ring) (#214) 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 12, 2023 · 1dcccaf · 1dcccaf
1 parent 73791dd
commit 1dcccaf
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 54 deletions.
diff --git a/...n-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java b/...n-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java
@@ -378,7 +378,7 @@ static class PluginOverviewRenderer extends AbstractMavenReportRenderer {
 
             this.project = project;
 
-            this.requirements = (requirements == null ? new Requirements() : requirements);
+            this.requirements = requirements == null ? new Requirements() : requirements;
 
             this.requirementsHistories = requirementsHistories;
 
@@ -496,15 +496,15 @@ public void renderBody() {
             sink.tableRow_();
 
             String memory = requirements.getMemory();
-            if (StringUtils.isNotEmpty(memory)) {
+            if (memory != null && !memory.isEmpty()) {
                 sink.tableRow();
                 tableCell(getBundle(locale).getString("report.plugin.systemrequirements.memory"));
                 tableCell(memory);
                 sink.tableRow_();
             }
 
             String diskSpace = requirements.getDiskSpace();
-            if (StringUtils.isNotEmpty(diskSpace)) {
+            if (diskSpace != null && !diskSpace.isEmpty()) {
                 sink.tableRow();
                 tableCell(getBundle(locale).getString("report.plugin.systemrequirements.diskspace"));
                 tableCell(diskSpace);
@@ -668,9 +668,9 @@ private void renderUsageSection(boolean hasMavenReport) {
         private static String discoverMavenRequirement(MavenProject project, Requirements requirements) {
             String maven = requirements.getMaven();
             if (maven == null) {
-                maven = (project.getPrerequisites() != null
+                maven = project.getPrerequisites() != null
                         ? project.getPrerequisites().getMaven()
-                        : null);
+                        : null;
             }
             if (maven == null) {
                 maven = "2.0";

diff --git a/...ache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/...ache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
@@ -756,7 +756,7 @@ private List<MojoDescriptor> toMojoDescriptors(
                                     + "forbidden characters ${}: " + property,
                             null);
                 }
-                parameter.setExpression(StringUtils.isEmpty(property) ? "" : "${" + property + "}");
+                parameter.setExpression((property == null || property.isEmpty()) ? "" : "${" + property + "}");
                 StringBuilder type = new StringBuilder(parameterAnnotationContent.getClassName());
                 if (!parameterAnnotationContent.getTypeParameters().isEmpty()) {
                     type.append(parameterAnnotationContent.getTypeParameters().stream()
@@ -818,7 +818,7 @@ protected MojoAnnotatedClass findClassWithExecuteAnnotationInParentHierarchy(
             return mojoAnnotatedClass;
         }
         String parentClassName = mojoAnnotatedClass.getParentClassName();
-        if (StringUtils.isEmpty(parentClassName)) {
+        if (parentClassName == null || parentClassName.isEmpty()) {
             return null;
         }
         MojoAnnotatedClass parent = mojoAnnotatedClasses.get(parentClassName);

diff --git a/...rg/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java b/...rg/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java
@@ -153,7 +153,7 @@ public FieldVisitor visitField(int access, String name, String desc, String sign
      * @return the list of type parameters (may be empty)
      */
     private List<String> extractTypeParameters(int access, String signature, boolean isField) {
-        if (StringUtils.isEmpty(signature)) {
+        if (signature == null || signature.isEmpty()) {
             return Collections.emptyList();
         }
         TraceSignatureVisitor traceSignatureVisitor = new TraceSignatureVisitor(access);

diff --git a/...ugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java b/...ugin-tools-api/src/main/java/org/apache/maven/tools/plugin/DefaultPluginToolsRequest.java
@@ -28,7 +28,6 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.RepositorySystemSession;
 
 /**
@@ -119,7 +118,7 @@ public String getEncoding() {
      */
     @Override
     public PluginToolsRequest setEncoding(String encoding) {
-        if (StringUtils.isNotEmpty(encoding)) {
+        if (encoding != null && !encoding.isEmpty()) {
             this.encoding = encoding;
         } else {
             this.encoding = DEFAULT_ENCODING;

diff --git a/...java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java b/...java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
@@ -33,7 +33,6 @@
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @deprecated Scripting support for Mojos is deprecated and is planned to be removed in Maven 4.0
@@ -62,7 +61,7 @@ public List<MojoDescriptor> execute(PluginToolsRequest request)
                 gatherFilesByBasedir(project.getBasedir(), project.getScriptSourceRoots(), scriptExtension, request);
 
         List<MojoDescriptor> mojoDescriptors;
-        if (!StringUtils.isEmpty(metadataExtension)) {
+        if (!(metadataExtension == null || metadataExtension.isEmpty())) {
             @SuppressWarnings("unchecked")
             Map<String, Set<File>> metadataFilesKeyedByBasedir = gatherFilesByBasedir(
                     project.getBasedir(), project.getScriptSourceRoots(), metadataExtension, request);

diff --git a/...lugin-tools-api/src/main/java/org/apache/maven/tools/plugin/javadoc/JavadocReference.java b/...lugin-tools-api/src/main/java/org/apache/maven/tools/plugin/javadoc/JavadocReference.java
@@ -23,8 +23,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.codehaus.plexus.util.StringUtils;
-
 /**
  * Describes a code reference used in javadoc tags {@code see}, {@code link} and {@code linkplain}.
  * The format of the reference given as string is {@code module/package.class#member label}.
@@ -78,7 +76,7 @@ public static JavadocReference parse(String reference) {
 
     private static Optional<String> getOptionalGroup(Matcher matcher, int index) {
         String group = matcher.group(index);
-        if (StringUtils.isNotEmpty(group)) {
+        if (group != null && !group.isEmpty()) {
             return Optional.of(group);
         } else {
             return Optional.empty();

diff --git a/...gin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java b/...gin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
@@ -39,7 +39,6 @@
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author jdcasey
@@ -172,7 +171,7 @@ public void setActiveExtractors(Set<String> extractors) {
             this.activeExtractors = new HashSet<>();
 
             for (String extractor : extractors) {
-                if (StringUtils.isNotEmpty(extractor)) {
+                if (extractor != null && !extractor.isEmpty()) {
                     this.activeExtractors.add(extractor);
                 }
             }

diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
@@ -90,7 +90,7 @@ public static String[] findSources(String basedir, String include, String exclud
         DirectoryScanner scanner = new DirectoryScanner();
         scanner.setBasedir(basedir);
         scanner.setIncludes(new String[] {include});
-        if (!StringUtils.isEmpty(exclude)) {
+        if (!(exclude == null || exclude.isEmpty())) {
             scanner.setExcludes(new String[] {exclude, StringUtils.join(FileUtils.getDefaultExcludes(), ",")});
         } else {
             scanner.setExcludes(FileUtils.getDefaultExcludes());

diff --git a/...ools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java b/...ools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
@@ -174,7 +174,7 @@ private static String quoteReplacement(String s) {
      */
     @Deprecated
     static String decodeJavadocTags(String description) {
-        if (StringUtils.isEmpty(description)) {
+        if (description == null || description.isEmpty()) {
             return "";
         }
 
@@ -198,13 +198,13 @@ static String decodeJavadocTags(String description) {
                 Matcher link = Pattern.compile(pattern).matcher(text);
                 if (link.matches()) {
                     text = link.group(label);
-                    if (StringUtils.isEmpty(text)) {
+                    if (text == null || text.isEmpty()) {
                         text = link.group(clazz);
-                        if (StringUtils.isEmpty(text)) {
+                        if (text == null || text.isEmpty()) {
                             text = "";
                         }
                         if (StringUtils.isNotEmpty(link.group(member))) {
-                            if (StringUtils.isNotEmpty(text)) {
+                            if (text != null && !text.isEmpty()) {
                                 text += '.';
                             }
                             text += link.group(member);
@@ -235,7 +235,7 @@ static String decodeJavadocTags(String description) {
     @Deprecated
     public static String makeHtmlValid(String description) {
 
-        if (StringUtils.isEmpty(description)) {
+        if (description == null || description.isEmpty()) {
             return "";
         }
 
@@ -258,7 +258,7 @@ public static String makeHtmlValid(String description) {
         tidy.parse(new ByteArrayInputStream(commentCleaned.getBytes(StandardCharsets.UTF_8)), out);
         commentCleaned = new String(out.toByteArray(), StandardCharsets.UTF_8);
 
-        if (StringUtils.isEmpty(commentCleaned)) {
+        if (commentCleaned == null || commentCleaned.isEmpty()) {
             return "";
         }
 
@@ -291,7 +291,7 @@ public static String makeHtmlValid(String description) {
      */
     @Deprecated
     public static String toText(String html) {
-        if (StringUtils.isEmpty(html)) {
+        if (html == null || html.isEmpty()) {
             return "";
         }
 

diff --git a/...src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java b/...src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
@@ -241,7 +241,7 @@ protected void processMojoDescriptor(
 
         String description = mojoDescriptor.getDescription();
 
-        if (StringUtils.isNotEmpty(description)) {
+        if (description != null && !description.isEmpty()) {
             w.startElement("description");
             w.writeText(getTextValue(type, containsXhtmlTextValues, mojoDescriptor.getDescription()));
             w.endElement();
@@ -438,7 +438,7 @@ protected void processMojoDescriptor(
             for (Parameter parameter : parameters) {
                 String expression = getExpression(parameter);
 
-                if (StringUtils.isNotEmpty(expression) && expression.startsWith("${component.")) {
+                if ((expression != null && !expression.isEmpty()) && expression.startsWith("${component.")) {
                     // treat it as a component...a requirement, in other words.
 
                     // remove "component." plus expression delimiters
@@ -535,7 +535,7 @@ else if (type != DescriptorType.LIMITED_FOR_HELP_MOJO || parameter.isEditable())
 
                 // strip type by parameter type (generics) information
                 String parameterType = StringUtils.chomp(parameter.getType(), "<");
-                if (StringUtils.isNotEmpty(parameterType)) {
+                if (parameterType != null && !parameterType.isEmpty()) {
                     w.addAttribute("implementation", parameterType);
                 }
 

diff --git a/...generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/...generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -31,7 +31,6 @@
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.io.CachingOutputStream;
 import org.codehaus.plexus.velocity.VelocityComponent;
 
@@ -146,7 +145,7 @@ private String getHelpClassSources(String pluginHelpPath) throws IOException {
      * @return The implementation.
      */
     private String getImplementation() {
-        return StringUtils.isEmpty(helpPackageName)
+        return (helpPackageName == null || helpPackageName.isEmpty())
                 ? HELP_MOJO_CLASS_NAME
                 : helpPackageName + '.' + HELP_MOJO_CLASS_NAME;
     }

diff --git a/...generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/...generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
@@ -286,7 +286,7 @@ private void writeGoalAttributes(MojoDescriptor mojoDescriptor, XMLWriter w) {
         }
 
         value = mojoDescriptor.isDependencyResolutionRequired();
-        if (StringUtils.isNotEmpty(value)) {
+        if (value != null && !value.isEmpty()) {
             addedUl = addUl(w, addedUl);
             w.startElement("li");
             w.writeMarkup(format("pluginxdoc.mojodescriptor.dependencyResolutionRequired", value));
@@ -297,7 +297,7 @@ private void writeGoalAttributes(MojoDescriptor mojoDescriptor, XMLWriter w) {
             ExtendedMojoDescriptor extendedMojoDescriptor = (ExtendedMojoDescriptor) mojoDescriptor;
 
             value = extendedMojoDescriptor.getDependencyCollectionRequired();
-            if (StringUtils.isNotEmpty(value)) {
+            if (value != null && !value.isEmpty()) {
                 addedUl = addUl(w, addedUl);
                 w.startElement("li");
                 w.writeMarkup(format("pluginxdoc.mojodescriptor.dependencyCollectionRequired", value));
@@ -314,39 +314,39 @@ private void writeGoalAttributes(MojoDescriptor mojoDescriptor, XMLWriter w) {
         w.endElement(); // li
 
         value = mojoDescriptor.getSince();
-        if (StringUtils.isNotEmpty(value)) {
+        if (value != null && !value.isEmpty()) {
             addedUl = addUl(w, addedUl);
             w.startElement("li");
             w.writeMarkup(format("pluginxdoc.mojodescriptor.since", value));
             w.endElement(); // li
         }
 
         value = mojoDescriptor.getPhase();
-        if (StringUtils.isNotEmpty(value)) {
+        if (value != null && !value.isEmpty()) {
             addedUl = addUl(w, addedUl);
             w.startElement("li");
             w.writeMarkup(format("pluginxdoc.mojodescriptor.phase", value));
             w.endElement(); // li
         }
 
         value = mojoDescriptor.getExecutePhase();
-        if (StringUtils.isNotEmpty(value)) {
+        if (value != null && !value.isEmpty()) {
             addedUl = addUl(w, addedUl);
             w.startElement("li");
             w.writeMarkup(format("pluginxdoc.mojodescriptor.executePhase", value));
             w.endElement(); // li
         }
 
         value = mojoDescriptor.getExecuteGoal();
-        if (StringUtils.isNotEmpty(value)) {
+        if (value != null && !value.isEmpty()) {
             addedUl = addUl(w, addedUl);
             w.startElement("li");
             w.writeMarkup(format("pluginxdoc.mojodescriptor.executeGoal", value));
             w.endElement(); // li
         }
 
         value = mojoDescriptor.getExecuteLifecycle();
-        if (StringUtils.isNotEmpty(value)) {
+        if (value != null && !value.isEmpty()) {
             addedUl = addUl(w, addedUl);
             w.startElement("li");
             w.writeMarkup(format("pluginxdoc.mojodescriptor.executeLifecycle", value));
@@ -565,7 +565,7 @@ private String getLinkedType(Parameter parameter, boolean isShortType) {
     }
 
     private boolean addUl(XMLWriter w, boolean addedUl, String content) {
-        if (StringUtils.isNotEmpty(content)) {
+        if (content != null && !content.isEmpty()) {
             return addUl(w, addedUl);
         }
         return addedUl;
@@ -580,7 +580,7 @@ private boolean addUl(XMLWriter w, boolean addedUl) {
     }
 
     private String getPropertyFromExpression(String expression) {
-        if (StringUtils.isNotEmpty(expression)
+        if ((expression != null && !expression.isEmpty())
                 && expression.startsWith("${")
                 && expression.endsWith("}")
                 && !expression.substring(2).contains("${")) {
@@ -597,7 +597,7 @@ private String getPropertyFromExpression(String expression) {
      * @param w     not null
      */
     private void writeDetail(String param, String value, XMLWriter w) {
-        if (StringUtils.isNotEmpty(value)) {
+        if (value != null && !value.isEmpty()) {
             w.startElement("li");
             w.writeMarkup(format("pluginxdoc.detail", new String[] {param, value}));
             w.endElement(); // li