From 9cca1a084ac4a4fcfe836f0345f34f64bf8443cb Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 10 May 2023 11:29:13 +0000 Subject: [PATCH 1/2] [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 --- .../maven/plugins/announcement/AnnouncementMailMojo.java | 3 +-- .../maven/plugins/announcement/AnnouncementMojo.java | 7 +++---- .../java/org/apache/maven/plugins/changes/ChangesMojo.java | 5 ++--- .../plugins/issues/AbstractIssuesReportGenerator.java | 3 +-- .../java/org/apache/maven/plugins/trac/TracDownloader.java | 3 +-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java index f29ded18..62267c8b 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java +++ b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java @@ -43,7 +43,6 @@ import org.codehaus.plexus.mailsender.MailSenderException; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.StringUtils; /** * Goal which sends an announcement through email. @@ -366,7 +365,7 @@ protected String readAnnouncement( File file ) { try { - if ( StringUtils.isEmpty( templateEncoding ) ) + if ( templateEncoding == null || templateEncoding.isEmpty() ) { templateEncoding = ReaderFactory.FILE_ENCODING; getLog().warn( "File encoding has not been set, using platform encoding '" + templateEncoding diff --git a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java index a3a11970..ea5fe139 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java +++ b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java @@ -58,7 +58,6 @@ import org.apache.velocity.exception.VelocityException; import org.apache.velocity.tools.ToolManager; import org.codehaus.plexus.util.ReaderFactory; -import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.velocity.VelocityComponent; /** @@ -696,7 +695,7 @@ public void processTemplate( Context context, File outputDirectory, String templ File f; // Use the name of the template as a default value - if ( StringUtils.isEmpty( announcementFile ) ) + if ( announcementFile == null || announcementFile.isEmpty() ) { announcementFile = template; } @@ -714,7 +713,7 @@ public void processTemplate( Context context, File outputDirectory, String templ engine.setApplicationAttribute( "baseDirectory", basedir ); - if ( StringUtils.isEmpty( templateEncoding ) ) + if ( templateEncoding == null || templateEncoding.isEmpty() ) { templateEncoding = ReaderFactory.FILE_ENCODING; getLog().warn( "File encoding has not been set, using platform encoding " + templateEncoding @@ -804,7 +803,7 @@ protected List getJiraReleases() List issueList = jiraDownloader.getIssueList(); - if ( StringUtils.isNotEmpty( versionPrefix ) ) + if ( versionPrefix != null && !versionPrefix.isEmpty() ) { int originalNumberOfIssues = issueList.size(); issueList = IssueUtils.filterIssuesWithVersionPrefix( issueList, versionPrefix ); diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java b/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java index be3bd788..56fa1360 100644 --- a/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java +++ b/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java @@ -47,7 +47,6 @@ import org.apache.maven.shared.filtering.MavenFileFilterRequest; import org.apache.maven.shared.filtering.MavenFilteringException; import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.StringUtils; /** * Goal which creates a nicely formatted Changes Report in html format from a changes.xml file. @@ -334,14 +333,14 @@ public void executeReport( Locale locale ) report.setAddActionDate( addActionDate ); - if ( StringUtils.isEmpty( url ) ) + if ( url == null || url.isEmpty() ) { getLog().warn( "No issue management URL defined in POM. Links to your issues will not work correctly." ); } boolean feedGenerated = false; - if ( StringUtils.isNotEmpty( feedType ) ) + if ( feedType != null && !feedType.isEmpty() ) { feedGenerated = generateFeed( changesXml, locale ); } diff --git a/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java b/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java index c71e6bf1..a506940c 100644 --- a/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java @@ -22,7 +22,6 @@ import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributes; import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; -import org.codehaus.plexus.util.StringUtils; import java.util.ResourceBundle; @@ -80,7 +79,7 @@ protected void sinkBeginReport( Sink sink, ResourceBundle bundle ) sink.text( title ); sink.title_(); - if ( StringUtils.isNotEmpty( author ) ) + if ( author != null && !author.isEmpty() ) { sink.author(); sink.text( author ); diff --git a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java index 9483454d..0c91ef24 100644 --- a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java +++ b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java @@ -25,7 +25,6 @@ import org.apache.xmlrpc.client.XmlRpcClient; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory; -import org.codehaus.plexus.util.StringUtils; import java.net.MalformedURLException; import java.net.URL; @@ -123,7 +122,7 @@ public List getIssueList() // Fetch issues String qstr = ""; - if ( !StringUtils.isEmpty( query ) ) + if ( !(query == null || query.isEmpty()) ) { qstr = query; } From 7ae9addfb0903de5c4d575505711627072cb8c34 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 10 May 2023 23:21:35 +0100 Subject: [PATCH 2/2] Resolve likely checkstyle violations --- src/main/java/org/apache/maven/plugins/trac/TracDownloader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java index 0c91ef24..792b45a5 100644 --- a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java +++ b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java @@ -122,7 +122,7 @@ public List getIssueList() // Fetch issues String qstr = ""; - if ( !(query == null || query.isEmpty()) ) + if ( !( query == null || query.isEmpty() ) ) { qstr = query; }