Tweaks

PicnicSupermarket · Oct 25, 2022 · 79ee60b · 79ee60b
1 parent d181337
commit 79ee60b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreTypes.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreTypes.java
@@ -33,7 +33,7 @@ public final class MoreTypes {
   private MoreTypes() {}
 
   /**
-   * Creates a supplier of the type with the given fully qualified class name.
+   * Creates a supplier of the type with the given fully qualified name.
    *
    * <p>This method should only be used when building more complex types in combination with other
    * {@link MoreTypes} methods. In other cases prefer directly calling {@link
@@ -91,7 +91,7 @@ public static Supplier<Type> raw(Supplier<Type> type) {
    * @return A supplier which returns the described type if available in the given state, and {@code
    *     null} otherwise.
    */
-  public static Supplier<Type> supOf(Supplier<Type> type) {
+  public static Supplier<Type> superOf(Supplier<Type> type) {
     return propagateNull(
         type,
         (state, baseType) ->

diff --git a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/MoreTypesTest.java b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/util/MoreTypesTest.java
@@ -4,7 +4,7 @@
 import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.generic;
 import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.raw;
 import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.subOf;
-import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.supOf;
+import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.superOf;
 import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.type;
 import static tech.picnic.errorprone.bugpatterns.util.MoreTypes.unbound;
 
@@ -27,13 +27,16 @@
 final class MoreTypesTest {
   private static final ImmutableSet<Supplier<Type>> TYPES =
       ImmutableSet.of(
+          // Invalid types.
           type("java.lang.Nonexistent"),
+          generic(type("java.util.Integer"), unbound()),
+          // Valid types.
           type("java.lang.String"),
           type("java.lang.Number"),
-          supOf(type("java.lang.Number")),
+          superOf(type("java.lang.Number")),
           subOf(type("java.lang.Number")),
           type("java.lang.Integer"),
-          supOf(type("java.lang.Integer")),
+          superOf(type("java.lang.Integer")),
           subOf(type("java.lang.Integer")),
           type("java.util.Optional"),
           raw(type("java.util.Optional")),
@@ -43,24 +46,24 @@ final class MoreTypesTest {
           raw(type("java.util.Collection")),
           generic(type("java.util.Collection"), unbound()),
           generic(type("java.util.Collection"), type("java.lang.Number")),
-          generic(type("java.util.Collection"), supOf(type("java.lang.Number"))),
+          generic(type("java.util.Collection"), superOf(type("java.lang.Number"))),
           generic(type("java.util.Collection"), subOf(type("java.lang.Number"))),
           generic(type("java.util.Collection"), type("java.lang.Integer")),
-          generic(type("java.util.Collection"), supOf(type("java.lang.Integer"))),
+          generic(type("java.util.Collection"), superOf(type("java.lang.Integer"))),
           generic(type("java.util.Collection"), subOf(type("java.lang.Integer"))),
           type("java.util.List"),
           raw(type("java.util.List")),
           generic(type("java.util.List"), unbound()),
           generic(type("java.util.List"), type("java.lang.Number")),
-          generic(type("java.util.List"), supOf(type("java.lang.Number"))),
+          generic(type("java.util.List"), superOf(type("java.lang.Number"))),
           generic(type("java.util.List"), subOf(type("java.lang.Number"))),
           generic(type("java.util.List"), type("java.lang.Integer")),
-          generic(type("java.util.List"), supOf(type("java.lang.Integer"))),
+          generic(type("java.util.List"), superOf(type("java.lang.Integer"))),
           generic(type("java.util.List"), subOf(type("java.lang.Integer"))),
           generic(
               type("java.util.Map"),
               type("java.lang.String"),
-              subOf(generic(type("java.util.Collection"), supOf(type("java.lang.Short"))))));
+              subOf(generic(type("java.util.Collection"), superOf(type("java.lang.Short"))))));
 
   @Test
   void matcher() {