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-invoker-plugin.git
commit 4585a8f64e1305f1b9a8a0429b2a871d6a84f485 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 06:27:56 2026 +0000 Simplify redundant code --- .../org/apache/maven/plugins/invoker/AbstractInvokerMojo.java | 10 +++++----- .../org/apache/maven/plugins/invoker/InvokerProperties.java | 2 +- .../apache/maven/plugins/invoker/InvokerReportRenderer.java | 6 +++--- .../java/org/apache/maven/plugins/invoker/ReportUtils.java | 3 +-- src/test/java/org/apache/maven/plugins/invoker/TestUtil.java | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java index fc62411..8245f4b 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java +++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java @@ -113,7 +113,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; * @since 15-Aug-2009 09:09:29 */ public abstract class AbstractInvokerMojo extends AbstractMojo { - private static final float ONE_SECOND = 1000.0f; + private static final float ONE_SECOND = 1000.0F; /** * The name of the user property used to select projects to run. @@ -833,7 +833,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { // Run setup jobs in single thread mode. // // Jobs are ordered according to ordinal value from invoker.properties - getLog().info("Running " + setupBuildJobs.size() + " setup job" + ((setupBuildJobs.size() < 2) ? "" : "s") + getLog().info("Running " + setupBuildJobs.size() + " setup job" + (setupBuildJobs.size() < 2 ? "" : "s") + ":"); runBuildsWithRetry(projectsDir, setupBuildJobs, 1); getLog().info("Setup done."); @@ -880,7 +880,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { do { if (executionCount > 0) { getLog().warn("Rerunning " + jobsToExecute.size() + " failed job" - + ((jobsToExecute.size() < 2) ? "" : "s")); + + (jobsToExecute.size() < 2 ? "" : "s")); } executionCount++; @@ -1268,7 +1268,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { */ private String getParentPath(String path) { int lastSep = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\')); - return (lastSep < 0) ? "." : path.substring(0, lastSep); + return lastSep < 0 ? "." : path.substring(0, lastSep); } /** @@ -1376,7 +1376,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo { } List<Path> folderGroup = new ArrayList<>(folderGroupSet); - Collections.sort(folderGroup); + folderGroup.sort(null); final Map<Path, Properties> globalInvokerProperties = new HashMap<>(); diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java index dff3956..352954f 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java +++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerProperties.java @@ -120,7 +120,7 @@ class InvokerProperties { * @param properties The invoker properties to wrap, may be <code>null</code> if none. */ InvokerProperties(Properties properties) { - this.properties = (properties != null) ? properties : new Properties(); + this.properties = properties != null ? properties : new Properties(); } /** diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerReportRenderer.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerReportRenderer.java index 3958a0a..528ce86 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/InvokerReportRenderer.java +++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerReportRenderer.java @@ -93,7 +93,7 @@ public class InvokerReportRenderer extends AbstractMavenReportRenderer { int totalSuccess = 0; int totalFailures = 0; int totalSkipped = 0; - float totalTime = 0.0f; + float totalTime = 0.0F; for (BuildJob buildJob : buildJobs) { switch (buildJob.getResult()) { @@ -114,8 +114,8 @@ public class InvokerReportRenderer extends AbstractMavenReportRenderer { Integer.toString(totalSuccess), Integer.toString(totalFailures), Integer.toString(totalSkipped), - (totalSuccess + totalFailures > 0) - ? formatI18nString("value.successrate", (totalSuccess / (float) (totalSuccess + totalFailures))) + totalSuccess + totalFailures > 0 + ? formatI18nString("value.successrate", totalSuccess / (float) (totalSuccess + totalFailures)) : "", formatI18nString("value.time", totalTime) }); diff --git a/src/main/java/org/apache/maven/plugins/invoker/ReportUtils.java b/src/main/java/org/apache/maven/plugins/invoker/ReportUtils.java index 49107f1..c0ba504 100644 --- a/src/main/java/org/apache/maven/plugins/invoker/ReportUtils.java +++ b/src/main/java/org/apache/maven/plugins/invoker/ReportUtils.java @@ -42,8 +42,7 @@ class ReportUtils { * @return The paths to the invoker reports, can be empty but never <code>null</code>. */ public static File[] getReportFiles(File reportsDirectory) { - File[] reportFiles = - (reportsDirectory != null) ? reportsDirectory.listFiles(new FileFilterOnlyXmlFile()) : null; + File[] reportFiles = reportsDirectory != null ? reportsDirectory.listFiles(new FileFilterOnlyXmlFile()) : null; if (reportFiles == null) { reportFiles = new File[0]; diff --git a/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java b/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java index 452b8ba..2f99846 100644 --- a/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java +++ b/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java @@ -22,7 +22,7 @@ import java.io.File; import org.codehaus.plexus.util.ReflectionUtils; -class TestUtil { +final class TestUtil { private TestUtil() {}
