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-plugin-tools.git

commit dfdee1627c36212608ba3cc484ca5f0f93c47b23
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 03:46:15 2026 +0000

    Simplify redundant code
---
 .../plugin/report/PluginOverviewRenderer.java      | 21 +++++++++----
 .../plugin/plugin/report/RequirementsHistory.java  |  2 +-
 .../JavaAnnotationsMojoDescriptorExtractor.java    |  2 +-
 .../extractor/annotations/JavaSourceModel.java     |  3 +-
 .../annotations/converter/tag/LinkUtils.java       |  2 +-
 .../converter/JavaClassConverterContextTest.java   | 34 +++++++++++-----------
 .../converter/SimpleConverterContext.java          |  2 +-
 .../annotations/converter/tag/LinkUtilsTest.java   |  6 ++--
 .../tools/plugin/scanner/DefaultMojoScanner.java   |  3 +-
 .../tools/plugin/generator/GeneratorUtils.java     |  4 +--
 .../generator/PluginDescriptorFilesGenerator.java  |  4 +--
 .../plugin/generator/PluginHelpGenerator.java      |  2 +-
 12 files changed, 47 insertions(+), 38 deletions(-)

diff --git 
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
 
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
index 9d8d6f48..10adb0e3 100644
--- 
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
+++ 
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
@@ -75,7 +75,8 @@ class PluginOverviewRenderer extends 
AbstractPluginReportRenderer {
     protected void renderBody() {
         startSection(getTitle());
 
-        if (!(pluginDescriptor.getMojos() != null && 
pluginDescriptor.getMojos().size() > 0)) {
+        if (!(pluginDescriptor.getMojos() != null
+                && !pluginDescriptor.getMojos().isEmpty())) {
             paragraph(getI18nString("goals.nogoal"));
             endSection();
             return;
@@ -181,13 +182,13 @@ class PluginOverviewRenderer extends 
AbstractPluginReportRenderer {
         String maven = RequirementsHistory.discoverMavenRequirement(project, 
pluginDescriptor);
         sink.tableRow();
         tableCell(getI18nString("systemrequirements.maven"));
-        tableCell((maven != null ? maven : 
getI18nString("systemrequirements.nominimum")));
+        tableCell(maven != null ? maven : 
getI18nString("systemrequirements.nominimum"));
         sink.tableRow_();
 
         String jdk = RequirementsHistory.discoverJdkRequirement(project, 
pluginDescriptor);
         sink.tableRow();
         tableCell(getI18nString("systemrequirements.jdk"));
-        tableCell((jdk != null ? jdk : 
getI18nString("systemrequirements.nominimum")));
+        tableCell(jdk != null ? jdk : 
getI18nString("systemrequirements.nominimum"));
         sink.tableRow_();
 
         endTable();
@@ -258,7 +259,9 @@ class PluginOverviewRenderer extends 
AbstractPluginReportRenderer {
         sb.append("<project>").append(Markup.EOL);
         sb.append("  ...").append(Markup.EOL);
         sb.append("  <build>").append(Markup.EOL);
-        sb.append("    <!-- " + getI18nString("usage.pluginManagement") + " 
-->")
+        sb.append("    <!-- ")
+                .append(getI18nString("usage.pluginManagement"))
+                .append(" -->")
                 .append(Markup.EOL);
         sb.append("    <pluginManagement>").append(Markup.EOL);
         sb.append("      <plugins>").append(Markup.EOL);
@@ -282,7 +285,10 @@ class PluginOverviewRenderer extends 
AbstractPluginReportRenderer {
         sb.append("        ...").append(Markup.EOL);
         sb.append("      </plugins>").append(Markup.EOL);
         sb.append("    </pluginManagement>").append(Markup.EOL);
-        sb.append("    <!-- " + getI18nString("usage.plugins") + " 
-->").append(Markup.EOL);
+        sb.append("    <!-- ")
+                .append(getI18nString("usage.plugins"))
+                .append(" -->")
+                .append(Markup.EOL);
         sb.append("    <plugins>").append(Markup.EOL);
         sb.append("      <plugin>").append(Markup.EOL);
         sb.append("        <groupId>")
@@ -300,7 +306,10 @@ class PluginOverviewRenderer extends 
AbstractPluginReportRenderer {
 
         if (hasMavenReport) {
             sb.append("  ...").append(Markup.EOL);
-            sb.append("  <!-- " + getI18nString("usage.reporting") + " 
-->").append(Markup.EOL);
+            sb.append("  <!-- ")
+                    .append(getI18nString("usage.reporting"))
+                    .append(" -->")
+                    .append(Markup.EOL);
             sb.append("  <reporting>").append(Markup.EOL);
             sb.append("    <plugins>").append(Markup.EOL);
             sb.append("      <plugin>").append(Markup.EOL);
diff --git 
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
 
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
index 7fa60db5..63fa2f54 100644
--- 
a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
+++ 
b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java
@@ -138,7 +138,7 @@ public class RequirementsHistory {
         }
 
         if (jdk == null) {
-            String version = (compiler == null) ? null : compiler.getVersion();
+            String version = compiler == null ? null : compiler.getVersion();
 
             if (version != null) {
                 return "Default target for maven-compiler-plugin version " + 
version;
diff --git 
a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
 
b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
index c8ab3c42..17fdbdf6 100644
--- 
a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
+++ 
b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
@@ -734,7 +734,7 @@ public class JavaAnnotationsMojoDescriptorExtractor 
implements MojoDescriptorExt
                                     + "forbidden characters ${}: " + property,
                             null);
                 }
-                parameter.setExpression((property == null || 
property.isEmpty()) ? "" : "${" + property + "}");
+                parameter.setExpression(property == null || property.isEmpty() 
? "" : "${" + property + "}");
                 StringBuilder type = new 
StringBuilder(parameterAnnotationContent.getClassName());
                 if (!parameterAnnotationContent.getTypeParameters().isEmpty()) 
{
                     
type.append(parameterAnnotationContent.getTypeParameters().stream()
diff --git 
a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaSourceModel.java
 
b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaSourceModel.java
index 9be61619..b0abd92c 100644
--- 
a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaSourceModel.java
+++ 
b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaSourceModel.java
@@ -35,6 +35,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.jar.JarEntry;
@@ -172,7 +173,7 @@ public final class JavaSourceModel implements Closeable {
                     .map(directory::relativize)
                     .filter(path -> 
path.getFileName().toString().endsWith(".class"))
                     .map(Path::getParent)
-                    .filter(path -> path != null)
+                    .filter(Objects::nonNull)
                     .map(Path::toString)
                     .map(name -> name.replace(File.separatorChar, '.'))
                     .filter(name -> !name.isEmpty())
diff --git 
a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtils.java
 
b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtils.java
index d5ce0f20..4cac6f38 100644
--- 
a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtils.java
+++ 
b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtils.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Utility methods for dealing with links generated from Javadoc tags.
  */
-public class LinkUtils {
+public final class LinkUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(LinkUtils.class);
 
diff --git 
a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java
 
b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java
index 457060c5..2c5b0855 100644
--- 
a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java
+++ 
b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java
@@ -80,16 +80,16 @@ class JavaClassConverterContextTest {
         // test resolvable reference
         assertEquals(
                 new FullyQualifiedJavadocReference(currentPackageName, 
"OtherClass", false),
-                
context.resolveReference((JavadocReference.parse(OtherClass.class.getName()))));
+                
context.resolveReference(JavadocReference.parse(OtherClass.class.getName())));
 
         // already fully resolved class
         assertEquals(
                 new FullyQualifiedJavadocReference(currentPackageName, 
"OtherClass", false),
-                
context.resolveReference((JavadocReference.parse(OtherClass.class.getName()))));
+                
context.resolveReference(JavadocReference.parse(OtherClass.class.getName())));
         // already fully resolved package
         assertEquals(
                 new FullyQualifiedJavadocReference(currentPackageName, false),
-                
context.resolveReference((JavadocReference.parse(currentPackageName))));
+                
context.resolveReference(JavadocReference.parse(currentPackageName)));
 
         // Class from java's standard import "java.lang"
         assertEquals(
@@ -102,7 +102,7 @@ class JavaClassConverterContextTest {
                         
"org.apache.maven.tools.plugin.extractor.annotations.converter.test.other",
                         "OtherClassOtherPackage.EmbeddedEnum",
                         false),
-                
context.resolveReference((JavadocReference.parse("OtherClassOtherPackage.EmbeddedEnum"))));
+                
context.resolveReference(JavadocReference.parse("OtherClassOtherPackage.EmbeddedEnum")));
 
         // nested class from JDK
         assertEquals(
@@ -116,22 +116,22 @@ class JavaClassConverterContextTest {
         assertEquals(
                 new FullyQualifiedJavadocReference(
                         currentPackageName, "CurrentClass", "field1", 
MemberType.FIELD, false),
-                context.resolveReference((JavadocReference.parse("#field1"))));
+                context.resolveReference(JavadocReference.parse("#field1")));
         // field from super class
         assertEquals(
                 new FullyQualifiedJavadocReference(
                         currentPackageName, "SuperClass", "superField1", 
MemberType.FIELD, false),
-                
context.resolveReference((JavadocReference.parse("#superField1"))));
+                
context.resolveReference(JavadocReference.parse("#superField1")));
         // method
         assertEquals(
                 new FullyQualifiedJavadocReference(
                         currentPackageName, "CurrentClass", "noParamMethod()", 
MemberType.METHOD, false),
-                
context.resolveReference((JavadocReference.parse("#noParamMethod()"))));
+                
context.resolveReference(JavadocReference.parse("#noParamMethod()")));
         // method without parentheses
         assertEquals(
                 new FullyQualifiedJavadocReference(
                         currentPackageName, "CurrentClass", "noParamMethod()", 
MemberType.METHOD, false),
-                
context.resolveReference((JavadocReference.parse("#noParamMethod"))));
+                
context.resolveReference(JavadocReference.parse("#noParamMethod")));
 
         // method with unresolved java.lang argument
         assertEquals(
@@ -141,7 +141,7 @@ class JavaClassConverterContextTest {
                         "simpleParamMethod(java.lang.Integer)",
                         MemberType.METHOD,
                         false),
-                
context.resolveReference((JavadocReference.parse("#simpleParamMethod(Integer)"))));
+                
context.resolveReference(JavadocReference.parse("#simpleParamMethod(Integer)")));
 
         // method with unresolved java.lang argument with name
         assertEquals(
@@ -151,7 +151,7 @@ class JavaClassConverterContextTest {
                         "simpleParamMethod(java.lang.Integer)",
                         MemberType.METHOD,
                         false),
-                
context.resolveReference((JavadocReference.parse("#simpleParamMethod(Integer 
value)"))));
+                
context.resolveReference(JavadocReference.parse("#simpleParamMethod(Integer 
value)")));
 
         // method with primitive arguments
         assertEquals(
@@ -161,8 +161,8 @@ class JavaClassConverterContextTest {
                         
"complexParamMethod(int,org.apache.maven.tools.plugin.extractor.annotations.converter.test.other.OtherClassOtherPackage.EmbeddedEnum)",
                         MemberType.METHOD,
                         false),
-                context.resolveReference((JavadocReference.parse(
-                        "#complexParamMethod(int value1, 
OtherClassOtherPackage.EmbeddedEnum value2)"))));
+                context.resolveReference(JavadocReference.parse(
+                        "#complexParamMethod(int value1, 
OtherClassOtherPackage.EmbeddedEnum value2)")));
         // method with array arguments
         assertEquals(
                 new FullyQualifiedJavadocReference(
@@ -171,7 +171,7 @@ class JavaClassConverterContextTest {
                         "arrayParamMethod(int[],java.lang.String[][][])",
                         MemberType.METHOD,
                         false),
-                
context.resolveReference((JavadocReference.parse("#arrayParamMethod(int[], 
String[][][])"))));
+                
context.resolveReference(JavadocReference.parse("#arrayParamMethod(int[], 
String[][][])")));
 
         // method with generic arguments
         assertEquals(
@@ -181,19 +181,19 @@ class JavaClassConverterContextTest {
                         
"genericsParamMethod(java.util.Collection,java.util.function.BiConsumer)",
                         MemberType.METHOD,
                         false),
-                context.resolveReference((JavadocReference.parse(
-                        "#genericsParamMethod(Collection something, 
java.util.function.BiConsumer function)"))));
+                context.resolveReference(JavadocReference.parse(
+                        "#genericsParamMethod(Collection something, 
java.util.function.BiConsumer function)")));
 
         // method with unresolvable type
         assertThrows(
                 IllegalArgumentException.class,
                 () -> context.resolveReference(
-                        
(JavadocReference.parse("#genericsParamMethod(Collection something, BiConsumer 
function)"))));
+                        
JavadocReference.parse("#genericsParamMethod(Collection something, BiConsumer 
function)")));
         // constructor
         assertEquals(
                 new FullyQualifiedJavadocReference(
                         currentPackageName, "CurrentClass", "CurrentClass()", 
MemberType.CONSTRUCTOR, false),
-                
context.resolveReference((JavadocReference.parse("#CurrentClass()"))));
+                
context.resolveReference(JavadocReference.parse("#CurrentClass()")));
     }
 
     @Test
diff --git 
a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/SimpleConverterContext.java
 
b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/SimpleConverterContext.java
index 965ecc5d..b2c79c3a 100644
--- 
a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/SimpleConverterContext.java
+++ 
b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/SimpleConverterContext.java
@@ -50,7 +50,7 @@ public class SimpleConverterContext implements 
ConverterContext {
     public SimpleConverterContext(String packageName, URI javadocBaseUrl, 
JavadocReference... unresolvableReferences) {
         this(
                 packageName,
-                (ref) -> new JavadocLinkGenerator(javadocBaseUrl, 
"11").createLink(ref),
+                ref -> new JavadocLinkGenerator(javadocBaseUrl, 
"11").createLink(ref),
                 unresolvableReferences);
     }
 
diff --git 
a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java
 
b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java
index 8f5c25eb..7e58c8af 100644
--- 
a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java
+++ 
b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java
@@ -33,14 +33,14 @@ class LinkUtilsTest {
     @Test
     void createUnresolvableLink() {
         JavadocReference reference = JavadocReference.parse("Unresolvable");
-        ConverterContext context = new SimpleConverterContext("myPackage", 
(ref) -> URI.create(""), reference);
+        ConverterContext context = new SimpleConverterContext("myPackage", ref 
-> URI.create(""), reference);
         assertEquals(
                 "Unresolvable<!-- this link could not be resolved -->", 
LinkUtils.createLink("Unresolvable", context));
     }
 
     @Test
     void createLinkWithNoJavadoc() {
-        ConverterContext context = new SimpleConverterContext("myPackage", 
(ref) -> {
+        ConverterContext context = new SimpleConverterContext("myPackage", ref 
-> {
             throw new IllegalArgumentException("Could not get javadoc");
         });
         assertEquals(
@@ -60,7 +60,7 @@ class LinkUtilsTest {
                 "Missing<!-- this link could not be resolved -->",
                 LinkUtils.createLink("Missing", unresolvedReferenceContext));
 
-        ConverterContext unresolvedUrlContext = new 
SimpleConverterContext("myPackage", (ref) -> {
+        ConverterContext unresolvedUrlContext = new 
SimpleConverterContext("myPackage", ref -> {
             throw new UnsolvedSymbolException("MissingAncestor");
         });
         assertEquals(
diff --git 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
index 26467e95..9587613e 100644
--- 
a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
+++ 
b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -155,7 +154,7 @@ public class DefaultMojoScanner implements MojoScanner {
             orderedExtractors.add(extractor);
         }
 
-        Collections.sort(orderedExtractors, 
MojoDescriptorExtractorComparator.INSTANCE);
+        orderedExtractors.sort(MojoDescriptorExtractorComparator.INSTANCE);
 
         return orderedExtractors;
     }
diff --git 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
index 5a7fd89f..e99e1ac0 100644
--- 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
+++ 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java
@@ -210,7 +210,7 @@ public final class GeneratorUtils {
                     text = "<code>" + text + "</code>";
                 }
             }
-            matcher.appendReplacement(decoded, (text != null) ? 
quoteReplacement(text) : "");
+            matcher.appendReplacement(decoded, text != null ? 
quoteReplacement(text) : "");
         }
         matcher.appendTail(decoded);
 
@@ -482,7 +482,7 @@ public final class GeneratorUtils {
             if (impl.lastIndexOf('.') != -1) {
                 String name = impl.substring(0, impl.lastIndexOf('.'));
                 if (packageNames.get(name) != null) {
-                    int next = (packageNames.get(name)).intValue() + 1;
+                    int next = packageNames.get(name).intValue() + 1;
                     packageNames.put(name, Integer.valueOf(next));
                 } else {
                     packageNames.put(name, Integer.valueOf(1));
diff --git 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
index e1f6ffdc..bf3a6483 100644
--- 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
+++ 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
@@ -97,8 +97,8 @@ public class PluginDescriptorFilesGenerator implements 
Generator {
 
     private String getVersion() {
         Package p = this.getClass().getPackage();
-        String version = (p == null) ? null : p.getSpecificationVersion();
-        return (version == null) ? "SNAPSHOT" : version;
+        String version = p == null ? null : p.getSpecificationVersion();
+        return version == null ? "SNAPSHOT" : version;
     }
 
     public void writeDescriptor(File destinationFile, PluginToolsRequest 
request, DescriptorType type)
diff --git 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
index d79607f2..9e408812 100644
--- 
a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
+++ 
b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -139,7 +139,7 @@ public class PluginHelpGenerator {
      * @return The implementation.
      */
     private String getImplementation() {
-        return (helpPackageName == null || helpPackageName.isEmpty())
+        return helpPackageName == null || helpPackageName.isEmpty()
                 ? HELP_MOJO_CLASS_NAME
                 : helpPackageName + '.' + HELP_MOJO_CLASS_NAME;
     }

Reply via email to