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-wrapper.git
commit 0025b75d424268916dca804a03613d4e6bf2e33d Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 08:21:26 2026 +0000 Use System.lineSeparator(), @Override and try-with-resources --- .../org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java | 3 +++ .../maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java | 2 ++ .../src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java index c7bb359..7f338c0 100644 --- a/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java +++ b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java @@ -24,16 +24,19 @@ package org.apache.maven.wrapper.cli; * @param <T> type */ public abstract class AbstractCommandLineConverter<T> implements CommandLineConverter<T> { + @Override public T convert(Iterable<String> args) throws CommandLineArgumentException { CommandLineParser parser = new CommandLineParser(); configure(parser); return convert(parser.parse(args)); } + @Override public T convert(ParsedCommandLine args) throws CommandLineArgumentException { return convert(args, newInstance()); } + @Override public T convert(Iterable<String> args, T target) throws CommandLineArgumentException { CommandLineParser parser = new CommandLineParser(); configure(parser); diff --git a/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java index 9830c2c..914a9ad 100644 --- a/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java +++ b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java @@ -31,12 +31,14 @@ public abstract class AbstractPropertiesCommandLineConverter extends AbstractCom protected abstract String getPropertyOptionDescription(); + @Override public void configure(CommandLineParser parser) { CommandLineOption option = parser.option(getPropertyOption(), getPropertyOptionDetailed()); option = option.hasArguments(); option.hasDescription(getPropertyOptionDescription()); } + @Override protected Map<String, String> newInstance() { return new HashMap<>(); } diff --git a/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java index de76a52..1b314d7 100644 --- a/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java +++ b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java @@ -511,6 +511,7 @@ public class CommandLineParser { } private static final class OptionComparator implements Comparator<CommandLineOption> { + @Override public int compare(CommandLineOption option1, CommandLineOption option2) { String min1 = Collections.min(option1.getOptions(), new OptionStringComparator()); String min2 = Collections.min(option2.getOptions(), new OptionStringComparator()); @@ -519,6 +520,7 @@ public class CommandLineParser { } private static final class CaseInsensitiveStringComparator implements Comparator<String> { + @Override public int compare(String option1, String option2) { int diff = option1.compareToIgnoreCase(option2); if (diff != 0) { @@ -529,6 +531,7 @@ public class CommandLineParser { } private static final class OptionStringComparator implements Comparator<String> { + @Override public int compare(String option1, String option2) { boolean short1 = option1.length() == 1; boolean short2 = option2.length() == 1;
