Suggestions

PicnicSupermarket · Mar 27, 2023 · 9d8141e · 9d8141e
1 parent 4462c78
commit 9d8141e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/...r-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreASTHelpers.java b/...r-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreASTHelpers.java
@@ -1,7 +1,7 @@
 package tech.picnic.errorprone.bugpatterns.util;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.VisitorState;
@@ -27,7 +27,7 @@ private MoreASTHelpers() {}
    */
   public static ImmutableList<MethodTree> findMethods(CharSequence methodName, VisitorState state) {
     ClassTree clazz = state.findEnclosing(ClassTree.class);
-    requireNonNull(clazz, "Visited node is not enclosed by a class");
+    checkArgument(clazz != null, "Visited node is not enclosed by a class");
     return clazz.getMembers().stream()
         .filter(MethodTree.class::isInstance)
         .map(MethodTree.class::cast)

diff --git a/...-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/PreconditionsRules.java b/...-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/PreconditionsRules.java
@@ -88,7 +88,7 @@ T after(T object) {
     }
   }
 
-  /** Prefer {@link Objects#requireNonNull(Object)} over non-JDK alternatives. */
+  /** Prefer {@link Objects#requireNonNull(Object)} over more verbose alternatives. */
   static final class RequireNonNullStatement<T> {
     @BeforeTemplate
     void before(T object) {
@@ -97,11 +97,6 @@ void before(T object) {
       }
     }
 
-    @BeforeTemplate
-    void before2(T object) {
-      checkArgument(object != null);
-    }
-
     @AfterTemplate
     @UseImportPolicy(STATIC_IMPORT_ALWAYS)
     void after(T object) {
@@ -132,11 +127,6 @@ void before(T object, String message) {
       }
     }
 
-    @BeforeTemplate
-    void before2(T object, String message) {
-      checkArgument(object != null, message);
-    }
-
     @AfterTemplate
     @UseImportPolicy(STATIC_IMPORT_ALWAYS)
     void after(T object, String message) {

diff --git a/.../src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestInput.java b/.../src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestInput.java
@@ -1,6 +1,5 @@
 package tech.picnic.errorprone.refasterrules;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableSet;
@@ -39,7 +38,6 @@ void testRequireNonNullStatement() {
     if ("foo" == null) {
       throw new NullPointerException();
     }
-    checkArgument("bar" != null);
   }
 
   String testRequireNonNullWithMessage() {
@@ -50,7 +48,6 @@ void testRequireNonNullWithMessageStatement() {
     if ("foo" == null) {
       throw new NullPointerException("The string is null");
     }
-    checkArgument("bar" != null, "The string is null");
   }
 
   void testCheckPositionIndex() {

diff --git a/...src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestOutput.java b/...src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestOutput.java
@@ -35,7 +35,6 @@ String testRequireNonNull() {
 
   void testRequireNonNullStatement() {
     requireNonNull("foo");
-    requireNonNull("bar");
   }
 
   String testRequireNonNullWithMessage() {
@@ -44,7 +43,6 @@ String testRequireNonNullWithMessage() {
 
   void testRequireNonNullWithMessageStatement() {
     requireNonNull("foo", "The string is null");
-    requireNonNull("bar", "The string is null");
   }
 
   void testCheckPositionIndex() {