From b598aef734daf361c4eb5f81b1df97d95406198a Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Mon, 15 May 2023 13:11:39 +0200 Subject: [PATCH] [MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#187) * [MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) 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 * Revert changes to src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/src/main/java/com/example/Main.java --------- Co-authored-by: Moderne --- .../shade/resource/ApacheNoticeResourceTransformer.java | 5 ++--- .../shade/resource/DontIncludeResourceTransformer.java | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java index 4b31d329..a850a3a2 100644 --- a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java +++ b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java @@ -36,7 +36,6 @@ import java.util.jar.JarOutputStream; import org.apache.maven.plugins.shade.relocation.Relocator; -import org.codehaus.plexus.util.StringUtils; /** * Merges META-INF/NOTICE.TXT files. @@ -106,7 +105,7 @@ public void processResource(String resource, InputStream is, List rel } BufferedReader reader; - if (StringUtils.isNotEmpty(encoding)) { + if (encoding != null && !encoding.isEmpty()) { reader = new BufferedReader(new InputStreamReader(is, encoding)); } else { reader = new BufferedReader(new InputStreamReader(is)); @@ -178,7 +177,7 @@ public void modifyOutputStream(JarOutputStream jos) throws IOException { jos.putNextEntry(jarEntry); Writer writer; - if (StringUtils.isNotEmpty(encoding)) { + if (encoding != null && !encoding.isEmpty()) { writer = new OutputStreamWriter(jos, encoding); } else { writer = new OutputStreamWriter(jos); diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java index 406171e8..0be64dfd 100644 --- a/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java +++ b/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java @@ -24,7 +24,6 @@ import java.util.jar.JarOutputStream; import org.apache.maven.plugins.shade.relocation.Relocator; -import org.codehaus.plexus.util.StringUtils; /** * A resource processor that prevents the inclusion of an arbitrary @@ -36,7 +35,7 @@ public class DontIncludeResourceTransformer extends AbstractCompatibilityTransfo List resources; public boolean canTransformResource(String r) { - if (StringUtils.isNotEmpty(resource) && r.endsWith(resource)) { + if ((resource != null && !resource.isEmpty()) && r.endsWith(resource)) { return true; }