Extend UnnecessarilyFullyQualified BugPattern to remove the java.lang…

… qualifier
PicnicSupermarket · Sep 20, 2021 · cd5be4b · cd5be4b
1 parent b3ae95e
commit cd5be4b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualified.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualified.java
@@ -61,6 +61,7 @@
 public final class UnnecessarilyFullyQualified extends BugChecker
     implements CompilationUnitTreeMatcher {
 
+  private static final String JAVA_LANG = "java.lang";
   private static final ImmutableSet<String> EXEMPTED_NAMES = ImmutableSet.of("Annotation");
 
   @Override
@@ -169,12 +170,16 @@ public Void visitIdentifier(IdentifierTree identifierTree, Void aVoid) {
         continue;
       }
       List<TreePath> pathsToFix = getOnlyElement(types.values());
-      if (pathsToFix.stream()
-          .anyMatch(path -> findIdent(nameString, state.withPath(path), VAL_TYP) != null)) {
+      if (!pathsToFix.get(0).getLeaf().toString().contains(JAVA_LANG)
+          && pathsToFix.stream()
+              .anyMatch(path -> findIdent(nameString, state.withPath(path), VAL_TYP) != null)) {
         continue;
       }
       SuggestedFix.Builder fixBuilder = SuggestedFix.builder();
-      fixBuilder.addImport(getOnlyElement(types.keySet()).getQualifiedName().toString());
+      String newImport = getOnlyElement(types.keySet()).getQualifiedName().toString();
+      if (!newImport.contains(JAVA_LANG)) {
+        fixBuilder.addImport(newImport);
+      }
       for (TreePath path : pathsToFix) {
         fixBuilder.replace(path.getLeaf(), nameString);
       }

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualifiedTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/UnnecessarilyFullyQualifiedTest.java
@@ -27,6 +27,30 @@ public final class UnnecessarilyFullyQualifiedTest {
   private final BugCheckerRefactoringTestHelper helper =
       BugCheckerRefactoringTestHelper.newInstance(UnnecessarilyFullyQualified.class, getClass());
 
+  @Test
+  public void javaLang() {
+    helper
+        .addInputLines(
+            "Test.java",
+            "public class Test {",
+            "  @java.lang.Deprecated",
+            "  public java.lang.String foo(java.lang.String s) {",
+            "    java.lang.Integer i = 1;",
+            "    return s;",
+            "  }",
+            "}")
+        .addOutputLines(
+            "Test.java",
+            "public class Test {",
+            "  @Deprecated",
+            "  public String foo(String s) {",
+            "    Integer i = 1;",
+            "    return s;",
+            "  }",
+            "}")
+        .doTest();
+  }
+
   @Test
   public void singleUse() {
     helper