You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2023/05/12 11:23:41 UTC
[maven-project-info-reports-plugin] branch master updated: refactor: Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#50)
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-project-info-reports-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 3cb4a73 refactor: Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#50)
3cb4a73 is described below
commit 3cb4a7392fec8be5cd0f820a4a683c5586715d8c
Author: Tim te Beek <ti...@gmail.com>
AuthorDate: Fri May 12 12:23:35 2023 +0100
refactor: Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#50)
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 <te...@moderne.io>
---
.../projectinfo/AbstractProjectInfoRenderer.java | 5 ++---
.../maven/report/projectinfo/CiManagementReport.java | 5 ++---
.../projectinfo/DistributionManagementReport.java | 4 ++--
.../report/projectinfo/IssueManagementReport.java | 5 ++---
.../maven/report/projectinfo/LicensesReport.java | 6 +++---
.../report/projectinfo/ProjectInfoReportUtils.java | 10 +++++-----
.../apache/maven/report/projectinfo/ScmReport.java | 20 ++++++++++----------
.../maven/report/projectinfo/SummaryReport.java | 2 +-
.../apache/maven/report/projectinfo/TeamReport.java | 6 +++---
.../dependencies/renderer/DependenciesRenderer.java | 14 +++++++-------
.../projectinfo/AbstractProjectInfoTestCase.java | 7 +++----
11 files changed, 40 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
index c490a56..12aaa68 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
@@ -24,7 +24,6 @@ import java.util.regex.Pattern;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.StringUtils;
/**
* @author Hervé Boutemy
@@ -78,7 +77,7 @@ public abstract class AbstractProjectInfoRenderer extends AbstractMavenReportRen
@Override
protected void text(String text) {
- if (StringUtils.isEmpty(text)) // Take care of spaces
+ if (text == null || text.isEmpty()) // Take care of spaces
{
sink.text("-");
} else {
@@ -112,7 +111,7 @@ public abstract class AbstractProjectInfoRenderer extends AbstractMavenReportRen
*/
@Override
protected void verbatimLink(String text, String href) {
- if (StringUtils.isEmpty(href)) {
+ if (href == null || href.isEmpty()) {
verbatimText(text);
} else {
sink.verbatim(null);
diff --git a/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
index 27ab650..be41b7f 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
@@ -30,7 +30,6 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Notifier;
import org.apache.maven.plugins.annotations.Mojo;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.StringUtils;
/**
* Generates the Project Continuous Integration Management report.
@@ -137,7 +136,7 @@ public class CiManagementReport extends AbstractProjectInfoReport {
// Access
startSection(getI18nString("access"));
- if (!StringUtils.isEmpty(url)) {
+ if (!(url == null || url.isEmpty())) {
paragraph(getI18nString("url"));
verbatimLink(url, url);
@@ -186,7 +185,7 @@ public class CiManagementReport extends AbstractProjectInfoReport {
* @return system description from properties
*/
private String getIntroForCiManagementSystem(String system) {
- if (StringUtils.isEmpty(system)) {
+ if (system == null || system.isEmpty()) {
return getI18nString("general.intro");
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java
index fdcb760..50f664a 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java
@@ -165,7 +165,7 @@ public class DistributionManagementReport extends AbstractProjectInfoReport {
}
private void internalLink(String url) {
- if (StringUtils.isEmpty(url)) {
+ if (url == null || url.isEmpty()) {
return;
}
@@ -178,7 +178,7 @@ public class DistributionManagementReport extends AbstractProjectInfoReport {
}
private String getRepoName(String name) {
- if (StringUtils.isNotEmpty(name)) {
+ if (name != null && !name.isEmpty()) {
return " - " + name;
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
index efb640c..2d1a4a5 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
@@ -25,7 +25,6 @@ import org.apache.maven.model.IssueManagement;
import org.apache.maven.model.Model;
import org.apache.maven.plugins.annotations.Mojo;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.StringUtils;
/**
* Generates the Project Issue Management report.
@@ -145,11 +144,11 @@ public class IssueManagementReport extends AbstractProjectInfoReport {
* @return true if the issue management system is Jira, bugzilla, false otherwise.
*/
private boolean isIssueManagementSystem(String system, String actual) {
- if (StringUtils.isEmpty(system)) {
+ if (system == null || system.isEmpty()) {
return false;
}
- if (StringUtils.isEmpty(actual)) {
+ if (actual == null || actual.isEmpty()) {
return false;
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java b/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
index 350cdc4..9c0c6bf 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
@@ -250,7 +250,7 @@ public class LicensesReport extends AbstractProjectInfoReport {
sink.list();
for (License license : licenses) {
String name = license.getName();
- if (StringUtils.isEmpty(name)) {
+ if (name == null || name.isEmpty()) {
name = getI18nString("unnamed");
}
@@ -264,7 +264,7 @@ public class LicensesReport extends AbstractProjectInfoReport {
for (License license : licenses) {
String name = license.getName();
- if (StringUtils.isEmpty(name)) {
+ if (name == null || name.isEmpty()) {
name = getI18nString("unnamed");
}
@@ -273,7 +273,7 @@ public class LicensesReport extends AbstractProjectInfoReport {
startSection(name);
- if (!StringUtils.isEmpty(comments)) {
+ if (!(comments == null || comments.isEmpty())) {
paragraph(comments);
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java b/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
index ed4400e..40c83d8 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
@@ -114,7 +114,7 @@ public class ProjectInfoReportUtils {
throws IOException {
String scheme = url.getProtocol();
- if (StringUtils.isEmpty(encoding)) {
+ if (encoding == null || encoding.isEmpty()) {
encoding = DEFAULT_ENCODING;
}
@@ -144,7 +144,7 @@ public class ProjectInfoReportUtils {
}
String host = proxy.getHost();
- if (!StringUtils.isEmpty(host)) {
+ if (!(host == null || host.isEmpty())) {
Properties p = System.getProperties();
p.setProperty(scheme + "proxySet", "true");
p.setProperty(scheme + "proxyHost", host);
@@ -154,7 +154,7 @@ public class ProjectInfoReportUtils {
}
final String userName = proxy.getUsername();
- if (!StringUtils.isEmpty(userName)) {
+ if (!(userName == null || userName.isEmpty())) {
final String pwd = StringUtils.isEmpty(proxy.getPassword()) ? "" : proxy.getPassword();
Authenticator.setDefault(new Authenticator() {
/** {@inheritDoc} */
@@ -225,7 +225,7 @@ public class ProjectInfoReportUtils {
* @see AbstractMavenReportRenderer#linkPatternedText(String)
*/
public static String getArtifactIdCell(String artifactId, String link) {
- if (StringUtils.isEmpty(link)) {
+ if (link == null || link.isEmpty()) {
return artifactId;
}
@@ -237,7 +237,7 @@ public class ProjectInfoReportUtils {
* @return <code>true</code> if the url is valid, <code>false</code> otherwise.
*/
public static boolean isArtifactUrlValid(String url) {
- if (StringUtils.isEmpty(url)) {
+ if (url == null || url.isEmpty()) {
return false;
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
index 53bbbc4..91a0ca0 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
@@ -110,8 +110,8 @@ public class ScmReport extends AbstractProjectInfoReport {
result = scm != null;
if (result
- && StringUtils.isEmpty(anonymousConnection)
- && StringUtils.isEmpty(developerConnection)
+ && (anonymousConnection == null || anonymousConnection.isEmpty())
+ && (developerConnection == null || developerConnection.isEmpty())
&& StringUtils.isEmpty(scm.getUrl())) {
result = false;
}
@@ -217,8 +217,8 @@ public class ScmReport extends AbstractProjectInfoReport {
public void renderBody() {
Scm scm = model.getScm();
if (scm == null
- || StringUtils.isEmpty(anonymousConnection)
- && StringUtils.isEmpty(devConnection)
+ || (anonymousConnection == null || anonymousConnection.isEmpty())
+ && (devConnection == null || devConnection.isEmpty())
&& StringUtils.isEmpty(scm.getUrl())) {
startSection(getTitle());
@@ -303,7 +303,7 @@ public class ScmReport extends AbstractProjectInfoReport {
private void renderWebAccessSection(String scmUrl) {
startSection(getI18nString("webaccess.title"));
- if (StringUtils.isEmpty(scmUrl)) {
+ if (scmUrl == null || scmUrl.isEmpty()) {
paragraph(getI18nString("webaccess.nourl"));
} else {
paragraph(getI18nString("webaccess.url"));
@@ -326,7 +326,7 @@ public class ScmReport extends AbstractProjectInfoReport {
if (isScmSystem(anonymousRepository, "clearcase")
|| isScmSystem(anonymousRepository, "perforce")
|| isScmSystem(anonymousRepository, "starteam")
- || StringUtils.isEmpty(anonymousConnection)) {
+ || (anonymousConnection == null || anonymousConnection.isEmpty())) {
return;
}
@@ -366,7 +366,7 @@ public class ScmReport extends AbstractProjectInfoReport {
* @param devRepository the dev repository
*/
private void renderDeveloperAccessSection(ScmRepository devRepository) {
- if (StringUtils.isEmpty(devConnection)) {
+ if (devConnection == null || devConnection.isEmpty()) {
return;
}
@@ -503,7 +503,7 @@ public class ScmReport extends AbstractProjectInfoReport {
url = url.substring(0, index + 4);
}
- boolean head = StringUtils.isEmpty(scmTag) || "HEAD".equals(scmTag);
+ boolean head = (scmTag == null || scmTag.isEmpty()) || "HEAD".equals(scmTag);
verbatimText("$ git clone " + (head ? "" : ("--branch " + scmTag + ' ')) + url);
}
@@ -747,7 +747,7 @@ public class ScmReport extends AbstractProjectInfoReport {
* @return a valid SCM repository or null
*/
public ScmRepository getScmRepository(String scmUrl) {
- if (StringUtils.isEmpty(scmUrl)) {
+ if (scmUrl == null || scmUrl.isEmpty()) {
return null;
}
@@ -814,7 +814,7 @@ public class ScmReport extends AbstractProjectInfoReport {
* @see <a href="http://svn.apache.org/repos/asf/maven/scm/trunk/maven-scm-providers/">maven-scm-providers</a>
*/
private static boolean isScmSystem(ScmRepository scmRepository, String scmProvider) {
- if (StringUtils.isEmpty(scmProvider)) {
+ if (scmProvider == null || scmProvider.isEmpty()) {
return false;
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
index e1c420e..7e78e51 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
@@ -170,7 +170,7 @@ public class SummaryReport extends AbstractProjectInfoReport {
sink.tableCell();
- if (StringUtils.isEmpty(cell)) {
+ if (cell == null || cell.isEmpty()) {
sink.text("-");
} else if (ctr == content.length - 1 && cell.length() > 0) {
sink.link(cell);
diff --git a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
index 1eefe5e..e5e4431 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
@@ -215,10 +215,10 @@ public class TeamReport extends AbstractProjectInfoReport {
if (headersMap.get(IMAGE) == Boolean.TRUE && showAvatarImages) {
Properties properties = member.getProperties();
String picUrl = properties.getProperty("picUrl");
- if (StringUtils.isEmpty(picUrl)) {
+ if (picUrl == null || picUrl.isEmpty()) {
picUrl = getGravatarUrl(member.getEmail());
}
- if (StringUtils.isEmpty(picUrl)) {
+ if (picUrl == null || picUrl.isEmpty()) {
picUrl = getSpacerGravatarUrl();
}
sink.tableCell();
@@ -498,7 +498,7 @@ public class TeamReport extends AbstractProjectInfoReport {
private void tableCellForUrl(String url) {
sink.tableCell();
- if (StringUtils.isEmpty(url)) {
+ if (url == null || url.isEmpty()) {
text(url);
} else {
link(url, url);
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index c846c84..380a049 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -695,9 +695,9 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
// can't use straight artifact comparison because we want optional last
Collections.sort(artifacts, getArtifactComparator());
- String anchorByScope = (isTransitive
+ String anchorByScope = isTransitive
? getI18nString("transitive.title") + "_" + scope
- : getI18nString("title") + "_" + scope);
+ : getI18nString("title") + "_" + scope;
startSection(scope, anchorByScope);
paragraph(getI18nString("intro." + scope));
@@ -861,14 +861,14 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
sink.bold();
sink.text(getI18nString("column.description") + ": ");
sink.bold_();
- if (StringUtils.isNotEmpty(artifactDescription)) {
+ if (artifactDescription != null && !artifactDescription.isEmpty()) {
sink.text(artifactDescription);
} else {
sink.text(getI18nString("index", "nodescription"));
}
sink.paragraph_();
- if (StringUtils.isNotEmpty(artifactUrl)) {
+ if (artifactUrl != null && !artifactUrl.isEmpty()) {
sink.paragraph();
sink.bold();
sink.text(getI18nString("column.url") + ": ");
@@ -896,7 +896,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
if (licenseMappings != null && licenseMappings.containsKey(licenseName)) {
licenseName = licenseMappings.get(licenseName);
}
- if (StringUtils.isEmpty(licenseName)) {
+ if (licenseName == null || licenseName.isEmpty()) {
licenseName = getI18nString("unnamed");
}
@@ -979,7 +979,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
private void printGroupedLicenses() {
for (Map.Entry<String, Object> entry : licenseMap.entrySet()) {
String licenseName = entry.getKey();
- if (StringUtils.isEmpty(licenseName)) {
+ if (licenseName == null || licenseName.isEmpty()) {
licenseName = getI18nString("unnamed");
}
@@ -1127,7 +1127,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer {
return result;
}
- result = super.format((float) fs / (1000), result, fieldPosition);
+ result = super.format((float) fs / 1000, result, fieldPosition);
result.append(" ").append(getString("report.dependencies.file.details.column.size.kb"));
return result;
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
index f115418..a7aa239 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -32,7 +32,6 @@ import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.report.projectinfo.stubs.DependencyArtifactStubFactory;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
@@ -89,7 +88,7 @@ public abstract class AbstractProjectInfoTestCase extends AbstractMojoTestCase {
* @return the string for the given key
*/
protected String getString(String key) {
- if (StringUtils.isEmpty(key)) {
+ if (key == null || key.isEmpty()) {
throw new IllegalArgumentException("The key cannot be empty");
}
@@ -105,11 +104,11 @@ public abstract class AbstractProjectInfoTestCase extends AbstractMojoTestCase {
* @since 2.8
*/
protected String prepareTitle(String name, String title) {
- if (StringUtils.isEmpty(name)) {
+ if (name == null || name.isEmpty()) {
throw new IllegalArgumentException("The name cannot be empty");
}
- if (StringUtils.isEmpty(title)) {
+ if (title == null || title.isEmpty()) {
throw new IllegalArgumentException("The title cannot be empty");
}