|
51 | 51 | import java.util.function.Function; |
52 | 52 | import java.util.function.Supplier; |
53 | 53 | import java.util.stream.Collector; |
| 54 | +import java.util.stream.Collector.Characteristics; |
54 | 55 |
|
55 | 56 | /** |
56 | 57 | * Utility class providing static methods for collecting various immutable collections using streams. |
57 | 58 | */ |
58 | 59 | public class JImmutableCollectors |
59 | 60 | { |
60 | | - static final Set<Collector.Characteristics> ORDERED = JImmutables.<Collector.Characteristics>set().getSet(); |
61 | | - static final Set<Collector.Characteristics> UNORDERED = JImmutables.set(Collector.Characteristics.UNORDERED).getSet(); |
| 61 | + static final Set<Characteristics> ORDERED = JImmutables.set(Characteristics.CONCURRENT).getSet(); |
| 62 | + static final Set<Characteristics> UNORDERED = JImmutables.set(Characteristics.UNORDERED, Characteristics.CONCURRENT).getSet(); |
62 | 63 |
|
63 | 64 | private JImmutableCollectors() |
64 | 65 | { |
@@ -177,12 +178,12 @@ private synchronized Accumulator<T, C> combine(Accumulator<T, C> other) |
177 | 178 | private static class CollectorImpl<T, C> |
178 | 179 | implements Collector<T, Accumulator<T, C>, C> |
179 | 180 | { |
180 | | - private final Set<Collector.Characteristics> characteristics; |
| 181 | + private final Set<Characteristics> characteristics; |
181 | 182 | private final C empty; |
182 | 183 | private final Func2<C, T, C> adder; |
183 | 184 | private final Func2<C, C, C> combiner; |
184 | 185 |
|
185 | | - private CollectorImpl(@Nonnull Set<Collector.Characteristics> characteristics, |
| 186 | + private CollectorImpl(@Nonnull Set<Characteristics> characteristics, |
186 | 187 | @Nonnull C empty, |
187 | 188 | @Nonnull Func2<C, T, C> adder, |
188 | 189 | @Nonnull Func2<C, C, C> combiner) |
|
0 commit comments