MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-160637 Stream API migration: support map and flatMap steps

Browse Source
This commit is contained in:
Tagir Valeev
2016-09-02 14:40:40 +07:00
parent cbfa5eb6f5
commit 1a1290751c
14 changed files with 447 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter.java
+1 -3
View File
@@ -5,9 +5,7 @@ import java.util.List;
class Sample {
public static void main(List<String> testTags) {
final List<String> resultJava7 = new ArrayList<>(testTags.size());
testTags.stream().filter(tag -> !resultJava7.contains(tag.trim())).forEach(tag -> {
resultJava7.add(tag.trim());
});
testTags.stream().filter(tag -> !resultJava7.contains(tag.trim())).forEach(tag -> resultJava7.add(tag.trim()));
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter1.java
+1 -3
View File
@@ -4,8 +4,6 @@ import java.util.List;
abstract class Sample implements List<String> {
void main() {
this.stream().filter(tag -> !contains(tag.trim())).forEach(tag -> {
add(tag.trim());
});
this.stream().filter(tag -> !contains(tag.trim())).forEach(tag -> add(tag.trim()));
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter2.java
+1 -3
View File
@@ -4,9 +4,7 @@ import java.util.List;
abstract class Sample implements List<String> {
void main() {
this.stream().filter(tag -> !foo(this)).forEach(tag -> {
add(tag.trim());
});
this.stream().filter(tag -> !foo(this)).forEach(tag -> add(tag.trim()));
}
static boolean foo(List<String> a){ return false;}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter3.java
+1 -3
View File
@@ -4,9 +4,7 @@ import java.util.List;
class Sample extends ArrayList<String> {
void main() {
this.stream().filter(tag -> !super.contains(tag)).forEach(tag -> {
add(tag.trim());
});
this.stream().filter(tag -> !super.contains(tag)).forEach(tag -> add(tag.trim()));
}
static boolean foo(List<String> a){ return false;}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectionDependencyInFilter4.java
+1 -3
View File
@@ -5,9 +5,7 @@ import java.util.List;
class Sample {
public static void main(List<String> testTags) {
final List<String> resultJava7 = new ArrayList<>(testTags.size());
testTags.stream().filter(tag -> !foo(resultJava7)).forEach(tag -> {
resultJava7.add(tag.trim());
});
testTags.stream().filter(tag -> !foo(resultJava7)).forEach(tag -> resultJava7.add(tag.trim()));
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterFlatMapCollectionFilterMapCollect.java
+13
View File
@@ -0,0 +1,13 @@
// "Replace with collect" "true"
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public class Main {
public void test(List<Set<String>> nested) {
List<String> result = nested.stream().filter(element -> element != null).flatMap(Collection::stream)
.filter(str -> str.startsWith("xyz")).map(String::trim).collect(Collectors.toList());
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterFlatMapMapFilterCollect.java
+11
View File
@@ -0,0 +1,11 @@
// "Replace with collect" "true"
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
public class Main {
public void test(List<String[]> list) {
List<String> result = list.stream().filter(arr -> arr.length > 2).flatMap(Arrays::stream).map(String::trim).filter(trimmed -> !trimmed.isEmpty()).collect(Collectors.toList());
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapFlatMapArrayCollect.java
+12
View File
@@ -0,0 +1,12 @@
// "Replace with collect" "true"
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class Main {
public void test(Map<String, String[]> map) {
List<String> result = map.entrySet().stream().filter(entry -> entry.getKey().startsWith("x")).map(Map.Entry::getValue).flatMap(arr -> Arrays.stream(arr)).map(String::trim).collect(Collectors.toList());
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFilterMapForEach.java
+15
View File
@@ -0,0 +1,15 @@
// "Replace with forEach" "true"
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class Main {
public void test(Map<String, String[]> map) {
List<String> result = new ArrayList<>();
map.entrySet().stream().filter(entry -> entry.getKey().startsWith("x")).map(Map.Entry::getValue).forEach(arr -> {
for (String str : arr) {
result.add(str.trim() + arr.length);
}
});
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterFlatMapCollectionFilterMapCollect.java
+20
View File
@@ -0,0 +1,20 @@
// "Replace with collect" "true"
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
public class Main {
public void test(List<Set<String>> nested) {
List<String> result = new ArrayList<>();
for (Set<String> element : nes<caret>ted) {
if (element != null) {
for (String str : element) {
if (str.startsWith("xyz")) {
String target = str.trim();
result.add(target);
}
}
}
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterFlatMapMapFilterCollect.java
+19
View File
@@ -0,0 +1,19 @@
// "Replace with collect" "true"
import java.util.ArrayList;
import java.util.List;
public class Main {
public void test(List<String[]> list) {
List<String> result = new ArrayList<>();
for(String[] arr : li<caret>st) {
if(arr.length > 2) {
for(String str : arr) {
String trimmed = str.trim();
if(!trimmed.isEmpty()) {
result.add(trimmed);
}
}
}
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapFlatMapArrayCollect.java
+18
View File
@@ -0,0 +1,18 @@
// "Replace with collect" "true"
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class Main {
public void test(Map<String, String[]> map) {
List<String> result = new ArrayList<>();
for(Map.Entry<String, String[]> entry: m<caret>ap.entrySet()) {
if(entry.getKey().startsWith("x")) {
String[] arr = entry.getValue();
for (String str : arr) {
result.add(str.trim());
}
}
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFilterMapForEach.java
+17
View File
@@ -0,0 +1,17 @@
// "Replace with forEach" "true"
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class Main {
public void test(Map<String, String[]> map) {
List<String> result = new ArrayList<>();
for(Map.Entry<String, String[]> entry: map.<caret>entrySet())
if (entry.getKey().startsWith("x")) {
String[] arr = entry.getValue();
for (String str : arr) {
result.add(str.trim()+arr.length);
}
}
}
}