[MNG-7416] Simplify Boolean expressions and returns (#227)

timtebeek · TeamModerne · web-flow · commit b7138b0a7744 · 2023-09-26T14:14:24.000Z
Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/SEvWu02zw?organizationId=QXBhY2hlIE1hdmVu Co-authored-by: Moderne <team@moderne.io>
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/ParameterAnnotationContent.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/ParameterAnnotationContent.java
@@ -208,11 +208,7 @@ public boolean equals(Object o) {
         if (!Objects.equals(defaultValue, that.defaultValue)) {
             return false;
         }
-        if (!Objects.equals(property, that.property)) {
-            return false;
-        }
-
-        return true;
+        return Objects.equals(property, that.property);
     }
 
     @Override
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java
@@ -86,7 +86,7 @@ public List<MojoFieldVisitor> findFieldWithAnnotation(Class<?> annotation) {
     }
 
     public List<MojoFieldVisitor> findFieldWithAnnotation(Set<String> annotationClassNames) {
-        List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<MojoFieldVisitor>();
+        List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<>();
 
         for (MojoFieldVisitor mojoFieldVisitor : this.fieldVisitors) {
             Map<String, MojoAnnotationVisitor> filedVisitorMap = mojoFieldVisitor.getAnnotationVisitorMap();
diff --git a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java
@@ -510,7 +510,7 @@ private Map<String, JavaField> extractFieldParameterTags(JavaClass javaClass) {
         if (superClass != null) {
             rawParams = extractFieldParameterTags(superClass);
         } else {
-            rawParams = new TreeMap<String, JavaField>();
+            rawParams = new TreeMap<>();
         }
 
         for (JavaField field : javaClass.getFields()) {
diff --git a/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java b/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
@@ -35,7 +35,6 @@
 import org.apache.maven.tools.plugin.generator.Generator;
 import org.apache.maven.tools.plugin.generator.PluginDescriptorFilesGenerator;
 import org.apache.maven.tools.plugin.util.PluginUtils;
-import org.codehaus.plexus.component.repository.ComponentDependency;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.util.FileUtils;
@@ -87,7 +86,7 @@ private PluginToolsRequest createRequest(String directory) {
 
         PluginDescriptor pluginDescriptor = new PluginDescriptor();
         pluginDescriptor.setGoalPrefix("test");
-        pluginDescriptor.setDependencies(new ArrayList<ComponentDependency>());
+        pluginDescriptor.setDependencies(new ArrayList<>());
 
         return new DefaultPluginToolsRequest(project, pluginDescriptor).setEncoding("UTF-8");
     }
diff --git a/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntPropertyHelper.java b/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntPropertyHelper.java
@@ -44,7 +44,7 @@ public class AntPropertyHelper extends PropertyHelper {
     private Log log;
     private ExpressionEvaluator exprEvaluator;
     private MavenProject mavenProject;
-    private Map<String, String> artifactMap = new HashMap<String, String>();
+    private Map<String, String> artifactMap = new HashMap<>();
 
     /**
      * @deprecated use the other constructor

Original file line number	Diff line number	Diff line change
`@@ -208,11 +208,7 @@ public boolean equals(Object o) {`
`208`	`208`	`if (!Objects.equals(defaultValue, that.defaultValue)) {`
`209`	`209`	`return false;`
`210`	`210`	`}`
`211`		`- if (!Objects.equals(property, that.property)) {`
`212`		`- return false;`
`213`		`- }`
`214`		`-`
`215`		`- return true;`
	`211`	`+ return Objects.equals(property, that.property);`
`216`	`212`	`}`
`217`	`213`
`218`	`214`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public List<MojoFieldVisitor> findFieldWithAnnotation(Class<?> annotation) {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public List<MojoFieldVisitor> findFieldWithAnnotation(Set<String> annotationClassNames) {`
`89`		`- List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<MojoFieldVisitor>();`
	`89`	`+ List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<>();`
`90`	`90`
`91`	`91`	`for (MojoFieldVisitor mojoFieldVisitor : this.fieldVisitors) {`
`92`	`92`	`Map<String, MojoAnnotationVisitor> filedVisitorMap = mojoFieldVisitor.getAnnotationVisitorMap();`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ private Map<String, JavaField> extractFieldParameterTags(JavaClass javaClass) {`
`510`	`510`	`if (superClass != null) {`
`511`	`511`	`rawParams = extractFieldParameterTags(superClass);`
`512`	`512`	`} else {`
`513`		`- rawParams = new TreeMap<String, JavaField>();`
	`513`	`+ rawParams = new TreeMap<>();`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`for (JavaField field : javaClass.getFields()) {`