diff options
Diffstat (limited to 'guava/src/com/google/common/collect/CollectCollectors.java')
-rw-r--r-- | guava/src/com/google/common/collect/CollectCollectors.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/guava/src/com/google/common/collect/CollectCollectors.java b/guava/src/com/google/common/collect/CollectCollectors.java index e0982ab0f..2b23bd25a 100644 --- a/guava/src/com/google/common/collect/CollectCollectors.java +++ b/guava/src/com/google/common/collect/CollectCollectors.java @@ -195,14 +195,13 @@ final class CollectCollectors { ImmutableMap.Builder<K, V>::new, (builder, input) -> builder.put(keyFunction.apply(input), valueFunction.apply(input)), ImmutableMap.Builder::combine, - ImmutableMap.Builder::build); + ImmutableMap.Builder::buildOrThrow); } - public static <T extends @Nullable Object, K, V> - Collector<T, ?, ImmutableMap<K, V>> toImmutableMap( - Function<? super T, ? extends K> keyFunction, - Function<? super T, ? extends V> valueFunction, - BinaryOperator<V> mergeFunction) { + static <T extends @Nullable Object, K, V> Collector<T, ?, ImmutableMap<K, V>> toImmutableMap( + Function<? super T, ? extends K> keyFunction, + Function<? super T, ? extends V> valueFunction, + BinaryOperator<V> mergeFunction) { checkNotNull(keyFunction); checkNotNull(valueFunction); checkNotNull(mergeFunction); @@ -227,7 +226,7 @@ final class CollectCollectors { () -> new ImmutableSortedMap.Builder<K, V>(comparator), (builder, input) -> builder.put(keyFunction.apply(input), valueFunction.apply(input)), ImmutableSortedMap.Builder::combine, - ImmutableSortedMap.Builder::build, + ImmutableSortedMap.Builder::buildOrThrow, Collector.Characteristics.UNORDERED); } @@ -256,7 +255,7 @@ final class CollectCollectors { ImmutableBiMap.Builder<K, V>::new, (builder, input) -> builder.put(keyFunction.apply(input), valueFunction.apply(input)), ImmutableBiMap.Builder::combine, - ImmutableBiMap.Builder::build, + ImmutableBiMap.Builder::buildOrThrow, new Collector.Characteristics[0]); } @@ -464,4 +463,6 @@ final class CollectCollectors { return multimap1; }); } + + private CollectCollectors() {} } |