commit ebb8b5b686753f5219411ae190f5aefae1809ab2
author Tim te Beek <timtebeek@gmail.com> Mon May 22 13:32:10 2023 +0200
committer GitHub <noreply@github.com> Mon May 22 11:32:10 2023 +0000
tree c99e8d2609da4cc66ed84971bea6e2d4aeeb676a
parent c054135175030751b4d71d9262835042d031f6e8

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

* [MNG-6829] Replace any 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 <team@moderne.io>

* Fix Checkstyle issues

---------

Co-authored-by: Moderne <team@moderne.io>

src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java

diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
index 34a845b..8bf7f4f 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
@@ -51,7 +51,6 @@
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.WriterFactory;
 
 import java.io.BufferedOutputStream;
@@ -916,12 +915,12 @@
 
             ScmProviderRepository providerRepo = repository.getProviderRepository();
 
-            if ( !StringUtils.isEmpty( username ) )
+            if ( !( username == null || username.isEmpty() ) )
             {
                 providerRepo.setUser( username );
             }
 
-            if ( !StringUtils.isEmpty( password ) )
+            if ( !( password == null || password.isEmpty() ) )
             {
                 providerRepo.setPassword( password );
             }
@@ -932,28 +931,28 @@
 
                 loadInfosFromSettings( repo );
 
-                if ( !StringUtils.isEmpty( username ) )
+                if ( !( username == null || username.isEmpty() ) )
                 {
                     repo.setUser( username );
                 }
 
-                if ( !StringUtils.isEmpty( password ) )
+                if ( !( password == null || password.isEmpty() ) )
                 {
                     repo.setPassword( password );
                 }
 
-                if ( !StringUtils.isEmpty( privateKey ) )
+                if ( !( privateKey == null || privateKey.isEmpty() ) )
                 {
                     repo.setPrivateKey( privateKey );
                 }
 
-                if ( !StringUtils.isEmpty( passphrase ) )
+                if ( !( passphrase == null || passphrase.isEmpty() ) )
                 {
                     repo.setPassphrase( passphrase );
                 }
             }
 
-            if ( !StringUtils.isEmpty( tagBase ) && repository.getProvider().equals( "svn" ) )
+            if ( !( tagBase == null || tagBase.isEmpty() ) && repository.getProvider().equals( "svn" ) )
             {
                 SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();
 
@@ -1050,18 +1049,20 @@
         }
 
         String scmConnection = project.getScm().getConnection();
-        if ( StringUtils.isNotEmpty( scmConnection ) && "connection".equals( connectionType.toLowerCase() ) )
+        if ( ( scmConnection != null && !scmConnection.isEmpty() )
+                && "connection".equals( connectionType.toLowerCase() ) )
         {
             connection = scmConnection;
         }
 
         String scmDeveloper = project.getScm().getDeveloperConnection();
-        if ( StringUtils.isNotEmpty( scmDeveloper ) && "developerconnection".equals( connectionType.toLowerCase() ) )
+        if ( ( scmDeveloper != null && !scmDeveloper.isEmpty() )
+                && "developerconnection".equals( connectionType.toLowerCase() ) )
         {
             connection = scmDeveloper;
         }
 
-        if ( StringUtils.isEmpty( connection ) )
+        if ( connection == null || connection.isEmpty() )
         {
             throw new MavenReportException( "SCM Connection is not set." );
         }

src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java

diff --git a/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java b/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java
index f2e06a1..7a0e9cf 100644
--- a/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java
+++ b/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java
@@ -35,7 +35,6 @@
 import org.apache.maven.scm.provider.svn.command.SvnCommand;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.provider.svn.svnexe.command.SvnCommandLineUtils;
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
@@ -122,7 +121,7 @@
             cl.createArg().setValue( "--recursive" );
         }
 
-        if ( StringUtils.isNotEmpty( revision ) )
+        if ( revision != null && !revision.isEmpty() )
         {
             cl.createArg().setValue( "-r" );
             cl.createArg().setValue( revision );
@@ -160,7 +159,7 @@
             cl.createArg().setValue( "--recursive" );
         }
 
-        if ( StringUtils.isNotEmpty( revision ) )
+        if ( revision != null && !revision.isEmpty() )
         {
             cl.createArg().setValue( "-r" );
             cl.createArg().setValue( revision );