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-shared-utils.git

commit 8de788788564713d5bdc0142e6b6b7a4e7bfecc8
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 00:00:48 2026 +0000

    Use System.lineSeparator(), @Override and try-with-resources
---
 .../maven/shared/utils/cli/CommandLineCallable.java     |  1 +
 .../org/apache/maven/shared/utils/cli/Commandline.java  |  5 +++++
 .../org/apache/maven/shared/utils/cli/StreamPumper.java |  1 +
 .../shared/utils/cli/javatool/AbstractJavaTool.java     |  4 ++++
 .../utils/cli/javatool/AbstractJavaToolRequest.java     |  4 ++++
 .../org/apache/maven/shared/utils/io/WalkCollector.java |  4 ++++
 .../maven/shared/utils/logging/AnsiMessageBuilder.java  | 17 +++++++++++++++++
 .../maven/shared/utils/logging/MessageBuilder.java      |  1 +
 .../maven/shared/utils/logging/PlainMessageBuilder.java | 17 +++++++++++++++++
 .../apache/maven/shared/utils/xml/XmlStreamReader.java  |  2 ++
 .../java/org/apache/maven/shared/utils/xml/Xpp3Dom.java |  4 ++++
 .../maven/shared/utils/io/DirectoryScannerTest.java     |  2 ++
 12 files changed, 62 insertions(+)

