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-javadoc-plugin.git
commit d34ec37a37370d16fbe21c043e917ccc7e9ad60f Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 04:24:31 2026 +0000 Simplify redundant code --- .../apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 14 ++++++-------- .../org/apache/maven/plugins/javadoc/JavadocVersion.java | 2 +- .../org/apache/maven/plugins/javadoc/JavadocUtilTest.java | 3 ++- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 8338a324..4ad212db 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -1812,23 +1812,21 @@ public abstract class AbstractJavadocMojo extends AbstractMojo { * @return the charset attribute or the value of {@link #getDocencoding()} if <code>null</code>. */ private String getCharset() { - return (charset == null || charset.isEmpty()) ? getDocencoding() : charset; + return charset == null || charset.isEmpty() ? getDocencoding() : charset; } /** * @return the docencoding attribute or <code>UTF-8</code> if <code>null</code>. */ private String getDocencoding() { - return (docencoding == null || docencoding.isEmpty()) ? StandardCharsets.UTF_8.name() : docencoding; + return docencoding == null || docencoding.isEmpty() ? StandardCharsets.UTF_8.name() : docencoding; } /** * @return the encoding attribute or the value of <code>file.encoding</code> system property if <code>null</code>. */ private String getEncoding() { - return (encoding == null || encoding.isEmpty()) - ? Charset.defaultCharset().name() - : encoding; + return encoding == null || encoding.isEmpty() ? Charset.defaultCharset().name() : encoding; } @Override @@ -1995,7 +1993,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo { arguments.addAll(javadocArguments); arguments.addAll(standardDocletArguments); - if (arguments.size() > 0) { + if (!arguments.isEmpty()) { addCommandLineOptions(cmd, arguments, javadocOutputDirectory); } @@ -4623,7 +4621,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo { addArgIf(arguments, docfilessubdirs, "-docfilessubdirs"); - addArgIf(arguments, (doclint != null && !doclint.isEmpty()), "-Xdoclint:" + getDoclint()); + addArgIf(arguments, doclint != null && !doclint.isEmpty(), "-Xdoclint:" + getDoclint()); addArgIfNotEmpty(arguments, "-doctitle", JavadocUtil.quotedArgument(getDoctitle()), false, false); @@ -5911,7 +5909,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo { .map(String::trim) // we are expecting something such [groupdId:]artifactId so if no groupId we want to match any // groupId - .map(s -> !s.contains(":") ? ".*:" + s : s) + .map(s -> s.contains(":") ? s : ".*:" + s) .map(Pattern::compile) .collect(Collectors.toList()); } diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java index bc196080..7a6b4ab3 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocVersion.java @@ -30,7 +30,7 @@ package org.apache.maven.plugins.javadoc; * @deprecated Use {@link org.codehaus.plexus.languages.java.version.JavaVersion} instead */ @Deprecated -public class JavadocVersion implements Comparable<JavadocVersion> { +public final class JavadocVersion implements Comparable<JavadocVersion> { private String rawVersion; private JavadocVersion(String rawVersion) { diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java index 337788ef..f95f8e92 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java @@ -461,7 +461,8 @@ class JavadocUtilTest { */ @Test void testGetRedirectUrl() throws Exception { - Server server = null, redirectServer = null; + Server server = null; + Server redirectServer = null; try { redirectServer = new Server(0); redirectServer.setHandler(new AbstractHandler() {
