Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 6efab2bf0 -> 61e0f42e1
Fix compilation error (cherry picked from commit f531466) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/61e0f42e Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/61e0f42e Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/61e0f42e Branch: refs/heads/GROOVY_2_6_X Commit: 61e0f42e19c0b441c58be85bceafaa7c5abd64ea Parents: 6efab2b Author: sunlan <[email protected]> Authored: Tue Jan 23 22:15:35 2018 +0800 Committer: sunlan <[email protected]> Committed: Tue Jan 23 22:16:34 2018 +0800 ---------------------------------------------------------------------- .../groovy/vmplugin/v8/PluginDefaultGroovyMethods.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/61e0f42e/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java index b0f5444..36fa66a 100644 --- a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java +++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.Set; +import java.util.stream.Collector; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -55,7 +56,8 @@ public class PluginDefaultGroovyMethods { * @return a new {@code java.util.List} instance */ public static <T> List<T> toList(Stream<T> stream) { - return stream.collect(Collectors.<T>toList()); + Collector<T, ?, List<T>> collector = Collectors.toList(); + return stream.collect(collector); } /** @@ -65,7 +67,8 @@ public class PluginDefaultGroovyMethods { * @return a new {@code java.util.Set} instance */ public static <T> Set<T> toSet(Stream<T> stream) { - return stream.collect(Collectors.<T>toSet()); + Collector<T, ?, Set<T>> collector = Collectors.toSet(); + return stream.collect(collector); } /**
