Remove type params from Multimap, ListMultimap, and SetMultimap asser…

…tThat() overloads. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=109803422
google · Dec 9, 2015 · f04d622 · f04d622
1 parent fe5a268
commit f04d622
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/core/src/main/java/com/google/common/truth/TestVerb.java b/core/src/main/java/com/google/common/truth/TestVerb.java
@@ -157,18 +157,15 @@ public MapSubject that(@Nullable Map<?, ?> target) {
     return new MapSubject(getFailureStrategy(), target);
   }
 
-  // TODO(b/26080262): Remove the <K, V> type params
+  public MultimapSubject that(@Nullable Multimap<?, ?> target) {
-  public <K, V> MultimapSubject that(@Nullable Multimap<K, V> target) {
     return new MultimapSubject(getFailureStrategy(), target);
   }
 
-  // TODO(b/26080262): Remove the <K, V> type params
+  public ListMultimapSubject that(@Nullable ListMultimap<?, ?> target) {
-  public <K, V> ListMultimapSubject that(@Nullable ListMultimap<K, V> target) {
     return new ListMultimapSubject(getFailureStrategy(), target);
   }
 
-  // TODO(b/26080262): Remove the <K, V> type params
+  public SetMultimapSubject that(@Nullable SetMultimap<?, ?> target) {
-  public <K, V> SetMultimapSubject that(@Nullable SetMultimap<K, V> target) {
     return new SetMultimapSubject(getFailureStrategy(), target);
   }
 

diff --git a/core/src/main/java/com/google/common/truth/Truth.java b/core/src/main/java/com/google/common/truth/Truth.java
@@ -211,18 +211,15 @@ public static MapSubject assertThat(@Nullable Map<?, ?> target) {
     return assert_().that(target);
   }
 
-  // TODO(b/26080262): Remove the <K, V> type params
+  public static MultimapSubject assertThat(@Nullable Multimap<?, ?> target) {
-  public static <K, V> MultimapSubject assertThat(@Nullable Multimap<K, V> target) {
     return assert_().that(target);
   }
 
-  // TODO(b/26080262): Remove the <K, V> type params
+  public static ListMultimapSubject assertThat(@Nullable ListMultimap<?, ?> target) {
-  public static <K, V> ListMultimapSubject assertThat(@Nullable ListMultimap<K, V> target) {
     return assert_().that(target);
   }
 
-  // TODO(b/26080262): Remove the <K, V> type params
+  public static SetMultimapSubject assertThat(@Nullable SetMultimap<?, ?> target) {
-  public static <K, V> SetMultimapSubject assertThat(@Nullable SetMultimap<K, V> target) {
     return assert_().that(target);
   }