This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 95f00b1 [MNG-6829] Replace any StringUtils#isEmpty(String) and
#isNotEmpty(String) (#28)
95f00b1 is described below
commit 95f00b12adaabc923fcf16d787839fa98d8a66c6
Author: Tim te Beek <timteb...@gmail.com>
AuthorDate: Thu May 11 11:58:59 2023 +0100
[MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String)
(#28)
* [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 <t...@moderne.io>
* Resolve likely checkstyle violations
---------
Co-authored-by: Moderne <t...@moderne.io>
---
.../apache/maven/plugins/announcement/AnnouncementMailMojo.java | 3 +--
.../org/apache/maven/plugins/announcement/AnnouncementMojo.java | 7 +++----
src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java | 5 ++---
.../apache/maven/plugins/issues/AbstractIssuesReportGenerator.java | 3 +--
src/main/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 f29ded1..62267c8 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.MailMessage;
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 @@ public class AnnouncementMailMojo
{
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 a3a1197..ea5fe13 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.ResourceNotFoundException;
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 class AnnouncementMojo
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 class AnnouncementMojo
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 @@ public class AnnouncementMojo
List<Issue> 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 be3bd78..56fa136 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.MavenFileFilter;
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 class ChangesMojo
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 c71e6bf..a506940 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 @@ package org.apache.maven.plugins.issues;
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 @@ public abstract class AbstractIssuesReportGenerator
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 9483454..792b45a 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.XmlRpcException;
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 class TracDownloader
// Fetch issues
String qstr = "";
- if ( !StringUtils.isEmpty( query ) )
+ if ( !( query == null || query.isEmpty() ) )
{
qstr = query;
}
