From 7f5803fb6cd31923fedfe9b278620ff1e2bbf7c4 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 13 Aug 2025 06:13:59 -0400 Subject: [PATCH 1/3] Remove unneeded checks --- .../javadoc/AbstractFixJavadocMojo.java | 4 +- .../plugins/javadoc/AbstractJavadocMojo.java | 87 ++++++++----------- .../maven/plugins/javadoc/JavadocUtil.java | 18 ++-- .../plugins/javadoc/JavadocReportTest.java | 4 +- 4 files changed, 47 insertions(+), 66 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java index 999fb3092..9bca81786 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java @@ -1022,7 +1022,7 @@ private void takeCareSingleComment( String javadocComment = trimRight(extractOriginalJavadoc(originalContent, entity)); String extraComment = javadocComment.substring(javadocComment.indexOf(END_JAVADOC) + END_JAVADOC.length()); - if (extraComment != null && !extraComment.isEmpty()) { + if (!extraComment.isEmpty()) { if (extraComment.contains(EOL)) { stringWriter.write(extraComment.substring(extraComment.indexOf(EOL) + EOL.length())); } else { @@ -1882,7 +1882,7 @@ private void writeReturnTag( return; } - if ((originalJavadocTag != null && !originalJavadocTag.isEmpty()) + if (!originalJavadocTag.isEmpty() && javaMethod.getReturns() != null && !javaMethod.getReturns().isVoid()) { sb.append(originalJavadocTag); 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 8a191aef3..52279906c 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -2471,10 +2471,9 @@ private static List trimValues(List items) { List result = new ArrayList<>(items.size()); for (String item : items) { String trimmed = item.trim(); - if (trimmed == null || trimmed.isEmpty()) { - continue; + if (!trimmed.isEmpty()) { + result.add(trimmed); } - result.add(trimmed); } return result; } @@ -3657,7 +3656,7 @@ private void addArgIfNotEmpty( while (token.hasMoreTokens()) { String current = token.nextToken().trim(); - if (current != null && !current.isEmpty()) { + if (!current.isEmpty()) { arguments.add(current); if (token.hasMoreTokens() && repeatKey) { @@ -3890,9 +3889,6 @@ private synchronized void resolveDependencyBundles() throws IOException { if (dependencyJavadocBundles == null) { dependencyJavadocBundles = resourceResolver.resolveDependencyJavadocBundles(getDependencySourceResolverConfig()); - if (dependencyJavadocBundles == null) { - dependencyJavadocBundles = new ArrayList<>(); - } } } @@ -4932,45 +4928,38 @@ private void addTagletsFromTagletArtifacts(List arguments) throws MavenR tagletsPath = JavadocUtil.pruneFiles(tagletsPath); for (String tagletJar : tagletsPath) { - if (!tagletJar.toLowerCase(Locale.ENGLISH).endsWith(".jar")) { - continue; - } - - List tagletClasses; - try { - tagletClasses = JavadocUtil.getTagletClassNames(new File(tagletJar)); - } catch (IOException e) { - if (getLog().isWarnEnabled()) { - getLog().warn("Unable to auto-detect Taglet class names from '" + tagletJar - + "'. Try to specify them with ."); - } - if (getLog().isDebugEnabled()) { - getLog().debug("IOException: " + e.getMessage(), e); - } - continue; - } catch (ClassNotFoundException e) { - if (getLog().isWarnEnabled()) { - getLog().warn("Unable to auto-detect Taglet class names from '" + tagletJar - + "'. Try to specify them with ."); - } - if (getLog().isDebugEnabled()) { - getLog().debug("ClassNotFoundException: " + e.getMessage(), e); - } - continue; - } catch (NoClassDefFoundError e) { - if (getLog().isWarnEnabled()) { - getLog().warn("Unable to auto-detect Taglet class names from '" + tagletJar - + "'. Try to specify them with ."); - } - if (getLog().isDebugEnabled()) { - getLog().debug("NoClassDefFoundError: " + e.getMessage(), e); - } - continue; - } - - if (tagletClasses != null && !tagletClasses.isEmpty()) { - for (String tagletClass : tagletClasses) { - addArgIfNotEmpty(arguments, "-taglet", JavadocUtil.quotedArgument(tagletClass)); + if (tagletJar.toLowerCase(Locale.ENGLISH).endsWith(".jar")) { + try { + List tagletClasses = JavadocUtil.getTagletClassNames(new File(tagletJar)); + if (!tagletClasses.isEmpty()) { + for (String tagletClass : tagletClasses) { + addArgIfNotEmpty(arguments, "-taglet", JavadocUtil.quotedArgument(tagletClass)); + } + } + } catch (IOException e) { + if (getLog().isWarnEnabled()) { + getLog().warn("Unable to auto-detect Taglet class names from '" + tagletJar + + "'. Try to specify them with ."); + } + if (getLog().isDebugEnabled()) { + getLog().debug("IOException: " + e.getMessage(), e); + } + } catch (ClassNotFoundException e) { + if (getLog().isWarnEnabled()) { + getLog().warn("Unable to auto-detect Taglet class names from '" + tagletJar + + "'. Try to specify them with ."); + } + if (getLog().isDebugEnabled()) { + getLog().debug("ClassNotFoundException: " + e.getMessage(), e); + } + } catch (NoClassDefFoundError e) { + if (getLog().isWarnEnabled()) { + getLog().warn("Unable to auto-detect Taglet class names from '" + tagletJar + + "'. Try to specify them with ."); + } + if (getLog().isDebugEnabled()) { + getLog().debug("NoClassDefFoundError: " + e.getMessage(), e); + } } } } @@ -5074,7 +5063,7 @@ private void doExecuteJavadocCommandLine(Commandline cmd, File javadocOutputDire } writeDebugJavadocScript(cmdLine, javadocOutputDirectory); - if ((output != null && !output.isEmpty()) + if (output != null && StringUtils.isEmpty(err.getOutput()) && isJavadocVMInitError(output)) { throw new MavenReportException(output + '\n' + '\n' + JavadocUtil.ERROR_INIT_VM + '\n' @@ -5085,7 +5074,7 @@ && isJavadocVMInitError(output)) { + "' dir.\n"); } - if (output != null && !output.isEmpty()) { + if (output != null) { getLog().info(output); } @@ -5116,7 +5105,7 @@ && isJavadocVMInitError(output)) { throw new MavenReportException(msg.toString()); } - if (output != null && !output.isEmpty()) { + if (output != null) { getLog().info(output); } } catch (CommandLineException e) { diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java index 4d2723822..52efb591c 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -228,7 +228,7 @@ protected static String quotedArgument(String value) { List list = Arrays.stream(arg.split("\n")).map(String::trim).collect(Collectors.toList()); arg = String.join("", list); - if (arg != null && !arg.isEmpty()) { + if (!arg.isEmpty()) { arg = arg.replace("'", "\\'"); arg = "'" + arg + "'"; } @@ -814,9 +814,7 @@ protected static void invokeMaven( request.setProperties(properties); } File javaHome = getJavaHome(log); - if (javaHome != null) { - request.setJavaHome(javaHome); - } + request.setJavaHome(javaHome); if (log != null && log.isDebugEnabled()) { log.debug("Invoking Maven for the goals: " + goals + " with " @@ -1090,11 +1088,11 @@ private static File getJavaHome(Log log) { } } - if (javaHome == null || !javaHome.exists()) { + if (!javaHome.exists()) { javaHome = new File(javaHomeValue); } - if (javaHome == null || !javaHome.exists()) { + if (!javaHome.exists()) { if (log != null && log.isErrorEnabled()) { log.error("Cannot find Java application directory. Either specify 'java.home' system property, or " + "JAVA_HOME environment variable."); @@ -1452,12 +1450,8 @@ private static BufferedReader getReader(URL url, Settings settings) throws IOExc public void close() throws IOException { super.close(); - if (httpMethod != null) { - httpMethod.releaseConnection(); - } - if (httpClient != null) { - httpClient.close(); - } + httpMethod.releaseConnection(); + httpClient.close(); } }; } diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java index 3218221da..f2be6a73f 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -1033,9 +1033,7 @@ public void testProxy() throws Exception { // see comment above (line 829) // assertTrue( optionsContent.contains( "-link 'http://commons.apache.org/logging/apidocs'" ) ); } finally { - if (proxyServer != null) { - proxyServer.stop(); - } + proxyServer.stop(); } } From 94b6ea967c4c71af1f51ade1ebc27872c8ee6f0f Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 13 Aug 2025 06:27:24 -0400 Subject: [PATCH 2/3] spotless --- .../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 4 +--- 1 file changed, 1 insertion(+), 3 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 52279906c..2cad98087 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -5063,9 +5063,7 @@ private void doExecuteJavadocCommandLine(Commandline cmd, File javadocOutputDire } writeDebugJavadocScript(cmdLine, javadocOutputDirectory); - if (output != null - && StringUtils.isEmpty(err.getOutput()) - && isJavadocVMInitError(output)) { + if (output != null && StringUtils.isEmpty(err.getOutput()) && isJavadocVMInitError(output)) { throw new MavenReportException(output + '\n' + '\n' + JavadocUtil.ERROR_INIT_VM + '\n' + "Or, try to reduce the Java heap size for the Javadoc goal using " + "-Dminmemory= and -Dmaxmemory=." + '\n' + '\n' + "Command line was: " From ae3ba775bbd5d5b27afde4b3c5276c2f772f8b0e Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 13 Aug 2025 06:42:52 -0400 Subject: [PATCH 3/3] check --- src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java index 52efb591c..bed4944b1 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -1088,7 +1088,7 @@ private static File getJavaHome(Log log) { } } - if (!javaHome.exists()) { + if (javaHome == null || !javaHome.exists()) { javaHome = new File(javaHomeValue); }