ExtractChainedMapAction: more specific message; Guava FluentIterable support; Collection.forEach test

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterAnyMatch.java

@@ -1,4 +1,4 @@
-// "Extract variable 'lowerCase' to separate mapping method" "true"
+// "Extract variable 'lowerCase' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterArrayInitializer.java

@@ -1,4 +1,4 @@
-// "Extract variable 'arr' to separate mapping method" "true"
+// "Extract variable 'arr' to 'mapToObj' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterAsLongStream.java

@@ -1,4 +1,4 @@
-// "Extract variable 'l' to separate mapping method" "true"
+// "Extract variable 'l' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterBoxed.java

@@ -1,4 +1,4 @@
-// "Extract variable 'l' to separate mapping method" "true"
+// "Extract variable 'l' to 'asLongStream' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterCollectionForEach.java

@@ -0,0 +1,8 @@
+// "Extract variable 'trimmed' to 'stream().map' operation" "true"
+import java.util.Collection;
+
+public class StreamExtract {
+  void hasNonEmpty(Collection<String> list) {
+      list.stream().map(String::trim).forEach(trimmed -> System.out.println(trimmed + ":" + trimmed));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterFlatMap.java

@@ -1,4 +1,4 @@
-// "Extract variable 'y' to separate mapping method" "true"
+// "Extract variable 'y' to 'mapToInt' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterFlatMap3.java

@@ -1,4 +1,4 @@
-// "Extract variable 'y' to separate mapping method" "true"
+// "Extract variable 'y' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterFlatMap4.java

@@ -1,4 +1,4 @@
-// "Extract variable 's' to separate mapping method" "true"
+// "Extract variable 's' to 'mapToObj' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterForEachPrimitive.java

@@ -1,4 +1,4 @@
-// "Extract variable 'i' to separate mapping method" "true"
+// "Extract variable 'i' to 'mapToInt' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterFunction.java

@@ -1,4 +1,4 @@
-// "Extract variable 'fn' to separate mapping method" "true"
+// "Extract variable 'fn' to 'map' operation" "true"
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.*;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterGeneric.java

@@ -1,4 +1,4 @@
-// "Extract variable 'set' to separate mapping method" "true"
+// "Extract variable 'set' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterMapRemove.java

@@ -1,4 +1,4 @@
-// "Extract variable 'y' to separate mapping method" "true"
+// "Extract variable 'y' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterMapRename.java

@@ -1,4 +1,4 @@
-// "Extract variable 'l' to separate mapping method" "true"
+// "Extract variable 'l' to 'asLongStream' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/afterThenAccept.java

@@ -1,4 +1,4 @@
-// "Extract variable 'lc' to separate mapping method" "true"
+// "Extract variable 'lc' to 'thenApply' operation" "true"
 import java.util.concurrent.CompletableFuture;
 
 public class Test {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeAnyMatch.java

@@ -1,4 +1,4 @@
-// "Extract variable 'lowerCase' to separate mapping method" "true"
+// "Extract variable 'lowerCase' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeAnyMatchOrigVarReused.java

@@ -1,4 +1,4 @@
-// "Extract variable 'lowerCase' to separate mapping method" "false"
+// "Disable 'Extract to separate mapping method'" "false"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeArrayInitializer.java

@@ -1,4 +1,4 @@
-// "Extract variable 'arr' to separate mapping method" "true"
+// "Extract variable 'arr' to 'mapToObj' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeAsLongStream.java

@@ -1,4 +1,4 @@
-// "Extract variable 'l' to separate mapping method" "true"
+// "Extract variable 'l' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeBoxed.java

@@ -1,4 +1,4 @@
-// "Extract variable 'l' to separate mapping method" "true"
+// "Extract variable 'l' to 'asLongStream' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeCollectionForEach.java

@@ -0,0 +1,11 @@
+// "Extract variable 'trimmed' to 'stream().map' operation" "true"
+import java.util.Collection;
+
+public class StreamExtract {
+  void hasNonEmpty(Collection<String> list) {
+    list.forEach(s -> {
+      String <caret>trimmed = s.trim();
+      System.out.println(trimmed + ":" + trimmed);
+    });
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeFlatMap.java

@@ -1,4 +1,4 @@
-// "Extract variable 'y' to separate mapping method" "true"
+// "Extract variable 'y' to 'mapToInt' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeFlatMap2.java

@@ -1,4 +1,4 @@
-// "Extract variable 'y' to separate mapping method" "false"
+// "Disable 'Extract to separate mapping method'" "false"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeFlatMap3.java

@@ -1,4 +1,4 @@
-// "Extract variable 'y' to separate mapping method" "true"
+// "Extract variable 'y' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeFlatMap4.java

@@ -1,4 +1,4 @@
-// "Extract variable 's' to separate mapping method" "true"
+// "Extract variable 's' to 'mapToObj' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeForEachPrimitive.java

@@ -1,4 +1,4 @@
-// "Extract variable 'i' to separate mapping method" "true"
+// "Extract variable 'i' to 'mapToInt' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeForEachPrimitiveUnsupported.java

@@ -1,4 +1,4 @@
-// "Extract variable 'i' to separate mapping method" "false"
+// "Disable 'Extract to separate mapping method'" "false"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeFunction.java

@@ -1,4 +1,4 @@
-// "Extract variable 'fn' to separate mapping method" "true"
+// "Extract variable 'fn' to 'map' operation" "true"
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.*;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeGeneric.java

@@ -1,4 +1,4 @@
-// "Extract variable 'set' to separate mapping method" "true"
+// "Extract variable 'set' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeMapRemove.java

@@ -1,4 +1,4 @@
-// "Extract variable 'y' to separate mapping method" "true"
+// "Extract variable 'y' to 'map' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeMapRename.java

@@ -1,4 +1,4 @@
-// "Extract variable 'l' to separate mapping method" "true"
+// "Extract variable 'l' to 'asLongStream' operation" "true"
 import java.util.*;
 import java.util.stream.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractStreamMap/beforeThenAccept.java

@@ -1,4 +1,4 @@
-// "Extract variable 'lc' to separate mapping method" "true"
+// "Extract variable 'lc' to 'thenApply' operation" "true"
 import java.util.concurrent.CompletableFuture;
 
 public class Test {