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 676b46253c0de2345410615b6ff8d3e66b9e43c9 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 07:28:10 2026 +0000 Simplify redundant code --- .../maven/report/projectinfo/DependencyConvergenceReport.java | 5 ++--- .../org/apache/maven/report/projectinfo/ModulesReport.java | 2 +- .../maven/report/projectinfo/PluginManagementReport.java | 3 +-- .../org/apache/maven/report/projectinfo/PluginsReport.java | 5 ++--- .../dependencies/SinkSerializingDependencyNodeVisitor.java | 2 +- .../dependencies/renderer/DependenciesRenderer.java | 10 +++++----- .../dependencies/renderer/DependencyManagementRenderer.java | 2 +- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java index 32042f4..8692b16 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -324,7 +323,7 @@ public class DependencyConvergenceReport extends AbstractProjectInfoReport { + depList.get(0).getDependency()); return; } - Collections.sort(projectNodes, new DependencyNodeComparator()); + projectNodes.sort(new DependencyNodeComparator()); for (DependencyNode projectNode : projectNodes) { if (isReactorBuild()) { @@ -544,7 +543,7 @@ public class DependencyConvergenceReport extends AbstractProjectInfoReport { } sink.nonBreakingSpace(); sink.bold(); - sink.text(String.valueOf(convergence) + " %"); + sink.text(convergence + " %"); sink.bold_(); sink.tableCell_(); sink.tableRow_(); diff --git a/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java b/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java index 793a62b..fde4c03 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java @@ -211,7 +211,7 @@ public class ModulesReport extends AbstractProjectInfoReport { } } final String moduleName = - (moduleProject.getName() == null) ? moduleProject.getArtifactId() : moduleProject.getName(); + moduleProject.getName() == null ? moduleProject.getArtifactId() : moduleProject.getName(); final String moduleHref = getRelativeLink(baseUrl, getDistMgmntSiteUrl(moduleProject), moduleProject.getArtifactId()); 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 abf2cd9..746a1c0 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java @@ -20,7 +20,6 @@ package org.apache.maven.report.projectinfo; import javax.inject.Inject; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -232,7 +231,7 @@ public class PluginManagementReport extends AbstractProjectInfoReport { startSection(getTitle()); // can't use straight artifact comparison because we want optional last - Collections.sort(pluginManagement, getPluginComparator()); + pluginManagement.sort(getPluginComparator()); startTable(); tableHeader(tableHeader); 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 a323454..e04b6f6 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java @@ -21,7 +21,6 @@ package org.apache.maven.report.projectinfo; import javax.inject.Inject; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -219,7 +218,7 @@ public class PluginsReport extends AbstractProjectInfoReport { return; } - Collections.sort(list, getPluginComparator()); + list.sort(getPluginComparator()); startTable(); tableHeader(tableHeader); @@ -279,7 +278,7 @@ public class PluginsReport extends AbstractProjectInfoReport { return new String[] {groupId, artifactId, version}; } - private static class GAV { + private static final class GAV { private final String groupId; private final String artifactId; private final String version; diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java index 3b9532e..dd50f47 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java +++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java @@ -155,7 +155,7 @@ public class SinkSerializingDependencyNodeVisitor implements DependencyNodeVisit } else { List<DependencyNode> siblings = parent.getChildren(); - last = (siblings.indexOf(node) == siblings.size() - 1); + last = siblings.indexOf(node) == siblings.size() - 1; } return last; 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 6086c42..ec48cec 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 @@ -305,7 +305,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { startSection(getI18nString("file.details.title")); List<Artifact> alldeps = dependencies.getAllDependencies(); - Collections.sort(alldeps, getArtifactComparator()); + alldeps.sort(getArtifactComparator()); resolveAtrifacts(alldeps); @@ -520,9 +520,9 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { boolean alreadyInsertedRowspanAttr = insertRowspanAttr && (SummaryTableRowOrder.COMPILE_SCOPE.ordinal() < i && i <= SummaryTableRowOrder.SYSTEM_SCOPE.ordinal()); - insertRowspanAttr = (SummaryTableRowOrder.COMPILE_SCOPE.ordinal() <= i - && i <= SummaryTableRowOrder.SYSTEM_SCOPE.ordinal()); - justification[column] = (insertRowspanAttr && alreadyInsertedRowspanAttr) + insertRowspanAttr = SummaryTableRowOrder.COMPILE_SCOPE.ordinal() <= i + && i <= SummaryTableRowOrder.SYSTEM_SCOPE.ordinal(); + justification[column] = insertRowspanAttr && alreadyInsertedRowspanAttr ? justification[column + 1] : Sink.JUSTIFY_CENTER; tableRowWithRowspan( @@ -662,7 +662,7 @@ public class DependenciesRenderer extends AbstractProjectInfoRenderer { String[] tableHeader = getDependencyTableHeader(withClassifier, withOptional); // can't use straight artifact comparison because we want optional last - Collections.sort(artifacts, getArtifactComparator()); + artifacts.sort(getArtifactComparator()); String anchorByScope = isTransitive ? getI18nString("transitive.title") + "_" + scope 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 b811a0f..8671b1a 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 @@ -182,7 +182,7 @@ public class DependencyManagementRenderer extends AbstractProjectInfoRenderer { private void renderDependenciesForScope(String scope, List<Dependency> artifacts) { if (artifacts != null) { // can't use straight artifact comparison because we want optional last - Collections.sort(artifacts, getDependencyComparator()); + artifacts.sort(getDependencyComparator()); startSection(scope);
