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-artifact-plugin.git
commit 6ed747dc8b05e75e8c9234a10682f812fe6b0859 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 05:19:21 2026 +0000 Simplify redundant code --- .../artifact/buildinfo/AbstractBuildinfoMojo.java | 12 ++++++++---- .../plugins/artifact/buildinfo/BuildInfoWriter.java | 2 +- .../plugins/artifact/buildinfo/CheckBuildPlanMojo.java | 2 +- .../maven/plugins/artifact/buildinfo/CompareMojo.java | 6 +++--- .../artifact/buildinfo/DescribeBuildOutputMojo.java | 6 +++--- .../artifact/buildinfo/ReferenceBuildinfoUtil.java | 2 +- .../NotReproduciblePluginsDocumentationTest.java | 16 +++++++++++----- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java index 84aca94..aa231f0 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/AbstractBuildinfoMojo.java @@ -197,7 +197,7 @@ public abstract class AbstractBuildinfoMojo extends AbstractMojo { String outputTimestamp, Log log, MavenProject project, MavenSession session, boolean diagnose) { Instant timestamp = MavenArchiver.parseBuildOutputTimestamp(outputTimestamp).orElse(null); - String effective = ((timestamp == null) ? "disabled" : DateTimeFormatter.ISO_INSTANT.format(timestamp)); + String effective = timestamp == null ? "disabled" : DateTimeFormatter.ISO_INSTANT.format(timestamp); if (diagnose) { diagnose(outputTimestamp, log, project, session, effective); @@ -254,7 +254,7 @@ public abstract class AbstractBuildinfoMojo extends AbstractMojo { + " reactor first = " + (first.equals(root) ? "executionRoot" : (first.getId() + " @ " + firstRelative)) + System.lineSeparator() - + " first.parent = " + ((firstParent == null) ? firstParent : firstParent.getId())); + + " first.parent = " + (firstParent == null ? firstParent : firstParent.getId())); if (firstParent != null && session.getProjects().contains(firstParent)) { // should not happen... log.warn("reactor first parent = " + firstParent.getId() + " is in reactor"); @@ -290,8 +290,12 @@ public abstract class AbstractBuildinfoMojo extends AbstractMojo { while (parent != null) { String parentProperty = parent.getProperties().getProperty("project.build.outputTimestamp"); sb.append(System.lineSeparator()); - sb.append(" - " + (session.getProjects().contains(parent) ? "reactor" : "external") + " parent " - + parent.getId() + " property = " + parentProperty); + sb.append(" - ") + .append(session.getProjects().contains(parent) ? "reactor" : "external") + .append(" parent ") + .append(parent.getId()) + .append(" property = ") + .append(parentProperty); if (!projectProperty.equals(parentProperty)) { break; } diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java index 7fc1015..e7bcec9 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java @@ -156,7 +156,7 @@ class BuildInfoWriter { if (index < 0) { index = javaVersion.indexOf('-'); // for example 17-ea } - return (index < 0) ? javaVersion : javaVersion.substring(0, index); + return index < 0 ? javaVersion : javaVersion.substring(0, index); } private void printSourceInformation(MavenProject project) { diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java index 59bfe8f..a376389 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CheckBuildPlanMojo.java @@ -210,7 +210,7 @@ public class CheckBuildPlanMojo extends AbstractMojo { } private Properties loadIssues() throws MojoExecutionException { - try (InputStream in = (pluginIssues == null) + try (InputStream in = pluginIssues == null ? getClass().getResourceAsStream("not-reproducible-plugins.properties") : Files.newInputStream(pluginIssues.toPath())) { Properties prop = new Properties(); diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java index 3cf96f7..b36e1b3 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/CompareMojo.java @@ -202,12 +202,12 @@ public class CompareMojo extends AbstractBuildinfoMojo { getLog().error("[Reproducible Builds] rebuild comparison result: " + MessageUtils.buffer().success(ok + " files match") + ", " + MessageUtils.buffer().failure(ko + " differ") - + ((missing == 0) ? "" : (", " + MessageUtils.buffer().failure(missing + " missing"))) - + ((ignored.isEmpty()) ? "" : (", " + MessageUtils.buffer().warning(ignored.size() + " ignored")))); + + (missing == 0 ? "" : (", " + MessageUtils.buffer().failure(missing + " missing"))) + + (ignored.isEmpty() ? "" : (", " + MessageUtils.buffer().warning(ignored.size() + " ignored")))); } else { getLog().info("[Reproducible Builds] rebuild comparison result: " + MessageUtils.buffer().success(ok + " files match") - + ((ignored.isEmpty()) ? "" : (", " + MessageUtils.buffer().warning(ignored.size() + " ignored")))); + + (ignored.isEmpty() ? "" : (", " + MessageUtils.buffer().warning(ignored.size() + " ignored")))); } // save .compare file diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DescribeBuildOutputMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DescribeBuildOutputMojo.java index 0765958..203f7b3 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DescribeBuildOutputMojo.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DescribeBuildOutputMojo.java @@ -71,7 +71,7 @@ public class DescribeBuildOutputMojo extends AbstractBuildinfoMojo { // super.execute(); // do not generate buildinfo, just reuse logic from abstract class Instant timestamp = MavenArchiver.parseBuildOutputTimestamp(outputTimestamp).orElse(null); - String effective = ((timestamp == null) ? "disabled" : DateTimeFormatter.ISO_INSTANT.format(timestamp)); + String effective = timestamp == null ? "disabled" : DateTimeFormatter.ISO_INSTANT.format(timestamp); diagnose(outputTimestamp, getLog(), project, session, effective); getLog().info(""); @@ -108,7 +108,7 @@ public class DescribeBuildOutputMojo extends AbstractBuildinfoMojo { .forEach(e -> getLog().info("parent in reactor: " + e.getKey().getGroupId() + ":" + e.getKey().getArtifactId() + " @ " + rootPath.relativize(e.getKey().getFile().toPath()) + " (" + e.getValue() + " module" - + ((e.getValue() > 1) ? "s" : "") + "), property = " + + (e.getValue() > 1 ? "s" : "") + "), property = " + e.getKey().getProperties().get("project.build.outputTimestamp"))); getLog().info(""); @@ -118,7 +118,7 @@ public class DescribeBuildOutputMojo extends AbstractBuildinfoMojo { groupIds.entrySet().stream() .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())) .forEach(e -> getLog().info("groupId: " + e.getKey() + " (" + e.getValue() + " artifactId" - + ((e.getValue() > 1) ? "s" : "") + ")")); + + (e.getValue() > 1 ? "s" : "") + ")")); Map<String, Set<String>> artifactIds = session.getProjects().stream() .collect(Collectors.groupingBy( diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java index 7ae03a4..38286e5 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java @@ -307,7 +307,7 @@ class ReferenceBuildinfoUtil { value = attr.getValue("Build-Jdk"); if (value != null) { - return String.valueOf(value) + " (from MANIFEST.MF Build-Jdk)"; + return value + " (from MANIFEST.MF Build-Jdk)"; } return null; diff --git a/src/test/java/org/apache/maven/plugins/artifact/buildinfo/NotReproduciblePluginsDocumentationTest.java b/src/test/java/org/apache/maven/plugins/artifact/buildinfo/NotReproduciblePluginsDocumentationTest.java index b6ab242..df53831 100644 --- a/src/test/java/org/apache/maven/plugins/artifact/buildinfo/NotReproduciblePluginsDocumentationTest.java +++ b/src/test/java/org/apache/maven/plugins/artifact/buildinfo/NotReproduciblePluginsDocumentationTest.java @@ -65,16 +65,22 @@ class NotReproduciblePluginsDocumentationTest { index = plugin.indexOf('+'); if (index < 0) { groupId = "org.apache.maven.plugins"; - sb.append("| org.apache.maven.plugins | {{{/plugins/" + plugin + "/}" + plugin + "}} "); + sb.append("| org.apache.maven.plugins | {{{/plugins/") + .append(plugin) + .append("/}") + .append(plugin) + .append("}} "); } else { groupId = plugin.substring(0, index); plugin = plugin.substring(index + 1); - sb.append("| " + groupId + " | " + plugin + " "); + sb.append("| ").append(groupId).append(" | ").append(plugin).append(" "); } if (status.startsWith("fail:")) { - sb.append("| - | no fixed release available, see {{{" + status.substring(5) + "}reference}}"); + sb.append("| - | no fixed release available, see {{{") + .append(status.substring(5)) + .append("}reference}}"); } else { - sb.append("| " + status + " | "); + sb.append("| ").append(status).append(" | "); } continue; } @@ -91,7 +97,7 @@ class NotReproduciblePluginsDocumentationTest { } else if (url.startsWith("https://github.com/")) { line = line.substring(19); } - sb.append("{{{" + url + "}" + line + "}}"); + sb.append("{{{").append(url).append("}").append(line).append("}}"); } else { sb.append(line); }
