Migrate lint check to new PSI API

Lint/build.gradle

@@ -11,7 +11,11 @@ configurations {
 }
 
 dependencies {
-    compile 'com.android.tools.lint:lint-api:25.1.3'
+    compile 'com.android.tools.lint:lint-api:25.2.0'
+    testCompile 'org.assertj:assertj-core:3.0.0'
+    testCompile 'com.android.tools.lint:lint:25.2.0'
+    testCompile 'com.android.tools.lint:lint-tests:25.2.0'
+    testCompile 'com.android.tools:testutils:25.2.0'
 
     lintChecks files(jar)
 }

Lint/src/main/java/com/braintreepayments/lint/BetaDetector.java

@@ -1,46 +1,36 @@
 package com.braintreepayments.lint;
 
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
 import com.android.tools.lint.detector.api.Category;
 import com.android.tools.lint.detector.api.Detector;
-import com.android.tools.lint.detector.api.Detector.JavaScanner;
 import com.android.tools.lint.detector.api.Implementation;
 import com.android.tools.lint.detector.api.Issue;
 import com.android.tools.lint.detector.api.JavaContext;
 import com.android.tools.lint.detector.api.Scope;
 import com.android.tools.lint.detector.api.Severity;
-import com.android.tools.lint.detector.api.Speed;
 import com.android.tools.lint.detector.api.TextFormat;
+import com.intellij.psi.JavaElementVisitor;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiMethodCallExpression;
 
 import java.util.Collections;
 import java.util.List;
 
-import lombok.ast.AstVisitor;
-import lombok.ast.MethodInvocation;
-import lombok.ast.Node;
-
-public class BetaDetector extends Detector implements JavaScanner {
-
-    private static final List<String> METHODS = Collections.emptyList();
+public class BetaDetector extends Detector implements Detector.JavaPsiScanner {
 
+    static List<String> METHODS = Collections.emptyList();
     private static final Implementation IMPLEMENTATION = new Implementation(BetaDetector.class,
             Scope.JAVA_FILE_SCOPE);
-
-    public static final Issue ISSUE = Issue.create(
+    static final Issue ISSUE = Issue.create(
             "com.braintreepayments.beta",
             "API is in beta",
-            "This API is currently in beta and subject to change. Braintree makes no guarantees about future compatibility or existence of this API.",
+            "This API is currently in beta and subject to change. Braintree makes no guarantees about " +
+                    "future compatibility or existence of this API.",
             Category.CORRECTNESS,
             6,
             Severity.ERROR,
             IMPLEMENTATION);
 
-    public BetaDetector() {}
-
-    @Override
-    public Speed getSpeed() {
-        return Speed.FAST;
+    public BetaDetector() {
     }
 
     @Override
@@ -49,35 +39,11 @@ public List<String> getApplicableMethodNames() {
     }
 
     @Override
-    public void visitMethod(@NonNull JavaContext context, @Nullable AstVisitor visitor,
-            @NonNull MethodInvocation node) {
-        if (METHODS.contains(node.astName().astValue())) {
-            context.report(ISSUE, node, context.getLocation(node), ISSUE.getBriefDescription(TextFormat.TEXT));
+    public void visitMethod(JavaContext context, JavaElementVisitor visitor,
+            PsiMethodCallExpression node, PsiMethod method) {
+        if (METHODS.contains(method.getName())) {
+            context.report(ISSUE, node, context.getLocation(node), ISSUE.getBriefDescription(
+                    TextFormat.TEXT));
         }
     }
-
-    @Override
-    public AstVisitor createJavaVisitor(@NonNull JavaContext context) {
-        return null;
-    }
-
-    @Override
-    public List<Class<? extends Node>> getApplicableNodeTypes() {
-        return null;
-    }
-
-    @Override
-    public boolean appliesToResourceRefs() {
-        return false;
-    }
-
-    @Override
-    public void visitResourceReference(@NonNull JavaContext context, @Nullable AstVisitor visitor,
-            @NonNull Node node, @NonNull String type, @NonNull String name, boolean isFramework) {
-    }
-
-    @Override
-    public List<String> applicableSuperClasses() {
-        return null;
-    }
 }

Lint/src/test/java/com/braintreepayments/lint/BetaDetectorTest.java

@@ -0,0 +1,65 @@
+package com.braintreepayments.lint;
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest;
+import com.android.tools.lint.detector.api.Detector;
+import com.android.tools.lint.detector.api.Issue;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class BetaDetectorTest extends LintDetectorTest {
+
+    @Override
+    protected Detector getDetector() {
+        return new BetaDetector();
+    }
+
+    @Override
+    protected List<Issue> getIssues() {
+        return Collections.singletonList(BetaDetector.ISSUE);
+    }
+
+    public void testBetaMethod() throws Exception {
+        BetaDetector.METHODS = Collections.singletonList("fooBar");
+        String result = lintProject(
+                java("src/com/example/Foo.java", "package com.example;\n" +
+                        "public class Foo {\n" +
+                        "  public void someMethod() {\n" +
+                        "    Baz baz = new Baz();\n" +
+                        "    baz.fooBar();" +
+                        "  }\n" +
+                        "}"),
+                java("src/com/example/Baz.java", "package com.example;\n" +
+                        "public class Baz {\n" +
+                        "  public void fooBar() {\n" +
+                        "  }\n" +
+                        "}"));
+
+        assertThat(result).isEqualTo(
+                "src/com/example/Foo.java:5: Error: API is in beta [com.braintreepayments.beta]\n" +
+                        "    baz.fooBar();  }\n" +
+                        "    ~~~~~~~~~~~~\n" +
+                        "1 errors, 0 warnings\n");
+    }
+
+    public void testNormalMethod() throws Exception {
+        BetaDetector.METHODS = Collections.singletonList("fooBar");
+        String result = lintProject(
+                java("src/com/example/Foo.java", "package com.example;\n" +
+                        "public class Foo {\n" +
+                        "  public void someMethod() {\n" +
+                        "    Baz baz = new Baz();\n" +
+                        "    baz.fooBarBaz();" +
+                        "  }\n" +
+                        "}"),
+                java("src/com/example/Baz.java", "package com.example;\n" +
+                        "public class Baz {\n" +
+                        "  public void fooBarBaz() {\n" +
+                        "  }\n" +
+                        "}"));
+
+        assertThat(result).isEqualTo("No warnings.");
+    }
+}