OptionalUtil#getMapTypeArgument: check nulls; remove 0-arg check

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCastExpected.java

@@ -5,7 +5,7 @@ import java.util.stream.Collectors;
 
 class Test {
   public static <T> List<TokenFilter<T>> fromString(final T src, Function<T, List<String>> extractor) {
-      final List<TokenFilter<T>> result = extractor.apply(src).stream().<TokenFilter<T>>map(TokenFilter::new).collect(Collectors.toList());
+      final List<TokenFilter<T>> result = extractor.apply(src).stream().map((Function<String, TokenFilter<T>>) TokenFilter::new).collect(Collectors.toList());
       return result;
   }
   

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectContravariant.java

@@ -0,0 +1,14 @@
+// "Replace with collect" "true"
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Main<T> {
+  public static List<Collection<CharSequence>> test(List<String> list) {
+      List<Collection<CharSequence>> strings = list.stream().<List<CharSequence>>map(Collections::singletonList).collect(Collectors.toList());
+      return strings;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectNulls.java

@@ -0,0 +1,13 @@
+// "Replace with collect" "true"
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class Main<T> {
+  public static List<String> test() {
+      List<String> strings = IntStream.range(0, 10).<String>mapToObj(x -> null).collect(Collectors.toList());
+      return strings;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSupertype.java

@@ -0,0 +1,14 @@
+// "Replace with collect" "true"
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Main<T> {
+  public static List<Collection<String>> test(List<String> list) {
+      List<Collection<String>> strings = list.stream().map(Collections::singletonList).collect(Collectors.toList());
+      return strings;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectContravariant.java

@@ -0,0 +1,17 @@
+// "Replace with collect" "true"
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class Main<T> {
+  public static List<Collection<CharSequence>> test(List<String> list) {
+    List<Collection<CharSequence>> strings = new ArrayList<>();
+    for (String s : lis<caret>t) {
+      List<CharSequence> e = Collections.singletonList(s);
+      strings.add(e);
+    }
+    return strings;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectNulls.java

@@ -0,0 +1,14 @@
+// "Replace with collect" "true"
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Main<T> {
+  public static List<String> test() {
+    List<String> strings = new ArrayList<>();
+    for(in<caret>t x = 0; x < 10; x++) {
+      strings.add(null);
+    }
+    return strings;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSupertype.java

@@ -0,0 +1,17 @@
+// "Replace with collect" "true"
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class Main<T> {
+  public static List<Collection<String>> test(List<String> list) {
+    List<Collection<String>> strings = new ArrayList<>();
+    for (String s : l<caret>ist) {
+      List<String> e = Collections.singletonList(s);
+      strings.add(e);
+    }
+    return strings;
+  }
+}