From f0276b724d437f4760bcb03888c1a3958487a9ee Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 6 Sep 2016 11:56:13 +0700
Subject: [PATCH] StreamApiMigrationInspection: use toList()/toSet() collector
 if target variable type is Collection

---
 .../StreamApiMigrationInspection.java           |  4 ++--
 .../afterCollectArrayListCollection.java        | 15 +++++++++++++++
 .../beforeCollectArrayListCollection.java       | 17 +++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCollection.java
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCollection.java

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
index 93cbb2792411..ee6fb388162b 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
@@ -531,12 +531,12 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
       final PsiClassType rawVarType = varType instanceof PsiClassType ? ((PsiClassType)varType).rawType() : null;
       if (rawType != null && rawVarType != null &&
           rawType.equalsToText(CommonClassNames.JAVA_UTIL_ARRAY_LIST) &&
-          rawVarType.equalsToText(CommonClassNames.JAVA_UTIL_LIST)) {
+          (rawVarType.equalsToText(CommonClassNames.JAVA_UTIL_LIST) || rawVarType.equalsToText(CommonClassNames.JAVA_UTIL_COLLECTION))) {
         return "toList()";
       }
       else if (rawType != null && rawVarType != null &&
                rawType.equalsToText(CommonClassNames.JAVA_UTIL_HASH_SET) &&
-               rawVarType.equalsToText(CommonClassNames.JAVA_UTIL_SET)) {
+               (rawVarType.equalsToText(CommonClassNames.JAVA_UTIL_SET) || rawVarType.equalsToText(CommonClassNames.JAVA_UTIL_COLLECTION))) {
         return "toSet()";
       }
       else if (rawType != null) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCollection.java
new file mode 100644
index 000000000000..c526e817b438
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCollection.java
@@ -0,0 +1,15 @@
+// "Replace with collect" "true"
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class Collect {
+  class Person {
+    String getName() {
+      return "";
+    }
+  }
+
+  void collectNames(List<Person> persons){
+    Collection<String> names = persons.stream().map(Person::getName).collect(Collectors.toList());
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCollection.java
new file mode 100644
index 000000000000..736f655f5241
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCollection.java
@@ -0,0 +1,17 @@
+// "Replace with collect" "true"
+import java.util.*;
+
+public class Collect {
+  class Person {
+    String getName() {
+      return "";
+    }
+  }
+
+  void collectNames(List<Person> persons){
+    Collection<String> names = new ArrayList<>();
+    for (Person person : pers<caret>ons) {
+      names.add(person.getName());
+    }
+  }
+}