This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit 33d1c1be619aa045b640735c71dcf1ed58fa4964 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 07:29:44 2026 +0000 Replace remaining StringUtils and Commons calls with the JDK --- .../report/projectinfo/DistributionManagementReport.java | 3 ++- .../maven/report/projectinfo/MailingListsReport.java | 13 +++++++------ .../maven/report/projectinfo/PluginManagementReport.java | 3 +-- .../apache/maven/report/projectinfo/PluginsReport.java | 5 +++-- .../maven/report/projectinfo/ProjectInfoReportUtils.java | 10 ++++++---- .../org/apache/maven/report/projectinfo/ScmReport.java | 4 ++-- .../apache/maven/report/projectinfo/SummaryReport.java | 4 ++-- .../org/apache/maven/report/projectinfo/TeamReport.java | 15 ++++++++------- .../report/projectinfo/dependencies/Dependencies.java | 3 +-- .../dependencies/renderer/DependenciesRenderer.java | 2 +- .../renderer/DependencyManagementRenderer.java | 4 ++-- 11 files changed, 35 insertions(+), 31 deletions(-) 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 b932940..2af03ee 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java @@ -126,7 +126,8 @@ public class DistributionManagementReport extends AbstractProjectInfoReport { startSection(getI18nString("overview.title")); paragraph(getI18nString("overview.intro")); - if (StringUtils.isNotEmpty(distributionManagement.getDownloadUrl())) { + if (distributionManagement.getDownloadUrl() != null + && !distributionManagement.getDownloadUrl().isEmpty()) { startSection(getI18nString("downloadURL")); internalLink(distributionManagement.getDownloadUrl()); endSection(); diff --git a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java index ae84ebd..366c968 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java @@ -34,7 +34,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.i18n.I18N; -import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositorySystem; /** @@ -162,25 +161,27 @@ public class MailingListsReport extends AbstractProjectInfoReport { for (MailingList mailingList : model.getMailingLists()) { List<String> textRow = new ArrayList<>(); - if (StringUtils.isNotEmpty(mailingList.getName())) { + if (mailingList.getName() != null && !mailingList.getName().isEmpty()) { textRow.add(mailingList.getName()); } else { textRow.add("-"); } - if (StringUtils.isNotEmpty(mailingList.getSubscribe())) { + if (mailingList.getSubscribe() != null + && !mailingList.getSubscribe().isEmpty()) { textRow.add(createURILinkPatternedText(subscribe, mailingList.getSubscribe())); } else { textRow.add("-"); } - if (StringUtils.isNotEmpty(mailingList.getUnsubscribe())) { + if (mailingList.getUnsubscribe() != null + && !mailingList.getUnsubscribe().isEmpty()) { textRow.add(createURILinkPatternedText(unsubscribe, mailingList.getUnsubscribe())); } else { textRow.add("-"); } - if (StringUtils.isNotEmpty(mailingList.getPost())) { + if (mailingList.getPost() != null && !mailingList.getPost().isEmpty()) { textRow.add(createURILinkPatternedText(post, mailingList.getPost())); } else { textRow.add("-"); @@ -263,7 +264,7 @@ public class MailingListsReport extends AbstractProjectInfoReport { try { URI hrefUri = URI.create(href); - if (StringUtils.isNotEmpty(hrefUri.getScheme())) { + if (hrefUri.getScheme() != null && !hrefUri.getScheme().isEmpty()) { return createLinkPatternedText(text, href); } else { return createLinkPatternedText(text, "mailto:" + href); diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java index 746a1c0..760691f 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java @@ -44,7 +44,6 @@ import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.reporting.MavenReportException; import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter; import org.codehaus.plexus.i18n.I18N; -import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositorySystem; /** @@ -242,7 +241,7 @@ public class PluginManagementReport extends AbstractProjectInfoReport { for (Plugin plugin : pluginManagement) { VersionRange versionRange; - if (StringUtils.isEmpty(plugin.getVersion())) { + if (plugin.getVersion() == null || plugin.getVersion().isEmpty()) { versionRange = VersionRange.createFromVersion(Artifact.RELEASE_VERSION); } else { versionRange = VersionRange.createFromVersion(plugin.getVersion()); diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java index e04b6f6..2f62a3c 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java @@ -44,7 +44,6 @@ import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.i18n.I18N; -import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositorySystem; /** @@ -286,7 +285,9 @@ public class PluginsReport extends AbstractProjectInfoReport { private GAV(Plugin plugin) { groupId = plugin.getGroupId(); artifactId = plugin.getArtifactId(); - version = StringUtils.isEmpty(plugin.getVersion()) ? Artifact.RELEASE_VERSION : plugin.getVersion(); + version = plugin.getVersion() == null || plugin.getVersion().isEmpty() + ? Artifact.RELEASE_VERSION + : plugin.getVersion(); } private GAV(ReportPlugin reportPlugin, MavenProject project) { 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 94b4645..e6ce840 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java +++ b/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java @@ -132,13 +132,15 @@ public class ProjectInfoReportUtils { p.setProperty(scheme + "proxySet", "true"); p.setProperty(scheme + "proxyHost", host); p.setProperty(scheme + "proxyPort", String.valueOf(proxy.getPort())); - if (!StringUtils.isEmpty(proxy.getNonProxyHosts())) { + if (!(proxy.getNonProxyHosts() == null + || proxy.getNonProxyHosts().isEmpty())) { p.setProperty(scheme + "nonProxyHosts", proxy.getNonProxyHosts()); } final String userName = proxy.getUsername(); if (!(userName == null || userName.isEmpty())) { - final String pwd = StringUtils.isEmpty(proxy.getPassword()) ? "" : proxy.getPassword(); + final String pwd = + proxy.getPassword() == null || proxy.getPassword().isEmpty() ? "" : proxy.getPassword(); Authenticator.setDefault(new Authenticator() { /** {@inheritDoc} */ @Override @@ -284,8 +286,8 @@ public class ProjectInfoReportUtils { } if (server != null - && StringUtils.isNotEmpty(server.getUsername()) - && StringUtils.isNotEmpty(server.getPassword())) { + && (server.getUsername() != null && !server.getUsername().isEmpty()) + && (server.getPassword() != null && !server.getPassword().isEmpty())) { String up = server.getUsername().trim() + ":" + server.getPassword().trim(); String upEncoded = new String(Base64.encodeBase64Chunked(up.getBytes())).trim(); 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 ead7e79..1e1a224 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java @@ -119,7 +119,7 @@ public class ScmReport extends AbstractProjectInfoReport { if (result && (anonymousConnection == null || anonymousConnection.isEmpty()) && (developerConnection == null || developerConnection.isEmpty()) - && StringUtils.isEmpty(scm.getUrl())) { + && (scm.getUrl() == null || scm.getUrl().isEmpty())) { result = false; } } @@ -238,7 +238,7 @@ public class ScmReport extends AbstractProjectInfoReport { if (scm == null || (anonymousConnection == null || anonymousConnection.isEmpty()) && (devConnection == null || devConnection.isEmpty()) - && StringUtils.isEmpty(scm.getUrl())) { + && (scm.getUrl() == null || scm.getUrl().isEmpty())) { startSection(getTitle()); paragraph(getI18nString("noscm")); 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 bb1dc70..f96104e 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java @@ -35,7 +35,6 @@ import org.apache.maven.project.ProjectBuilder; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.eclipse.aether.RepositorySystem; @@ -146,7 +145,8 @@ public class SummaryReport extends AbstractProjectInfoReport { // download section DistributionManagement distributionManagement = project.getDistributionManagement(); if (distributionManagement != null) { - if (StringUtils.isNotEmpty(distributionManagement.getDownloadUrl())) { + if (distributionManagement.getDownloadUrl() != null + && !distributionManagement.getDownloadUrl().isEmpty()) { startSection(getI18nString("download")); link(distributionManagement.getDownloadUrl(), distributionManagement.getDownloadUrl()); endSection(); 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 8aa1fd0..4dc30a0 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java @@ -494,30 +494,31 @@ public class TeamReport extends AbstractProjectInfoReport { for (Contributor unit : units) { if (unit instanceof Developer) { Developer developer = (Developer) unit; - if (StringUtils.isNotEmpty(developer.getId())) { + if (developer.getId() != null && !developer.getId().isEmpty()) { requiredHeaders.put(ID, Boolean.TRUE); } } - if (StringUtils.isNotEmpty(unit.getName())) { + if (unit.getName() != null && !unit.getName().isEmpty()) { requiredHeaders.put(NAME, Boolean.TRUE); } - if (StringUtils.isNotEmpty(unit.getEmail())) { + if (unit.getEmail() != null && !unit.getEmail().isEmpty()) { requiredHeaders.put(EMAIL, Boolean.TRUE); requiredHeaders.put(IMAGE, Boolean.TRUE); } - if (StringUtils.isNotEmpty(unit.getUrl())) { + if (unit.getUrl() != null && !unit.getUrl().isEmpty()) { requiredHeaders.put(URL, Boolean.TRUE); } - if (StringUtils.isNotEmpty(unit.getOrganization())) { + if (unit.getOrganization() != null && !unit.getOrganization().isEmpty()) { requiredHeaders.put(ORGANIZATION, Boolean.TRUE); } - if (StringUtils.isNotEmpty(unit.getOrganizationUrl())) { + if (unit.getOrganizationUrl() != null + && !unit.getOrganizationUrl().isEmpty()) { requiredHeaders.put(ORGANIZATION_URL, Boolean.TRUE); } if (!unit.getRoles().isEmpty()) { requiredHeaders.put(ROLES, Boolean.TRUE); } - if (StringUtils.isNotEmpty(unit.getTimezone())) { + if (unit.getTimezone() != null && !unit.getTimezone().isEmpty()) { requiredHeaders.put(TIME_ZONE, Boolean.TRUE); } Properties properties = unit.getProperties(); diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java index 29a913a..967c579 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java +++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java @@ -32,7 +32,6 @@ import org.apache.maven.shared.jar.JarAnalyzer; import org.apache.maven.shared.jar.JarData; import org.apache.maven.shared.jar.classes.JarClasses; import org.apache.maven.shared.jar.classes.JarClassesAnalysis; -import org.codehaus.plexus.util.StringUtils; /** * @since 2.1 @@ -276,7 +275,7 @@ public class Dependencies { if (file.isDirectory()) { // MPIR-322: if target/classes directory, try target/artifactId-version[-classifier].jar String filename = artifact.getArtifactId() + '-' + artifact.getVersion(); - if (StringUtils.isNotEmpty(artifact.getClassifier())) { + if (artifact.getClassifier() != null && !artifact.getClassifier().isEmpty()) { filename += '-' + artifact.getClassifier(); } filename += '.' + artifact.getType(); 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 ec48cec..703c95d 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 @@ -998,7 +998,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { */ private boolean hasClassifier(List<Artifact> artifacts) { for (Artifact artifact : artifacts) { - if (StringUtils.isNotEmpty(artifact.getClassifier())) { + if (artifact.getClassifier() != null && !artifact.getClassifier().isEmpty()) { return true; } } diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java index 8671b1a..6831611 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java +++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java @@ -46,7 +46,6 @@ import org.apache.maven.report.projectinfo.ProjectInfoReportUtils; import org.apache.maven.report.projectinfo.dependencies.ManagementDependencies; import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils; import org.codehaus.plexus.i18n.I18N; -import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; @@ -191,7 +190,8 @@ public class DependencyManagementRenderer extends AbstractProjectInfoRenderer { boolean hasClassifier = false; for (Dependency dependency : artifacts) { - if (StringUtils.isNotEmpty(dependency.getClassifier())) { + if (dependency.getClassifier() != null + && !dependency.getClassifier().isEmpty()) { hasClassifier = true; break; }
