Apply suggestions

PicnicSupermarket · Oct 26, 2022 · 13c862b · 13c862b
1 parent ee2470c
commit 13c862b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/...r-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CollectorMutability.java b/...r-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/CollectorMutability.java
@@ -51,7 +51,8 @@ public CollectorMutability() {}
 
   @Override
   public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    if (!ThirdPartyLibrary.GUAVA.canUse(state) || !COLLECTOR_METHOD.matches(tree, state)) {
+    if (!ThirdPartyLibrary.GUAVA.isIntroductionAllowed(state)
+        || !COLLECTOR_METHOD.matches(tree, state)) {
       return Description.NO_MATCH;
     }
 

diff --git a/...e-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ScheduledTransactionTrace.java b/...e-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/ScheduledTransactionTrace.java
@@ -52,7 +52,7 @@ public ScheduledTransactionTrace() {}
 
   @Override
   public Description matchMethod(MethodTree tree, VisitorState state) {
-    if (!ThirdPartyLibrary.NEW_RELIC_AGENT_API.canUse(state)
+    if (!ThirdPartyLibrary.NEW_RELIC_AGENT_API.isIntroductionAllowed(state)
         || !IS_SCHEDULED.matches(tree, state)) {
       return Description.NO_MATCH;
     }

diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StaticImport.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StaticImport.java
@@ -102,7 +102,8 @@ public final class StaticImport extends BugChecker implements MemberSelectTreeMa
           "org.springframework.http.MediaType",
           "org.testng.Assert",
           "reactor.function.TupleUtils",
-          "tech.picnic.errorprone.bugpatterns.util.MoreTypes");
+          "tech.picnic.errorprone.bugpatterns.util.MoreTypes",
+          "tech.picnic.errorprone.bugpatterns.util.ThirdPartyLibrary");
 
   /** Type members that should be statically imported. */
   @VisibleForTesting
@@ -189,7 +190,8 @@ public final class StaticImport extends BugChecker implements MemberSelectTreeMa
           "INSTANCE",
           "newBuilder",
           "of",
-          "valueOf");
+          "valueOf",
+          "values");
 
   /** Instantiates a new {@link StaticImport} instance. */
   public StaticImport() {}

diff --git a/...rone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/ThirdPartyLibrary.java b/...rone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/ThirdPartyLibrary.java
@@ -49,6 +49,12 @@ public enum ThirdPartyLibrary {
   @SuppressWarnings("ImmutableEnumChecker" /* Supplier is deterministic. */)
   private final Supplier<Boolean> canUse;
 
+  /**
+   * Instantiates a {@link ThirdPartyLibrary} enum value.
+   *
+   * @param witnessFqcn The fully-qualified class name of a type that is expected to be on the
+   *     classpath iff the associated third-party library is on the classpath.
+   */
   ThirdPartyLibrary(String witnessFqcn) {
     this.canUse = VisitorState.memoize(state -> canIntroduceUsage(witnessFqcn, state));
   }
@@ -60,7 +66,7 @@ public enum ThirdPartyLibrary {
    * @param state The context under consideration.
    * @return {@code true} iff it is okay to assume or create a dependency on this library.
    */
-  public boolean canUse(VisitorState state) {
+  public boolean isIntroductionAllowed(VisitorState state) {
     return canUse.get(state);
   }
 

diff --git a/...-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/ThirdPartyLibraryTest.java b/...-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/ThirdPartyLibraryTest.java
@@ -22,7 +22,7 @@ final class ThirdPartyLibraryTest {
       CompilationTestHelper.newInstance(TestChecker.class, getClass());
 
   @Test
-  void canUse() {
+  void isIntroductionAllowed() {
     compilationTestHelper
         .addSourceLines(
             "A.java",
@@ -32,7 +32,7 @@ void canUse() {
   }
 
   @Test
-  void canUseWitnessClassesInSymtab() {
+  void isIntroductionAllowedWitnessClassesInSymtab() {
     compilationTestHelper
         .addSourceLines(
             "A.java",
@@ -54,7 +54,7 @@ void canUseWitnessClassesInSymtab() {
   }
 
   @Test
-  void canUseWitnessClassesPartiallyOnClassPath() {
+  void isIntroductionAllowedWitnessClassesPartiallyOnClassPath() {
     compilationTestHelper
         .withClasspath(ImmutableList.class, Flux.class)
         .addSourceLines(
@@ -65,7 +65,7 @@ void canUseWitnessClassesPartiallyOnClassPath() {
   }
 
   @Test
-  void canUseWitnessClassesNotOnClassPath() {
+  void isIntroductionAllowedWitnessClassesNotOnClassPath() {
     compilationTestHelper
         .withClasspath()
         .addSourceLines(
@@ -78,7 +78,7 @@ void canUseWitnessClassesNotOnClassPath() {
 
   @ParameterizedTest
   @ValueSource(booleans = {true, false})
-  void canUseIgnoreClasspathCompat(boolean ignoreClassPath) {
+  void isIntroductionAllowedIgnoreClasspathCompat(boolean ignoreClassPath) {
     compilationTestHelper
         .setArgs("-XepOpt:ErrorProneSupport:IgnoreClasspathCompat=" + ignoreClassPath)
         .withClasspath(ImmutableList.class, Flux.class)
@@ -104,7 +104,10 @@ public Description matchClass(ClassTree tree, VisitorState state) {
       return buildDescription(tree)
           .setMessage(
               Arrays.stream(ThirdPartyLibrary.values())
-                  .map(lib -> String.join(": ", lib.name(), String.valueOf(lib.canUse(state))))
+                  .map(
+                      lib ->
+                          String.join(
+                              ": ", lib.name(), String.valueOf(lib.isIntroductionAllowed(state))))
                   .collect(joining(", ")))
           .build();
     }