Adding listOf template

error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/CollectionTemplates.java

@@ -2,8 +2,6 @@
 
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.errorprone.refaster.Refaster;
@@ -12,14 +10,11 @@
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.NavigableSet;
 import java.util.Optional;
 import java.util.Queue;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.function.IntFunction;
 import java.util.stream.Stream;
@@ -408,39 +403,4 @@ Optional<T> after(Queue<T> queue) {
   // XXX: collection.stream().noneMatch(e -> e.equals(other))
   // ^ This is !collection.contains(other). Do we already rewrite variations on this?
 
-  static final class ImmutableSetOf<T> {
-    @BeforeTemplate
-    Set<T> before() {
-      return Collections.emptySet();
-    }
-
-    @AfterTemplate
-    ImmutableSet<T> after() {
-      return ImmutableSet.of();
-    }
-  }
-
-  static final class ImmutableListOf<T> {
-    @BeforeTemplate
-    List<T> before() {
-      return Collections.emptyList();
-    }
-
-    @AfterTemplate
-    ImmutableList<T> after() {
-      return ImmutableList.of();
-    }
-  }
-
-  static final class ImmutableMapOf<K, V> {
-    @BeforeTemplate
-    Map<K, V> before() {
-      return Collections.emptyMap();
-    }
-
-    @AfterTemplate
-    ImmutableMap<K, V> after() {
-      return ImmutableMap.of();
-    }
-  }
 }

error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ImmutableListTemplates.java

@@ -6,6 +6,7 @@
 import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.toList;
 
+import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
@@ -186,4 +187,28 @@ ImmutableList<T> after(Stream<T> stream) {
       return stream.collect(toImmutableSet()).asList();
     }
   }
+
+  static final class ImmutableListOf<T> {
+    @BeforeTemplate
+    List<T> before() {
+      return Collections.emptyList();
+    }
+
+    @AfterTemplate
+    ImmutableList<T> after() {
+      return ImmutableList.of();
+    }
+  }
+
+  static final class ImmutableListOf1<T> {
+    @BeforeTemplate
+    List<T> before(T item) {
+      return List.of(item);
+    }
+
+    @AfterTemplate
+    ImmutableCollection<T> after(T item) {
+      return ImmutableList.of(item);
+    }
+  }
 }

error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ImmutableMapTemplates.java

@@ -255,6 +255,18 @@ ImmutableMap<K, V> after(ImmutableMap<K, V> map) {
     }
   }
 
+  static final class ImmutableMapOf<K, V> {
+    @BeforeTemplate
+    Map<K, V> before() {
+      return Collections.emptyMap();
+    }
+
+    @AfterTemplate
+    ImmutableMap<K, V> after() {
+      return ImmutableMap.of();
+    }
+  }
+
   // XXX: Add a template for this:
   // Maps.transformValues(streamOfEntries.collect(groupBy(fun)), ImmutableMap::copyOf)
   // ->

error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ImmutableSetTemplates.java

@@ -151,4 +151,16 @@ ImmutableSet<T> after(SetView<T> set) {
       return set.immutableCopy();
     }
   }
+
+  static final class ImmutableSetOf<T> {
+    @BeforeTemplate
+    Set<T> before() {
+      return Collections.emptySet();
+    }
+
+    @AfterTemplate
+    ImmutableSet<T> after() {
+      return ImmutableSet.of();
+    }
+  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/CollectionTemplatesTestInput.java

@@ -6,20 +6,16 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Stream;
 
 final class CollectionTemplatesTest implements RefasterTemplateTestCase {
   @Override
   public ImmutableSet<?> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Collections.class, Iterables.class, Lists.class);
+    return ImmutableSet.of(Iterables.class, Lists.class);
   }
 
   ImmutableSet<Boolean> testCollectionIsEmpty() {
@@ -188,28 +184,4 @@ ImmutableSet<Optional<String>> testRemoveOptionalFirstQueueElement() {
             ? Optional.ofNullable(new LinkedList<String>().remove())
             : Optional.empty());
   }
-
-  Set<?> testImmutableSetOf() {
-    return Collections.emptySet();
-  }
-
-  Set<String> testImmutableSetOfTyped() {
-    return Collections.emptySet();
-  }
-
-  List<?> testImmutableListOf() {
-    return Collections.emptyList();
-  }
-
-  List<String> testImmutableListOfTyped() {
-    return Collections.emptyList();
-  }
-
-  Map<?, ?> testImmutableMapOf() {
-    return Collections.emptyMap();
-  }
-
-  Map<String, String> testImmutableMapOfTyped() {
-    return Collections.emptyMap();
-  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/CollectionTemplatesTestOutput.java

@@ -1,26 +1,21 @@
 package tech.picnic.errorprone.bugpatterns;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Stream;
 
 final class CollectionTemplatesTest implements RefasterTemplateTestCase {
   @Override
   public ImmutableSet<?> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Collections.class, Iterables.class, Lists.class);
+    return ImmutableSet.of(Iterables.class, Lists.class);
   }
 
   ImmutableSet<Boolean> testCollectionIsEmpty() {
@@ -139,28 +134,4 @@ ImmutableSet<Optional<String>> testRemoveOptionalFirstQueueElement() {
         Optional.ofNullable(new LinkedList<String>().poll()),
         Optional.ofNullable(new LinkedList<String>().poll()));
   }
