Skip to content

Commit 239d57c

Browse files
committed
Restores CONCURRENT characteristic.
1 parent 6c3d0a2 commit 239d57c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/java/org/javimmutable/collections/util/JImmutableCollectors.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,15 @@
5151
import java.util.function.Function;
5252
import java.util.function.Supplier;
5353
import java.util.stream.Collector;
54+
import java.util.stream.Collector.Characteristics;
5455

5556
/**
5657
* Utility class providing static methods for collecting various immutable collections using streams.
5758
*/
5859
public class JImmutableCollectors
5960
{
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();
6263

6364
private JImmutableCollectors()
6465
{
@@ -177,12 +178,12 @@ private synchronized Accumulator<T, C> combine(Accumulator<T, C> other)
177178
private static class CollectorImpl<T, C>
178179
implements Collector<T, Accumulator<T, C>, C>
179180
{
180-
private final Set<Collector.Characteristics> characteristics;
181+
private final Set<Characteristics> characteristics;
181182
private final C empty;
182183
private final Func2<C, T, C> adder;
183184
private final Func2<C, C, C> combiner;
184185

185-
private CollectorImpl(@Nonnull Set<Collector.Characteristics> characteristics,
186+
private CollectorImpl(@Nonnull Set<Characteristics> characteristics,
186187
@Nonnull C empty,
187188
@Nonnull Func2<C, T, C> adder,
188189
@Nonnull Func2<C, C, C> combiner)

0 commit comments

Comments
 (0)