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-doxia-converter.git
commit 5ab6f3f16648df4a512a6f8d06c41aa127591f59 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 01:55:04 2026 +0000 Simplify redundant code --- src/main/java/org/apache/maven/doxia/wrapper/AbstractFileWrapper.java | 2 +- src/main/java/org/apache/maven/doxia/wrapper/InputFileWrapper.java | 2 +- src/main/java/org/apache/maven/doxia/wrapper/InputReaderWrapper.java | 2 +- src/main/java/org/apache/maven/doxia/wrapper/OutputFileWrapper.java | 2 +- src/main/java/org/apache/maven/doxia/wrapper/OutputStreamWrapper.java | 2 +- src/test/java/org/apache/maven/doxia/ConverterTest.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/maven/doxia/wrapper/AbstractFileWrapper.java b/src/main/java/org/apache/maven/doxia/wrapper/AbstractFileWrapper.java index 2ad7776..a6e067a 100644 --- a/src/main/java/org/apache/maven/doxia/wrapper/AbstractFileWrapper.java +++ b/src/main/java/org/apache/maven/doxia/wrapper/AbstractFileWrapper.java @@ -63,7 +63,7 @@ abstract class AbstractFileWrapper { + "' is not a valid one. The supported charsets are: " + StringUtils.join(CharsetDetector.getAllDetectableCharsets(), ", ")); } - this.encoding = (encoding != null && !encoding.isEmpty()) ? encoding : AUTO_ENCODING; + this.encoding = encoding != null && !encoding.isEmpty() ? encoding : AUTO_ENCODING; } /** diff --git a/src/main/java/org/apache/maven/doxia/wrapper/InputFileWrapper.java b/src/main/java/org/apache/maven/doxia/wrapper/InputFileWrapper.java index 56912a4..9f7956e 100644 --- a/src/main/java/org/apache/maven/doxia/wrapper/InputFileWrapper.java +++ b/src/main/java/org/apache/maven/doxia/wrapper/InputFileWrapper.java @@ -29,7 +29,7 @@ import org.apache.maven.doxia.DefaultConverter; * * @author <a href="mailto:[email protected]">Vincent Siveton</a> */ -public class InputFileWrapper extends AbstractFileWrapper { +public final class InputFileWrapper extends AbstractFileWrapper { /** serialVersionUID */ static final long serialVersionUID = 6510443036267371188L; diff --git a/src/main/java/org/apache/maven/doxia/wrapper/InputReaderWrapper.java b/src/main/java/org/apache/maven/doxia/wrapper/InputReaderWrapper.java index 4b173d6..5a41217 100644 --- a/src/main/java/org/apache/maven/doxia/wrapper/InputReaderWrapper.java +++ b/src/main/java/org/apache/maven/doxia/wrapper/InputReaderWrapper.java @@ -27,7 +27,7 @@ import org.apache.maven.doxia.DefaultConverter; * * @author <a href="mailto:[email protected]">Vincent Siveton</a> */ -public class InputReaderWrapper { +public final class InputReaderWrapper { /** serialVersionUID */ static final long serialVersionUID = 3260213754615748766L; diff --git a/src/main/java/org/apache/maven/doxia/wrapper/OutputFileWrapper.java b/src/main/java/org/apache/maven/doxia/wrapper/OutputFileWrapper.java index fa7323e..3b50b2d 100644 --- a/src/main/java/org/apache/maven/doxia/wrapper/OutputFileWrapper.java +++ b/src/main/java/org/apache/maven/doxia/wrapper/OutputFileWrapper.java @@ -29,7 +29,7 @@ import org.apache.maven.doxia.DefaultConverter; * * @author <a href="mailto:[email protected]">Vincent Siveton</a> */ -public class OutputFileWrapper extends AbstractFileWrapper { +public final class OutputFileWrapper extends AbstractFileWrapper { /** serialVersionUID */ static final long serialVersionUID = 804499615902780116L; diff --git a/src/main/java/org/apache/maven/doxia/wrapper/OutputStreamWrapper.java b/src/main/java/org/apache/maven/doxia/wrapper/OutputStreamWrapper.java index 7790928..fe648b7 100644 --- a/src/main/java/org/apache/maven/doxia/wrapper/OutputStreamWrapper.java +++ b/src/main/java/org/apache/maven/doxia/wrapper/OutputStreamWrapper.java @@ -28,7 +28,7 @@ import org.apache.maven.doxia.DefaultConverter; * * @author <a href="mailto:[email protected]">Vincent Siveton</a> */ -public class OutputStreamWrapper { +public final class OutputStreamWrapper { /** serialVersionUID */ static final long serialVersionUID = 3329037527245430610L; diff --git a/src/test/java/org/apache/maven/doxia/ConverterTest.java b/src/test/java/org/apache/maven/doxia/ConverterTest.java index 4c51a34..66a03b5 100644 --- a/src/test/java/org/apache/maven/doxia/ConverterTest.java +++ b/src/test/java/org/apache/maven/doxia/ConverterTest.java @@ -453,13 +453,13 @@ class ConverterTest extends InjectedTest { Path expectedOut = new File(getBasedir() + "//src/test/resources/unit/markdown/macro.md").toPath(); try (ByteArrayOutputStream output = new ByteArrayOutputStream(); - Reader reader = Files.newBufferedReader(in, StandardCharsets.UTF_8); ) { + Reader reader = Files.newBufferedReader(in, StandardCharsets.UTF_8)) { converter.convert( InputReaderWrapper.valueOf(reader, DoxiaFormat.APT), OutputStreamWrapper.valueOf(output, DoxiaFormat.MARKDOWN, StandardCharsets.UTF_8.name())); try (BufferedReader outputReader = - new BufferedReader(new StringReader(new String(output.toByteArray(), StandardCharsets.UTF_8))); ) { + new BufferedReader(new StringReader(new String(output.toByteArray(), StandardCharsets.UTF_8)))) { assertLinesMatch(Files.readAllLines(expectedOut).stream(), outputReader.lines()); } }
