EqualsAvoidsNull

Author: Vincent Potucek

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java

@@ -31,7 +31,7 @@ public String getMessage() {
 
         @Override
         public Object visit(ASTUserClass clazz, Object ctx) {
-            if (clazz.getSimpleName().equalsIgnoreCase("bar")) {
+            if ("bar".equalsIgnoreCase(clazz.getSimpleName())) {
                 asCtx(ctx).addViolation(clazz);
             }
             return super.visit(clazz, ctx);

pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java

@@ -104,7 +104,7 @@ public static class Handler extends AbstractPmdLanguageVersionHandler {
         @Override
         public Parser getParser() {
             return task -> {
-                if (task.getLanguageVersion().getVersion().equals(PARSER_THROWS)) {
+                if (PARSER_THROWS.equals(task.getLanguageVersion().getVersion())) {
                     throw new ParseException("ohio");
                 }
                 return readLispNode(task);

pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/internal/NodeStreamBlanketTest.java

@@ -236,7 +236,7 @@ static Collection<NodeStream<?>> allNodeStreamVariants() {
                 stream.precedingSiblings(),
                 stream.descendantsOrSelf(),
                 stream.children(),
-                stream.children().filter(c -> c.getImage().equals("0")),
+                stream.children().filter(c -> "0".equals(c.getImage())),
                 stream.children(DummyNode.class)
             )
         ).flatMap(

pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/internal/LatticeRelationTest.java

@@ -207,7 +207,7 @@ void testFilterOnChain() {
     void testTransitiveSucc() {
 
         LatticeRelation<String, String, Set<String>> lattice =
-            stringLattice(s -> s.equals("c") || s.equals("bc"));
+            stringLattice(s -> "c".equals(s) || "bc".equals(s));
 
         lattice.put("abc", "val");
         lattice.put("bc", "v2");

pmd-core/src/test/java/net/sourceforge/pmd/util/IteratorUtilTest.java

@@ -149,7 +149,7 @@ void testFlatmapEmpty2() {
     void testFlatmapIsLazy() {
         Iterator<String> iter = iterOf("a", "b");
         Function<String, Iterator<String>> fun = s -> {
-            if (s.equals("a")) {
+            if ("a".equals(s)) {
                 return iterOf("a");
             } else {
                 throw new AssertionError("This statement shouldn't be reached");

pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java

@@ -130,7 +130,7 @@ void testRenderFilterAttributes() throws IOException {
         XmlRenderingConfig strategy = new XmlRenderingConfig() {
             @Override
             public boolean takeAttribute(Node node, Attribute attribute) {
-                return attribute.getName().equals("ohio");
+                return "ohio".equals(attribute.getName());
             }
         }.lineSeparator("\n");
 

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeDeclaration.java

@@ -4,11 +4,9 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
-import net.sourceforge.pmd.lang.ast.Node;
-
 /**
  * The declaration of an annotation type.
- * This is a {@linkplain Node#isFindBoundary() find boundary} for tree traversal methods.
+ * This is a {@linkplain net.sourceforge.pmd.lang.ast.Node#isFindBoundary() find boundary} for tree traversal methods.
  *
  * <p>Note that in contrast to interface types, no {@linkplain ASTExtendsList extends clause}
  * is permitted, and an annotation type cannot be generic.

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/stringtostring/User.java

@@ -4,15 +4,9 @@
 
 package net.sourceforge.pmd.lang.java.rule.performance.stringtostring;
 
-import java.util.Locale;
-
 public class User {
 
     public String getName() {
         return "username";
     }
-
-    private String convert(String s) {
-        return s.toLowerCase(Locale.ROOT);
-    }
 }

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/internal/TypeAnnotTestUtil.java

@@ -84,13 +84,13 @@ public static <A extends Annotation> A createAnnotationInstance(Class<A> annotat
     @SuppressWarnings("unchecked")
     public static <A extends Annotation> A createAnnotationInstance(Class<A> annotationClass, Map<String, Object> attributes) {
         return (A) Proxy.newProxyInstance(annotationClass.getClassLoader(), new Class[] { annotationClass }, (proxy, method, args) -> {
-            if (method.getName().equals("annotationType") && args == null) {
+            if ("annotationType".equals(method.getName()) && args == null) {
                 return annotationClass;
-            } else if (method.getName().equals("toString") && args == null) {
+            } else if ("toString".equals(method.getName()) && args == null) {
                 return AnnotationUtils.toString((Annotation) proxy);
-            } else if (method.getName().equals("hashCode") && args == null) {
+            } else if ("hashCode".equals(method.getName()) && args == null) {
                 return AnnotationUtils.hashCode((Annotation) proxy);
-            } else if (method.getName().equals("equals") && args.length == 1) {
+            } else if ("equals".equals(method.getName()) && args.length == 1) {
                 if (args[0] instanceof Annotation) {
                     return AnnotationUtils.equals((Annotation) proxy, (Annotation) args[0]);
                 }

pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/InfiniteLoopInLookahead.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-import java.util.*;
+import java.util.List;
 
 public class InfiniteLoopInLookahead {