diff --git 
a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java 
b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java
index ae806f0..e2a302e 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java
@@ -29,5 +29,6 @@ public interface CommandLineCallable extends 
Callable<Integer> {
     /**
      * {@inheritDoc}
      */
+    @Override
     Integer call() throws CommandLineException;
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java 
b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index 9daf6e8..ff84d04 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -298,6 +298,7 @@ public class Commandline {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         return StringUtils.join(getShellCommandline(true), " ");
     }
@@ -418,6 +419,7 @@ public class Commandline {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void setValue(String value) {
             if (value != null) {
                 parts = new String[] {value};
@@ -427,6 +429,7 @@ public class Commandline {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void setLine(String line) throws CommandLineException {
             if (line == null) {
                 return;
@@ -437,6 +440,7 @@ public class Commandline {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void setFile(File value) {
             parts = new String[] {value.getAbsolutePath()};
         }
@@ -444,6 +448,7 @@ public class Commandline {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void setMask(boolean mask) {
             this.mask = mask;
         }
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java 
b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java
index 39d50c1..168db77 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java
@@ -68,6 +68,7 @@ public class StreamPumper extends AbstractStreamHandler {
     }
 
     /** Run it. */
+    @Override
     public void run() {
         try {
             for (String line = in.readLine(); line != null; line = 
in.readLine()) {
diff --git 
a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
 
b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
index 85beeac..5e0c9a6 100644
--- 
a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
+++ 
b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
@@ -83,6 +83,7 @@ public abstract class AbstractJavaTool<Request extends 
JavaToolRequest> implemen
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getJavaToolName() {
         return javaToolName;
     }
@@ -90,6 +91,7 @@ public abstract class AbstractJavaTool<Request extends 
JavaToolRequest> implemen
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setToolchain(Object toolchain) {
         this.toolchain = toolchain;
     }
@@ -97,6 +99,7 @@ public abstract class AbstractJavaTool<Request extends 
JavaToolRequest> implemen
     /**
      * {@inheritDoc}
      */
+    @Override
     public JavaToolResult execute(Request request) throws JavaToolException {
 
         if (javaToolFile == null) {
@@ -127,6 +130,7 @@ public abstract class AbstractJavaTool<Request extends 
JavaToolRequest> implemen
             /**
              * {@inheritDoc}
              */
+            @Override
             public int read() {
                 return -1;
             }
diff --git 
a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
 
b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
index e2bcce3..46ca90b 100644
--- 
a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
+++ 
b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
@@ -41,6 +41,7 @@ public class AbstractJavaToolRequest implements 
JavaToolRequest {
     /**
      * {@inheritDoc}
      */
+    @Override
     public StreamConsumer getSystemOutStreamConsumer() {
         return systemOutStreamConsumer;
     }
@@ -48,6 +49,7 @@ public class AbstractJavaToolRequest implements 
JavaToolRequest {
     /**
      * {@inheritDoc}
      */
+    @Override
     public StreamConsumer getSystemErrorStreamConsumer() {
         return systemErrorStreamConsumer;
     }
@@ -55,6 +57,7 @@ public class AbstractJavaToolRequest implements 
JavaToolRequest {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setSystemOutStreamConsumer(StreamConsumer 
systemOutStreamConsumer) {
         this.systemOutStreamConsumer = systemOutStreamConsumer;
     }
@@ -62,6 +65,7 @@ public class AbstractJavaToolRequest implements 
JavaToolRequest {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setSystemErrorStreamConsumer(StreamConsumer 
systemErrorStreamConsumer) {
         this.systemErrorStreamConsumer = systemErrorStreamConsumer;
     }
diff --git a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java 
b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java
index 508fb7c..c3bf3d7 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java
@@ -53,6 +53,7 @@ public class WalkCollector implements DirectoryWalkListener {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void debug(String message) {
         // can be used to set some message
     }
@@ -60,6 +61,7 @@ public class WalkCollector implements DirectoryWalkListener {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void directoryWalkStarting(File basedir) {
         startingDir = basedir;
         startCount++;
@@ -68,6 +70,7 @@ public class WalkCollector implements DirectoryWalkListener {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void directoryWalkStep(int percentage, File file) {
         steps.add(file);
         percentageLow = Math.min(percentageLow, percentage);
@@ -77,6 +80,7 @@ public class WalkCollector implements DirectoryWalkListener {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void directoryWalkFinished() {
         finishCount++;
     }
diff --git 
a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java 
b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
index 96dd35b..d39ee4a 100644
--- 
a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
+++ 
b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
@@ -49,82 +49,99 @@ class AnsiMessageBuilder implements MessageBuilder, 
LoggerLevelRenderer {
         this.ansi = ansi;
     }
 
+    @Override
     public String debug(String message) {
         return Style.DEBUG.apply(ansi).a(message).reset().toString();
     }
 
+    @Override
     public String info(String message) {
         return Style.INFO.apply(ansi).a(message).reset().toString();
     }
 
+    @Override
     public String warning(String message) {
         return Style.WARNING.apply(ansi).a(message).reset().toString();
     }
 
+    @Override
     public String error(String message) {
         return Style.ERROR.apply(ansi).a(message).reset().toString();
     }
 
+    @Override
     public AnsiMessageBuilder success(Object message) {
         Style.SUCCESS.apply(ansi).a(message).reset();
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder warning(Object message) {
         Style.WARNING.apply(ansi).a(message).reset();
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder failure(Object message) {
         Style.FAILURE.apply(ansi).a(message).reset();
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder strong(Object message) {
         Style.STRONG.apply(ansi).a(message).reset();
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder mojo(Object message) {
         Style.MOJO.apply(ansi).a(message).reset();
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder project(Object message) {
         Style.PROJECT.apply(ansi).a(message).reset();
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder a(char[] value, int offset, int len) {
         ansi.a(value, offset, len);
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder a(char[] value) {
         ansi.a(value);
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder a(CharSequence value, int start, int end) {
         ansi.a(value, start, end);
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder a(CharSequence value) {
         ansi.a(value);
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder a(Object value) {
         ansi.a(value);
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder newline() {
         ansi.newline();
         return this;
     }
 
+    @Override
     public AnsiMessageBuilder format(String pattern, Object... args) {
         ansi.format(pattern, args);
         return this;
diff --git 
a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java 
b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
index 63c368b..f7812f4 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
@@ -169,5 +169,6 @@ public interface MessageBuilder {
      * @deprecated Rather use {@link MessageBuilder#build()}
      */
     @Deprecated
+    @Override
     String toString();
 }
diff --git 
a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java 
b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
index a9b0b5c..906448a 100644
--- 
a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
+++ 
b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
@@ -42,76 +42,93 @@ class PlainMessageBuilder implements MessageBuilder, 
LoggerLevelRenderer {
         buffer = new StringBuilder(size);
     }
 
+    @Override
     public String debug(String message) {
         return a(message).toString();
     }
 
+    @Override
     public String info(String message) {
         return a(message).toString();
     }
 
+    @Override
     public String warning(String message) {
         return a(message).toString();
     }
 
+    @Override
     public String error(String message) {
         return a(message).toString();
     }
 
+    @Override
     public PlainMessageBuilder success(Object message) {
         return a(message);
     }
 
+    @Override
     public PlainMessageBuilder warning(Object message) {
         return a(message);
     }
 
+    @Override
     public PlainMessageBuilder failure(Object message) {
         return a(message);
     }
 
+    @Override
     public PlainMessageBuilder strong(Object message) {
         return a(message);
     }
 
+    @Override
     public PlainMessageBuilder mojo(Object message) {
         return a(message);
     }
 
+    @Override
     public PlainMessageBuilder project(Object message) {
         return a(message);
     }
 
+    @Override
     public PlainMessageBuilder a(char[] value, int offset, int len) {
         buffer.append(value, offset, len);
         return this;
     }
 
+    @Override
     public PlainMessageBuilder a(char[] value) {
         buffer.append(value);
         return this;
     }
 
+    @Override
     public PlainMessageBuilder a(CharSequence value, int start, int end) {
         buffer.append(value, start, end);
         return this;
     }
 
+    @Override
     public PlainMessageBuilder a(CharSequence value) {
         buffer.append(value);
         return this;
     }
 
+    @Override
     public PlainMessageBuilder a(Object value) {
         buffer.append(value);
         return this;
     }
 
+    @Override
     public PlainMessageBuilder newline() {
         buffer.append(System.lineSeparator());
         return this;
     }
 
+    @Override
     public PlainMessageBuilder format(String pattern, Object... args) {
         buffer.append(String.format(pattern, args));
         return this;
diff --git 
a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java 
b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
index fff26a0..90347f2 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
@@ -133,6 +133,7 @@ public class XmlStreamReader extends Reader {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int read(char[] buf, int offset, int len) throws IOException {
         return reader.read(buf, offset, len);
     }
@@ -140,6 +141,7 @@ public class XmlStreamReader extends Reader {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void close() throws IOException {
         reader.close();
     }
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java 
b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
index 5fda854..12bf4ad 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
@@ -316,6 +316,7 @@ public class Xpp3Dom implements Iterable<Xpp3Dom> {
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -336,6 +337,7 @@ public class Xpp3Dom implements Iterable<Xpp3Dom> {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int hashCode() {
         int result = 17;
         result = 37 * result + (name != null ? name.hashCode() : 0);
@@ -347,6 +349,7 @@ public class Xpp3Dom implements Iterable<Xpp3Dom> {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         try {
             StringWriter writer = new StringWriter();
@@ -405,6 +408,7 @@ public class Xpp3Dom implements Iterable<Xpp3Dom> {
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<Xpp3Dom> iterator() {
         return getChildrenList().iterator();
     }
diff --git 
a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java 
b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
index b040adc..2f02ce6 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
@@ -348,6 +348,7 @@ public class DirectoryScannerTest {
     private static class TestScanConductor implements ScanConductor {
         final List<String> visitedFiles = new ArrayList<>();
 
+        @Override
         public ScanConductor.ScanAction visitDirectory(String name, File 
directory) {
             assertTrue(directory.isDirectory());
 
@@ -358,6 +359,7 @@ public class DirectoryScannerTest {
             return ScanAction.CONTINUE;
         }
 
+        @Override
         public ScanConductor.ScanAction visitFile(String name, File file) {
             assertTrue(file.isFile());
             visitedFiles.add(name);

Reply via email to