diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java index 8bc00ea88ba7d9ed9c631cfc6d52d0e41d6d31d2..ca50849cf3480a91b59fd748dadd7e8d88739ee8 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java @@ -36,8 +36,8 @@ public class StreamUtils { return toList(data, mapper, distinct, false); } - public static List toList(Iterable data, Function mapper, boolean distinct, boolean ignoreNull) { - return extract(data, mapper, distinct, ignoreNull, Collectors.toList()); + public static List toList(Iterable data, Function mapper, boolean distinct, boolean discardNull) { + return extract(data, mapper, distinct, discardNull, Collectors.toList()); } public static Set toSet(Iterable data, Function mapper) { @@ -88,8 +88,8 @@ public class StreamUtils { return groupBy(data, mapper, collectors, false); } - public static Map groupBy(Iterable data, Function mapper, Collector collectors, boolean ignoreNullKey) { - return groupBy(data, mapper, Function.identity(), collectors, ignoreNullKey); + public static Map groupBy(Iterable data, Function mapper, Collector collectors, boolean discardNullKey) { + return groupBy(data, mapper, Function.identity(), collectors, discardNullKey); } public static Map> groupBy(Iterable data, Function keyMapper, Function valueMapper) { @@ -104,13 +104,13 @@ public class StreamUtils { return groupBy(data, keyMapper, valueMapper, collector, false); } - public static Map groupBy(Iterable data, Function keyMapper, Function valueMapper, Collector collector, boolean ignoreNullKey) { - return groupBy(data, keyMapper, valueMapper, collector, ignoreNullKey, HashMap::new); + public static Map groupBy(Iterable data, Function keyMapper, Function valueMapper, Collector collector, boolean discardNullKey) { + return groupBy(data, keyMapper, valueMapper, collector, discardNullKey, HashMap::new); } - public static Map groupBy(Iterable data, Function keyMapper, Function valueMapper, Collector collector, boolean ignoreNullKey, Supplier> mapSupplier) { + public static Map groupBy(Iterable data, Function keyMapper, Function valueMapper, Collector collector, boolean discardNullKey, Supplier> mapSupplier) { Stream stream = from(data); - if (ignoreNullKey) { + if (discardNullKey) { stream = stream.filter(item -> null != keyMapper.apply(item)); } return stream.collect(groupingBy(keyMapper, mapSupplier, mapping(valueMapper, collector))); @@ -128,9 +128,9 @@ public class StreamUtils { return from(data).map(toStringFunction).collect(joining(delimiter, prefix, suffix)); } - public static R extract(Iterable data, Function mapper, boolean distinct, boolean ignoreNull, Collector collector) { + public static R extract(Iterable data, Function mapper, boolean distinct, boolean discardNull, Collector collector) { Predicate predicate = null; - if (ignoreNull) { + if (discardNull) { predicate = Objects::nonNull; } return extract(data, mapper, predicate, distinct, collector); @@ -156,4 +156,4 @@ public class StreamUtils { return StreamSupport.stream(source.spliterator(), parallel); } -} \ No newline at end of file +}