Remove ProtoFieldPreconditionsCheckNotNull, as it is subsumed into

ProtoFieldNullComparison. MOE_MIGRATED_REVID=211590847
google · Sep 13, 2018 · 03200e9 · 03200e9
1 parent 722be59
commit 03200e9
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 372 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java b/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java
@@ -136,7 +136,6 @@ private static boolean isNull(ExpressionTree tree) {
   private final Matcher<ExpressionTree> protoReceiver;
   private final boolean trackAssignments;
   private final boolean matchListGetters;
-  private final boolean matchCheckNotNull;
   private final boolean matchTestAssertions;
 
   public ProtoFieldNullComparison(ErrorProneFlags flags) {
@@ -147,8 +146,6 @@ public ProtoFieldNullComparison(ErrorProneFlags flags) {
             : instanceMethod().onDescendantOf(PROTO_SUPER_CLASS);
     trackAssignments = flags.getBoolean("ProtoFieldNullComparison:TrackAssignments").orElse(false);
     matchListGetters = flags.getBoolean("ProtoFieldNullComparison:MatchListGetters").orElse(false);
-    matchCheckNotNull =
-        flags.getBoolean("ProtoFieldNullComparison:MatchCheckNotNull").orElse(false);
     matchTestAssertions =
         flags.getBoolean("ProtoFieldNullComparison:MatchTestAssertions").orElse(false);
   }
@@ -213,7 +210,7 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void unused) {
       VisitorState subState = state.withPath(getCurrentPath());
       ExpressionTree argument;
       ProblemUsage problemType;
-      if (matchCheckNotNull && CHECK_NOT_NULL.matches(node, subState)) {
+      if (CHECK_NOT_NULL.matches(node, subState)) {
         argument = node.getArguments().get(0);
         problemType = ProblemUsage.CHECK_NOT_NULL;
       } else if (matchTestAssertions && ASSERT_NOT_NULL.matches(node, subState)) {

diff --git a/.../src/main/java/com/google/errorprone/bugpatterns/ProtoFieldPreconditionsCheckNotNull.java b/.../src/main/java/com/google/errorprone/bugpatterns/ProtoFieldPreconditionsCheckNotNull.java
diff --git a/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java b/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java
@@ -200,7 +200,6 @@
 import com.google.errorprone.bugpatterns.PrivateConstructorForUtilityClass;
 import com.google.errorprone.bugpatterns.PrivateSecurityContractProtoAccess;
 import com.google.errorprone.bugpatterns.ProtoFieldNullComparison;
-import com.google.errorprone.bugpatterns.ProtoFieldPreconditionsCheckNotNull;
 import com.google.errorprone.bugpatterns.ProtoRedundantSet;
 import com.google.errorprone.bugpatterns.ProtoStringFieldReferenceEquality;
 import com.google.errorprone.bugpatterns.ProtocolBufferOrdinal;
@@ -593,7 +592,6 @@ public static ScannerSupplier errorChecks() {
           OverrideThrowableToString.class,
           ParameterName.class,
           PreconditionsInvalidPlaceholder.class,
-          ProtoFieldPreconditionsCheckNotNull.class,
           ProtoRedundantSet.class,
           QualifierOrScopeOnInjectMethod.class,
           ReachabilityFenceUsage.class,

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparisonTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparisonTest.java
@@ -320,10 +320,7 @@ public void preconditions() {
             "    TestFieldProtoMessage fieldCopy = requireNonNull(field);",
             "  }",
             "}")
-        .setArgs(
-            ImmutableList.of(
-                "-XepOpt:ProtoFieldNullComparison:TrackAssignments",
-                "-XepOpt:ProtoFieldNullComparison:MatchCheckNotNull"))
+        .setArgs(ImmutableList.of("-XepOpt:ProtoFieldNullComparison:TrackAssignments"))
         .doTest();
   }
 
@@ -351,27 +348,6 @@ public void assertions() {
         .doTest();
   }
 
-  @Test
-  public void preconditions_negative() {
-    compilationHelper
-        .addSourceLines(
-            "Test.java",
-            "import com.google.errorprone.bugpatterns.proto.ProtoTest.TestProtoMessage;",
-            "import com.google.errorprone.bugpatterns.proto.ProtoTest.TestFieldProtoMessage;",
-            "import java.util.List;",
-            "class Test {",
-            "  void test() {",
-            "    TestProtoMessage message = TestProtoMessage.newBuilder().build();",
-            "    TestFieldProtoMessage field = message.getMessage();",
-            "    Preconditions.checkNotNull(field);",
-            "  }",
-            "}",
-            "class Preconditions {",
-            "  static void checkNotNull(Object o) {}",
-            "}")
-        .doTest();
-  }
-
   @Test
   public void assertions_negative() {
     compilationHelper

diff --git a/.../test/java/com/google/errorprone/bugpatterns/ProtoFieldPreconditionsCheckNotNullTest.java b/.../test/java/com/google/errorprone/bugpatterns/ProtoFieldPreconditionsCheckNotNullTest.java
diff --git a/...gle/errorprone/bugpatterns/testdata/ProtoFieldPreconditionsCheckNotNullNegativeCases.java b/...gle/errorprone/bugpatterns/testdata/ProtoFieldPreconditionsCheckNotNullNegativeCases.java