From 6670ebe62cda43fbbe7335b3078a0e5152e6f17f Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Mon, 22 May 2023 15:28:28 +0000 Subject: [PATCH 1/2] [MNG-6829] Replace StringUtils#isEmpty(String) & #isNotEmpty(String) Last batch of is(Not)Empty for https://issues.apache.org/jira/browse/MNG-6829 These are the smallest change sets, hence why I opened more at the same time. After this we can target the next most often used method from the StringUtils classes. 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 --- .../java/org/apache/maven/shared/verifier/Verifier.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/verifier/Verifier.java b/src/main/java/org/apache/maven/shared/verifier/Verifier.java index 752fdc8..e6865f2 100644 --- a/src/main/java/org/apache/maven/shared/verifier/Verifier.java +++ b/src/main/java/org/apache/maven/shared/verifier/Verifier.java @@ -425,7 +425,7 @@ private BufferedReader getReader( String filename, String encoding ) throws IOEx { File file = new File( getBasedir(), filename ); - if ( StringUtils.isNotEmpty( encoding ) ) + if ( encoding != null && !encoding.isEmpty() ) { return Files.newBufferedReader( file.toPath(), Charset.forName( encoding ) ); } @@ -1396,7 +1396,7 @@ private void initEmbeddedLauncher() { if ( embeddedLauncher == null ) { - if ( StringUtils.isEmpty( mavenHome ) ) + if ( mavenHome == null || mavenHome.isEmpty() ) { embeddedLauncher = Embedded3xLauncher.createFromClasspath(); } @@ -1761,7 +1761,7 @@ public String getLogFileName() */ public void setLogFileName( String logFileName ) { - if ( StringUtils.isEmpty( logFileName ) ) + if ( logFileName == null || logFileName.isEmpty() ) { throw new IllegalArgumentException( "log file name unspecified" ); } @@ -1861,7 +1861,7 @@ public void setDefaultCliArguments( String[] defaultCliArguments ) private void setForkMode() { - if ( StringUtils.isEmpty( mavenHome ) && StringUtils.isEmpty( forkMode ) ) + if ( (mavenHome == null || mavenHome.isEmpty()) && (forkMode == null || forkMode.isEmpty()) ) { forkMode = "auto"; } From 01f92ee6ea5ce59a7e33cabd2e8fb67d2daad049 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Mon, 22 May 2023 16:54:36 +0100 Subject: [PATCH 2/2] Checkstyle --- src/main/java/org/apache/maven/shared/verifier/Verifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/verifier/Verifier.java b/src/main/java/org/apache/maven/shared/verifier/Verifier.java index e6865f2..3c2b68e 100644 --- a/src/main/java/org/apache/maven/shared/verifier/Verifier.java +++ b/src/main/java/org/apache/maven/shared/verifier/Verifier.java @@ -1861,7 +1861,7 @@ public void setDefaultCliArguments( String[] defaultCliArguments ) private void setForkMode() { - if ( (mavenHome == null || mavenHome.isEmpty()) && (forkMode == null || forkMode.isEmpty()) ) + if ( ( mavenHome == null || mavenHome.isEmpty() ) && ( forkMode == null || forkMode.isEmpty() ) ) { forkMode = "auto"; }