WS-6666 Apply error-prone suggestions

Author: dskop

error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ImplicitVarUsage.java

@@ -4,9 +4,6 @@
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
 import static com.google.errorprone.BugPattern.StandardTags.STYLE;
 import static com.google.errorprone.matchers.Description.NO_MATCH;
-import static com.google.errorprone.util.ASTHelpers.getSymbol;
-import static com.google.errorprone.util.ASTHelpers.getType;
-import static com.google.errorprone.util.ASTHelpers.hasImplicitType;
 import static javax.lang.model.element.ElementKind.LOCAL_VARIABLE;
 import static tech.picnic.errorprone.utils.Documentation.BUG_PATTERNS_BASE_URL;
 
@@ -18,6 +15,7 @@
 import com.google.errorprone.fixes.SuggestedFix;
 import com.google.errorprone.fixes.SuggestedFixes;
 import com.google.errorprone.matchers.Description;
+import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.TypeCastTree;
@@ -41,8 +39,8 @@ public ImplicitVarUsage() {}
   @Override
   public Description matchVariable(VariableTree variableTree, VisitorState visitorState) {
     // Only check local variables with implicit 'var' type
-    if (!getSymbol(variableTree).getKind().equals(LOCAL_VARIABLE)
-        || !hasImplicitType(variableTree, visitorState)) {
+    if (ASTHelpers.getSymbol(variableTree).getKind() != LOCAL_VARIABLE
+        || !ASTHelpers.hasImplicitType(variableTree, visitorState)) {
       return NO_MATCH;
     }
 
@@ -78,7 +76,7 @@ public Description matchVariable(VariableTree variableTree, VisitorState visitor
     }
 
     // Get the actual type for suggestion
-    Type type = getType(initializer);
+    Type type = ASTHelpers.getType(initializer);
     if (type == null) {
       return NO_MATCH;
     }

error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/ImplicitVarUsageTest.java

@@ -11,7 +11,7 @@ void testIdentification() {
         .addSourceLines(
             "Test.java",
             "import java.util.List;",
-            "import java.util.Optional;",
+            "",
             "class Test {",
             "  void test() {",
             "    // BUG: Diagnostic contains:",
@@ -32,8 +32,14 @@ void testIdentification() {
             "    // Should NOT be flagged - constructor reference",
             "    var constructorReference = getList().stream().map(String::new).findFirst();",
             "  }",
-            "  private List<String> getList() { return null; }",
-            "  private <T> T getForType(Class<T> clazz) { return null; }",
+            "",
+            "  private List<String> getList() {",
+            "    return null;",
+            "  }",
+            "",
+            "  private <T> T getForType(Class<T> clazz) {",
+            "    return null;",
+            "  }",
             "}")
         .doTest();
   }
@@ -44,24 +50,30 @@ void testRefactoring() {
         .addInputLines(
             "Test.java",
             "import java.util.List;",
-            "import java.util.Optional;",
+            "",
             "class Test {",
             "  void test() {",
             "    var methodCall = getList();",
             "    var chainedMethodCall = getList().stream().filter(s -> s.length() > 2).toList();",
             "  }",
-            "  private List<String> getList() { return null; }",
+            "",
+            "  private List<String> getList() {",
+            "    return null;",
+            "  }",
             "}")
         .addOutputLines(
             "Test.java",
             "import java.util.List;",
-            "import java.util.Optional;",
+            "",
             "class Test {",
             "  void test() {",
             "    List<String> methodCall = getList();",
             "    List<String> chainedMethodCall = getList().stream().filter(s -> s.length() > 2).toList();",
             "  }",
-            "  private List<String> getList() { return null; }",
+            "",
+            "  private List<String> getList() {",
+            "    return null;",
+            "  }",
             "}")
         .doTest();
   }