From f510432d7f57f958920a1e7b9ccde37fe11fcc34 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 29 Nov 2019 09:35:11 +0700 Subject: [PATCH] Fixed redundant flatMap step warnings GitOrigin-RevId: 5468f6bd824280340d6680ef9291cea7e5e71c64 --- .../yaml/navigation/YAMLKeysSearchEverywhereContributor.java | 3 +-- updater/testSrc/com/intellij/updater/PatchTestCase.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java b/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java index 6719a5387ad2..b62a705b9f8b 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java +++ b/plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java @@ -175,8 +175,7 @@ public class YAMLKeysSearchEverywhereContributor implements SearchEverywhereCont .stream() .sorted() .map(idx -> priority.get(idx)) - .map(found -> found.stream().sorted()) - .flatMap(s -> s) + .flatMap(found -> found.stream().sorted()) .collect(Collectors.toList()); } diff --git a/updater/testSrc/com/intellij/updater/PatchTestCase.java b/updater/testSrc/com/intellij/updater/PatchTestCase.java index 2854c7c72129..ef774f556884 100644 --- a/updater/testSrc/com/intellij/updater/PatchTestCase.java +++ b/updater/testSrc/com/intellij/updater/PatchTestCase.java @@ -80,8 +80,7 @@ public abstract class PatchTestCase extends UpdaterTestCase { assertThat(list).isEqualTo(groups.stream().flatMap(Collection::stream).collect(toList())); // sorts group elements and concatenates groups into a list return groups.stream() - .map(elements -> elements.stream().sorted(sorter)) - .flatMap(stream -> stream) + .flatMap(elements -> elements.stream().sorted(sorter)) .collect(toList()); } } \ No newline at end of file