-
-  Set<?> testImmutableSetOf() {
-    return ImmutableSet.of();
-  }
-
-  Set<String> testImmutableSetOfTyped() {
-    return ImmutableSet.of();
-  }
-
-  List<?> testImmutableListOf() {
-    return ImmutableList.of();
-  }
-
-  List<String> testImmutableListOfTyped() {
-    return ImmutableList.of();
-  }
-
-  Map<?, ?> testImmutableMapOf() {
-    return ImmutableMap.of();
-  }
-
-  Map<String, String> testImmutableMapOfTyped() {
-    return ImmutableMap.of();
-  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/ImmutableListTemplatesTestInput.java

@@ -9,6 +9,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -19,6 +20,7 @@ final class ImmutableListTemplatesTest implements RefasterTemplateTestCase {
   public ImmutableSet<?> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         Arrays.class,
+        Collection.class,
         Collections.class,
         Comparator.class,
         Streams.class,
@@ -79,4 +81,16 @@ ImmutableSet<ImmutableList<String>> testImmutableListSortedCopyOfWithCustomCompa
   ImmutableList<Integer> testStreamToDistinctImmutableList() {
     return Stream.of(1).distinct().collect(toImmutableList());
   }
+
+  List<?> testImmutableListOf() {
+    return Collections.emptyList();
+  }
+
+  List<String> testImmutableListOfTyped() {
+    return Collections.emptyList();
+  }
+
+  ImmutableSet<Collection<String>> testImmutableList1() {
+    return ImmutableSet.of(List.of("1"));
+  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/ImmutableListTemplatesTestOutput.java

@@ -10,6 +10,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -20,6 +21,7 @@ final class ImmutableListTemplatesTest implements RefasterTemplateTestCase {
   public ImmutableSet<?> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         Arrays.class,
+        Collection.class,
         Collections.class,
         Comparator.class,
         Streams.class,
@@ -74,4 +76,16 @@ ImmutableSet<ImmutableList<String>> testImmutableListSortedCopyOfWithCustomCompa
   ImmutableList<Integer> testStreamToDistinctImmutableList() {
     return Stream.of(1).collect(toImmutableSet()).asList();
   }
+
+  List<?> testImmutableListOf() {
+    return ImmutableList.of();
+  }
+
+  List<String> testImmutableListOfTyped() {
+    return ImmutableList.of();
+  }
+
+  ImmutableSet<Collection<String>> testImmutableList1() {
+    return ImmutableSet.of(ImmutableList.of("1"));
+  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/ImmutableMapTemplatesTestInput.java

@@ -90,4 +90,12 @@ ImmutableSet<ImmutableMap<String, Integer>> testTransformMapValuesToImmutableMap
   ImmutableMap<String, Integer> testImmutableMapCopyOfImmutableMap() {
     return ImmutableMap.copyOf(ImmutableMap.of("foo", 1));
   }
+
+  Map<?, ?> testImmutableMapOf() {
+    return Collections.emptyMap();
+  }
+
+  Map<String, String> testImmutableMapOfTyped() {
+    return Collections.emptyMap();
+  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/ImmutableMapTemplatesTestOutput.java

@@ -76,4 +76,12 @@ ImmutableSet<ImmutableMap<String, Integer>> testTransformMapValuesToImmutableMap
   ImmutableMap<String, Integer> testImmutableMapCopyOfImmutableMap() {
     return ImmutableMap.of("foo", 1);
   }
+
+  Map<?, ?> testImmutableMapOf() {
+    return ImmutableMap.of();
+  }
+
+  Map<String, String> testImmutableMapOfTyped() {
+    return ImmutableMap.of();
+  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/ImmutableSetTemplatesTestInput.java

@@ -66,4 +66,12 @@ ImmutableSet<Integer> testImmutableSetCopyOfImmutableSet() {
   ImmutableSet<Integer> testImmutableSetCopyOfSetView() {
     return ImmutableSet.copyOf(Sets.difference(ImmutableSet.of(1), ImmutableSet.of(2)));
   }
+
+  Set<?> testImmutableSetOf() {
+    return Collections.emptySet();
+  }
+
+  Set<String> testImmutableSetOfTyped() {
+    return Collections.emptySet();
+  }
 }

error-prone-contrib/src/test/resources/tech/picnic/errorprone/bugpatterns/ImmutableSetTemplatesTestOutput.java

@@ -65,4 +65,12 @@ ImmutableSet<Integer> testImmutableSetCopyOfImmutableSet() {
   ImmutableSet<Integer> testImmutableSetCopyOfSetView() {
     return Sets.difference(ImmutableSet.of(1), ImmutableSet.of(2)).immutableCopy();
   }
+
+  Set<?> testImmutableSetOf() {
+    return ImmutableSet.of();
+  }
+
+  Set<String> testImmutableSetOfTyped() {
+    return ImmutableSet.of();
+  }
 }