diff --git a/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java
index 54d1d4acd732d..c759e243f0158 100644
--- a/src/java.base/share/classes/java/util/stream/Collectors.java
+++ b/src/java.base/share/classes/java/util/stream/Collectors.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -223,7 +223,7 @@ record CollectorImpl<T, A, R>(Supplier<A> supplier,
*/
public static <T, C extends Collection<T>>
Collector<T, ?, C> toCollection(Supplier<C> collectionFactory) {
- return new CollectorImpl<>(collectionFactory, Collection<T>::add,
+ return new CollectorImpl<>(collectionFactory, Collection::add,
(r1, r2) -> { r1.addAll(r2); return r1; },
CH_ID);
}
@@ -336,9 +336,12 @@ record CollectorImpl<T, A, R>(Supplier<A> supplier,
* {@code String}, in encounter order
*/
public static Collector<CharSequence, ?, String> joining() {
- return new CollectorImpl<CharSequence, StringBuilder, String>(
+ return new CollectorImpl<>(
StringBuilder::new, StringBuilder::append,
- (r1, r2) -> { r1.append(r2); return r1; },
+ (r1, r2) -> {
+ r1.append(r2);
+ return r1;
+ },
StringBuilder::toString, CH_NOID);
}
@@ -902,9 +905,12 @@ public void accept(T t) {
}
}
- return new CollectorImpl<T, OptionalBox, Optional<T>>(
+ return new CollectorImpl<>(
OptionalBox::new, OptionalBox::accept,
- (a, b) -> { if (b.present) a.accept(b.value); return a; },
+ (a, b) -> {
+ if (b.present) a.accept(b.value);
+ return a;
+ },
a -> Optional.ofNullable(a.value), CH_NOID);
}
@@ -1106,7 +1112,7 @@ public void accept(T t) {
A container = m.computeIfAbsent(key, k -> downstreamSupplier.get());
downstreamAccumulator.accept(container, t);
};
- BinaryOperator<Map<K, A>> merger = Collectors.<K, A, Map<K, A>>mapMerger(downstream.combiner());
+ BinaryOperator<Map<K, A>> merger = Collectors.mapMerger(downstream.combiner());
@SuppressWarnings("unchecked")
Supplier<Map<K, A>> mangledFactory = (Supplier<Map<K, A>>) mapFactory;
@@ -1259,7 +1265,7 @@ public void accept(T t) {
Collector<? super T, A, D> downstream) {
Supplier<A> downstreamSupplier = downstream.supplier();
BiConsumer<A, ? super T> downstreamAccumulator = downstream.accumulator();
- BinaryOperator<ConcurrentMap<K, A>> merger = Collectors.<K, A, ConcurrentMap<K, A>>mapMerger(downstream.combiner());
+ BinaryOperator<ConcurrentMap<K, A>> merger = Collectors.mapMerger(downstream.combiner());
@SuppressWarnings("unchecked")
Supplier<ConcurrentMap<K, A>> mangledFactory = (Supplier<ConcurrentMap<K, A>>) mapFactory;
BiConsumer<ConcurrentMap<K, A>, T> accumulator;
@@ -1816,10 +1822,13 @@ public void accept(T t) {
*/
public static <T>
Collector<T, ?, IntSummaryStatistics> summarizingInt(ToIntFunction<? super T> mapper) {
- return new CollectorImpl<T, IntSummaryStatistics, IntSummaryStatistics>(
+ return new CollectorImpl<>(
IntSummaryStatistics::new,
(r, t) -> r.accept(mapper.applyAsInt(t)),
- (l, r) -> { l.combine(r); return l; }, CH_ID);
+ (l, r) -> {
+ l.combine(r);
+ return l;
+ }, CH_ID);
}
/**
@@ -1836,10 +1845,13 @@ public void accept(T t) {
*/
public static <T>
Collector<T, ?, LongSummaryStatistics> summarizingLong(ToLongFunction<? super T> mapper) {
- return new CollectorImpl<T, LongSummaryStatistics, LongSummaryStatistics>(
+ return new CollectorImpl<>(
LongSummaryStatistics::new,
(r, t) -> r.accept(mapper.applyAsLong(t)),
- (l, r) -> { l.combine(r); return l; }, CH_ID);
+ (l, r) -> {
+ l.combine(r);
+ return l;
+ }, CH_ID);
}
/**
@@ -1856,10 +1868,13 @@ public void accept(T t) {
*/
public static <T>
Collector<T, ?, DoubleSummaryStatistics> summarizingDouble(ToDoubleFunction<? super T> mapper) {
- return new CollectorImpl<T, DoubleSummaryStatistics, DoubleSummaryStatistics>(
+ return new CollectorImpl<>(
DoubleSummaryStatistics::new,
(r, t) -> r.accept(mapper.applyAsDouble(t)),
- (l, r) -> { l.combine(r); return l; }, CH_ID);
+ (l, r) -> {
+ l.combine(r);
+ return l;
+ }, CH_ID);
}
/**
diff --git a/src/java.base/share/classes/java/util/stream/DistinctOps.java b/src/java.base/share/classes/java/util/stream/DistinctOps.java
index e02bded13afc7..461e8d72df4ae 100644
--- a/src/java.base/share/classes/java/util/stream/DistinctOps.java
+++ b/src/java.base/share/classes/java/util/stream/DistinctOps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -122,7 +122,7 @@ Sink<T> opWrapSink(int flags, Sink<T> sink) {
if (StreamOpFlag.DISTINCT.isKnown(flags)) {
return sink;
} else if (StreamOpFlag.SORTED.isKnown(flags)) {
- return new Sink.ChainedReference<T, T>(sink) {
+ return new Sink.ChainedReference<>(sink) {
boolean seenNull;
T lastSeen;
@@ -153,7 +153,7 @@ public void accept(T t) {
}
};
} else {
- return new Sink.ChainedReference<T, T>(sink) {
+ return new Sink.ChainedReference<>(sink) {
Set<T> seen;
@Override
diff --git a/src/java.base/share/classes/java/util/stream/DoublePipeline.java b/src/java.base/share/classes/java/util/stream/DoublePipeline.java
index 9771440f8aa93..7c7f92d8869f9 100644
--- a/src/java.base/share/classes/java/util/stream/DoublePipeline.java
+++ b/src/java.base/share/classes/java/util/stream/DoublePipeline.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -167,10 +167,10 @@ final Node.Builder<Double> makeNodeBuilder(long exactSizeIfKnown, IntFunction<D
}
private <U> Stream<U> mapToObj(DoubleFunction<? extends U> mapper, int opFlags) {
- return new ReferencePipeline.StatelessOp<Double, U>(this, StreamShape.DOUBLE_VALUE, opFlags) {
+ return new ReferencePipeline.StatelessOp<>(this, StreamShape.DOUBLE_VALUE, opFlags) {
@Override
Sink<Double> opWrapSink(int flags, Sink<U> sink) {
- return new Sink.ChainedDouble<U>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
@Override
public void accept(double t) {
downstream.accept(mapper.apply(t));
@@ -202,11 +202,11 @@ public final Stream<Double> boxed() {
@Override
public final DoubleStream map(DoubleUnaryOperator mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new StatelessOp<>(this, StreamShape.DOUBLE_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble<Double>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
@Override
public void accept(double t) {
downstream.accept(mapper.applyAsDouble(t));
@@ -225,11 +225,11 @@ public final <U> Stream<U> mapToObj(DoubleFunction<? extends U> mapper) {
@Override
public final IntStream mapToInt(DoubleToIntFunction mapper) {
Objects.requireNonNull(mapper);
- return new IntPipeline.StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new IntPipeline.StatelessOp<>(this, StreamShape.DOUBLE_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedDouble<Integer>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
@Override
public void accept(double t) {
downstream.accept(mapper.applyAsInt(t));
@@ -242,11 +242,11 @@ public void accept(double t) {
@Override
public final LongStream mapToLong(DoubleToLongFunction mapper) {
Objects.requireNonNull(mapper);
- return new LongPipeline.StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new LongPipeline.StatelessOp<>(this, StreamShape.DOUBLE_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedDouble<Long>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
@Override
public void accept(double t) {
downstream.accept(mapper.applyAsLong(t));
@@ -259,11 +259,11 @@ public void accept(double t) {
@Override
public final DoubleStream flatMap(DoubleFunction<? extends DoubleStream> mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.DOUBLE_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble<Double>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
// true if cancellationRequested() has been called
boolean cancellationRequestedCalled;
@@ -281,10 +281,10 @@ public void accept(double t) {
if (result != null) {
if (!cancellationRequestedCalled) {
result.sequential().forEach(downstreamAsDouble);
- }
- else {
+ } else {
var s = result.sequential().spliterator();
- do { } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsDouble));
+ do {
+ } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsDouble));
}
}
}
@@ -333,7 +333,7 @@ public void accept(double t) {
public DoubleStream unordered() {
if (!isOrdered())
return this;
- return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE, StreamOpFlag.NOT_ORDERED) {
+ return new StatelessOp<>(this, StreamShape.DOUBLE_VALUE, StreamOpFlag.NOT_ORDERED) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
return sink;
@@ -344,11 +344,11 @@ Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
@Override
public final DoubleStream filter(DoublePredicate predicate) {
Objects.requireNonNull(predicate);
- return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
- StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.DOUBLE_VALUE,
+ StreamOpFlag.NOT_SIZED) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble<Double>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -367,11 +367,11 @@ public void accept(double t) {
@Override
public final DoubleStream peek(DoubleConsumer action) {
Objects.requireNonNull(action);
- return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
- 0) {
+ return new StatelessOp<>(this, StreamShape.DOUBLE_VALUE,
+ 0) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble<Double>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
@Override
public void accept(double t) {
action.accept(t);
diff --git a/src/java.base/share/classes/java/util/stream/IntPipeline.java b/src/java.base/share/classes/java/util/stream/IntPipeline.java
index f0d019c7d74a9..83a978d6f6837 100644
--- a/src/java.base/share/classes/java/util/stream/IntPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/IntPipeline.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -171,10 +171,10 @@ final Node.Builder<Integer> makeNodeBuilder(long exactSizeIfKnown,
}
private <U> Stream<U> mapToObj(IntFunction<? extends U> mapper, int opFlags) {
- return new ReferencePipeline.StatelessOp<Integer, U>(this, StreamShape.INT_VALUE, opFlags) {
+ return new ReferencePipeline.StatelessOp<>(this, StreamShape.INT_VALUE, opFlags) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<U> sink) {
- return new Sink.ChainedInt<U>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void accept(int t) {
downstream.accept(mapper.apply(t));
@@ -200,10 +200,10 @@ public final Spliterator.OfInt spliterator() {
@Override
public final LongStream asLongStream() {
- return new LongPipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE, 0) {
+ return new LongPipeline.StatelessOp<>(this, StreamShape.INT_VALUE, 0) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedInt<Long>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void accept(int t) {
downstream.accept((long) t);
@@ -215,10 +215,10 @@ public void accept(int t) {
@Override
public final DoubleStream asDoubleStream() {
- return new DoublePipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE, 0) {
+ return new DoublePipeline.StatelessOp<>(this, StreamShape.INT_VALUE, 0) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedInt<Double>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void accept(int t) {
downstream.accept((double) t);
@@ -236,11 +236,11 @@ public final Stream<Integer> boxed() {
@Override
public final IntStream map(IntUnaryOperator mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new StatelessOp<>(this, StreamShape.INT_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt<Integer>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void accept(int t) {
downstream.accept(mapper.applyAsInt(t));
@@ -259,11 +259,11 @@ public final <U> Stream<U> mapToObj(IntFunction<? extends U> mapper) {
@Override
public final LongStream mapToLong(IntToLongFunction mapper) {
Objects.requireNonNull(mapper);
- return new LongPipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new LongPipeline.StatelessOp<>(this, StreamShape.INT_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedInt<Long>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void accept(int t) {
downstream.accept(mapper.applyAsLong(t));
@@ -276,11 +276,11 @@ public void accept(int t) {
@Override
public final DoubleStream mapToDouble(IntToDoubleFunction mapper) {
Objects.requireNonNull(mapper);
- return new DoublePipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new DoublePipeline.StatelessOp<>(this, StreamShape.INT_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedInt<Double>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void accept(int t) {
downstream.accept(mapper.applyAsDouble(t));
@@ -293,11 +293,11 @@ public void accept(int t) {
@Override
public final IntStream flatMap(IntFunction<? extends IntStream> mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.INT_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt<Integer>(sink) {
+ return new Sink.ChainedInt<>(sink) {
// true if cancellationRequested() has been called
boolean cancellationRequestedCalled;
@@ -315,10 +315,10 @@ public void accept(int t) {
if (result != null) {
if (!cancellationRequestedCalled) {
result.sequential().forEach(downstreamAsInt);
- }
- else {
+ } else {
var s = result.sequential().spliterator();
- do { } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsInt));
+ do {
+ } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsInt));
}
}
}
@@ -366,7 +366,7 @@ public void accept(int t) {
public IntStream unordered() {
if (!isOrdered())
return this;
- return new StatelessOp<Integer>(this, StreamShape.INT_VALUE, StreamOpFlag.NOT_ORDERED) {
+ return new StatelessOp<>(this, StreamShape.INT_VALUE, StreamOpFlag.NOT_ORDERED) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
return sink;
@@ -377,11 +377,11 @@ Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
@Override
public final IntStream filter(IntPredicate predicate) {
Objects.requireNonNull(predicate);
- return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
- StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.INT_VALUE,
+ StreamOpFlag.NOT_SIZED) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt<Integer>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -400,11 +400,11 @@ public void accept(int t) {
@Override
public final IntStream peek(IntConsumer action) {
Objects.requireNonNull(action);
- return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
- 0) {
+ return new StatelessOp<>(this, StreamShape.INT_VALUE,
+ 0) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt<Integer>(sink) {
+ return new Sink.ChainedInt<>(sink) {
@Override
public void accept(int t) {
action.accept(t);
diff --git a/src/java.base/share/classes/java/util/stream/LongPipeline.java b/src/java.base/share/classes/java/util/stream/LongPipeline.java
index 227a071100aff..07463e679c773 100644
--- a/src/java.base/share/classes/java/util/stream/LongPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/LongPipeline.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -168,10 +168,10 @@ final Node.Builder<Long> makeNodeBuilder(long exactSizeIfKnown, IntFunction<Long
}
private <U> Stream<U> mapToObj(LongFunction<? extends U> mapper, int opFlags) {
- return new ReferencePipeline.StatelessOp<Long, U>(this, StreamShape.LONG_VALUE, opFlags) {
+ return new ReferencePipeline.StatelessOp<>(this, StreamShape.LONG_VALUE, opFlags) {
@Override
Sink<Long> opWrapSink(int flags, Sink<U> sink) {
- return new Sink.ChainedLong<U>(sink) {
+ return new Sink.ChainedLong<>(sink) {
@Override
public void accept(long t) {
downstream.accept(mapper.apply(t));
@@ -197,10 +197,10 @@ public final Spliterator.OfLong spliterator() {
@Override
public final DoubleStream asDoubleStream() {
- return new DoublePipeline.StatelessOp<Long>(this, StreamShape.LONG_VALUE, StreamOpFlag.NOT_DISTINCT) {
+ return new DoublePipeline.StatelessOp<>(this, StreamShape.LONG_VALUE, StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedLong<Double>(sink) {
+ return new Sink.ChainedLong<>(sink) {
@Override
public void accept(long t) {
downstream.accept((double) t);
@@ -218,11 +218,11 @@ public final Stream<Long> boxed() {
@Override
public final LongStream map(LongUnaryOperator mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new StatelessOp<>(this, StreamShape.LONG_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong<Long>(sink) {
+ return new Sink.ChainedLong<>(sink) {
@Override
public void accept(long t) {
downstream.accept(mapper.applyAsLong(t));
@@ -241,11 +241,11 @@ public final <U> Stream<U> mapToObj(LongFunction<? extends U> mapper) {
@Override
public final IntStream mapToInt(LongToIntFunction mapper) {
Objects.requireNonNull(mapper);
- return new IntPipeline.StatelessOp<Long>(this, StreamShape.LONG_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new IntPipeline.StatelessOp<>(this, StreamShape.LONG_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedLong<Integer>(sink) {
+ return new Sink.ChainedLong<>(sink) {
@Override
public void accept(long t) {
downstream.accept(mapper.applyAsInt(t));
@@ -258,11 +258,11 @@ public void accept(long t) {
@Override
public final DoubleStream mapToDouble(LongToDoubleFunction mapper) {
Objects.requireNonNull(mapper);
- return new DoublePipeline.StatelessOp<Long>(this, StreamShape.LONG_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new DoublePipeline.StatelessOp<>(this, StreamShape.LONG_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedLong<Double>(sink) {
+ return new Sink.ChainedLong<>(sink) {
@Override
public void accept(long t) {
downstream.accept(mapper.applyAsDouble(t));
@@ -275,11 +275,11 @@ public void accept(long t) {
@Override
public final LongStream flatMap(LongFunction<? extends LongStream> mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.LONG_VALUE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong<Long>(sink) {
+ return new Sink.ChainedLong<>(sink) {
// true if cancellationRequested() has been called
boolean cancellationRequestedCalled;
@@ -297,10 +297,10 @@ public void accept(long t) {
if (result != null) {
if (!cancellationRequestedCalled) {
result.sequential().forEach(downstreamAsLong);
- }
- else {
+ } else {
var s = result.sequential().spliterator();
- do { } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsLong));
+ do {
+ } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsLong));
}
}
}
@@ -348,7 +348,7 @@ public void accept(long t) {
public LongStream unordered() {
if (!isOrdered())
return this;
- return new StatelessOp<Long>(this, StreamShape.LONG_VALUE, StreamOpFlag.NOT_ORDERED) {
+ return new StatelessOp<>(this, StreamShape.LONG_VALUE, StreamOpFlag.NOT_ORDERED) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
return sink;
@@ -359,11 +359,11 @@ Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
@Override
public final LongStream filter(LongPredicate predicate) {
Objects.requireNonNull(predicate);
- return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
- StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.LONG_VALUE,
+ StreamOpFlag.NOT_SIZED) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong<Long>(sink) {
+ return new Sink.ChainedLong<>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -382,11 +382,11 @@ public void accept(long t) {
@Override
public final LongStream peek(LongConsumer action) {
Objects.requireNonNull(action);
- return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
- 0) {
+ return new StatelessOp<>(this, StreamShape.LONG_VALUE,
+ 0) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong<Long>(sink) {
+ return new Sink.ChainedLong<>(sink) {
@Override
public void accept(long t) {
action.accept(t);
diff --git a/src/java.base/share/classes/java/util/stream/ReferencePipeline.java b/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
index bdc9e7eab3d72..e0b9c79025b0d 100644
--- a/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
+++ b/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -152,7 +152,7 @@ public final Iterator<P_OUT> iterator() {
public Stream<P_OUT> unordered() {
if (!isOrdered())
return this;
- return new StatelessOp<P_OUT, P_OUT>(this, StreamShape.REFERENCE, StreamOpFlag.NOT_ORDERED) {
+ return new StatelessOp<>(this, StreamShape.REFERENCE, StreamOpFlag.NOT_ORDERED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
return sink;
@@ -163,11 +163,11 @@ Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
@Override
public final Stream<P_OUT> filter(Predicate<? super P_OUT> predicate) {
Objects.requireNonNull(predicate);
- return new StatelessOp<P_OUT, P_OUT>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
- return new Sink.ChainedReference<P_OUT, P_OUT>(sink) {
+ return new Sink.ChainedReference<>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -187,11 +187,11 @@ public void accept(P_OUT u) {
@SuppressWarnings("unchecked")
public final <R> Stream<R> map(Function<? super P_OUT, ? extends R> mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<P_OUT, R>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<R> sink) {
- return new Sink.ChainedReference<P_OUT, R>(sink) {
+ return new Sink.ChainedReference<>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.apply(u));
@@ -204,11 +204,11 @@ public void accept(P_OUT u) {
@Override
public final IntStream mapToInt(ToIntFunction<? super P_OUT> mapper) {
Objects.requireNonNull(mapper);
- return new IntPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new IntPipeline.StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedReference<P_OUT, Integer>(sink) {
+ return new Sink.ChainedReference<>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.applyAsInt(u));
@@ -221,11 +221,11 @@ public void accept(P_OUT u) {
@Override
public final LongStream mapToLong(ToLongFunction<? super P_OUT> mapper) {
Objects.requireNonNull(mapper);
- return new LongPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new LongPipeline.StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedReference<P_OUT, Long>(sink) {
+ return new Sink.ChainedReference<>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.applyAsLong(u));
@@ -238,11 +238,11 @@ public void accept(P_OUT u) {
@Override
public final DoubleStream mapToDouble(ToDoubleFunction<? super P_OUT> mapper) {
Objects.requireNonNull(mapper);
- return new DoublePipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+ return new DoublePipeline.StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedReference<P_OUT, Double>(sink) {
+ return new Sink.ChainedReference<>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.applyAsDouble(u));
@@ -255,8 +255,8 @@ public void accept(P_OUT u) {
@Override
public final <R> Stream<R> flatMap(Function<? super P_OUT, ? extends Stream<? extends R>> mapper) {
Objects.requireNonNull(mapper);
- return new StatelessOp<P_OUT, R>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+ return new StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<R> sink) {
return new Sink.ChainedReference<>(sink) {
@@ -274,10 +274,10 @@ public void accept(P_OUT u) {
if (result != null) {
if (!cancellationRequestedCalled) {
result.sequential().forEach(downstream);
- }
- else {
+ } else {
var s = result.sequential().spliterator();
- do { } while (!downstream.cancellationRequested() && s.tryAdvance(downstream));
+ do {
+ } while (!downstream.cancellationRequested() && s.tryAdvance(downstream));
}
}
}
@@ -300,11 +300,11 @@ public boolean cancellationRequested() {
@Override
public final IntStream flatMapToInt(Function<? super P_OUT, ? extends IntStream> mapper) {
Objects.requireNonNull(mapper);
- return new IntPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+ return new IntPipeline.StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedReference<P_OUT, Integer>(sink) {
+ return new Sink.ChainedReference<>(sink) {
// true if cancellationRequested() has been called
boolean cancellationRequestedCalled;
@@ -322,10 +322,10 @@ public void accept(P_OUT u) {
if (result != null) {
if (!cancellationRequestedCalled) {
result.sequential().forEach(downstreamAsInt);
- }
- else {
+ } else {
var s = result.sequential().spliterator();
- do { } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsInt));
+ do {
+ } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsInt));
}
}
}
@@ -344,11 +344,11 @@ public boolean cancellationRequested() {
@Override
public final DoubleStream flatMapToDouble(Function<? super P_OUT, ? extends DoubleStream> mapper) {
Objects.requireNonNull(mapper);
- return new DoublePipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+ return new DoublePipeline.StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedReference<P_OUT, Double>(sink) {
+ return new Sink.ChainedReference<>(sink) {
// true if cancellationRequested() has been called
boolean cancellationRequestedCalled;
@@ -366,10 +366,10 @@ public void accept(P_OUT u) {
if (result != null) {
if (!cancellationRequestedCalled) {
result.sequential().forEach(downstreamAsDouble);
- }
- else {
+ } else {
var s = result.sequential().spliterator();
- do { } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsDouble));
+ do {
+ } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsDouble));
}
}
}
@@ -389,11 +389,11 @@ public boolean cancellationRequested() {
public final LongStream flatMapToLong(Function<? super P_OUT, ? extends LongStream> mapper) {
Objects.requireNonNull(mapper);
// We can do better than this, by polling cancellationRequested when stream is infinite
- return new LongPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
- StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+ return new LongPipeline.StatelessOp<>(this, StreamShape.REFERENCE,
+ StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedReference<P_OUT, Long>(sink) {
+ return new Sink.ChainedReference<>(sink) {
// true if cancellationRequested() has been called
boolean cancellationRequestedCalled;
@@ -411,10 +411,10 @@ public void accept(P_OUT u) {
if (result != null) {
if (!cancellationRequestedCalled) {
result.sequential().forEach(downstreamAsLong);
- }
- else {
+ } else {
var s = result.sequential().spliterator();
- do { } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsLong));
+ do {
+ } while (!downstream.cancellationRequested() && s.tryAdvance(downstreamAsLong));
}
}
}
@@ -530,11 +530,11 @@ public void accept(P_OUT u) {
@Override
public final Stream<P_OUT> peek(Consumer<? super P_OUT> action) {
Objects.requireNonNull(action);
- return new StatelessOp<P_OUT, P_OUT>(this, StreamShape.REFERENCE,
- 0) {
+ return new StatelessOp<>(this, StreamShape.REFERENCE,
+ 0) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
- return new Sink.ChainedReference<P_OUT, P_OUT>(sink) {
+ return new Sink.ChainedReference<>(sink) {
@Override
public void accept(P_OUT u) {
action.accept(u);
diff --git a/src/java.base/share/classes/java/util/stream/Stream.java b/src/java.base/share/classes/java/util/stream/Stream.java
index 4b1289470f196..284ec632d7425 100644
--- a/src/java.base/share/classes/java/util/stream/Stream.java
+++ b/src/java.base/share/classes/java/util/stream/Stream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1384,7 +1384,7 @@ public static<T> Builder<T> builder() {
* @return an empty sequential stream
*/
public static<T> Stream<T> empty() {
- return StreamSupport.stream(Spliterators.<T>emptySpliterator(), false);
+ return StreamSupport.stream(Spliterators.emptySpliterator(), false);
}
/**
diff --git a/src/java.base/share/classes/java/util/stream/WhileOps.java b/src/java.base/share/classes/java/util/stream/WhileOps.java
index 684b52f3be2b9..27e93515af78a 100644
--- a/src/java.base/share/classes/java/util/stream/WhileOps.java
+++ b/src/java.base/share/classes/java/util/stream/WhileOps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,15 +61,14 @@ final class WhileOps {
static <T> Stream<T> makeTakeWhileRef(AbstractPipeline<?, T, ?> upstream,
Predicate<? super T> predicate) {
Objects.requireNonNull(predicate);
- return new ReferencePipeline.StatefulOp<T, T>(upstream, StreamShape.REFERENCE, TAKE_FLAGS) {
+ return new ReferencePipeline.StatefulOp<>(upstream, StreamShape.REFERENCE, TAKE_FLAGS) {
@Override
<P_IN> Spliterator<T> opEvaluateParallelLazy(PipelineHelper<T> helper,
Spliterator<P_IN> spliterator) {
if (StreamOpFlag.ORDERED.isKnown(helper.getStreamAndOpFlags())) {
return opEvaluateParallel(helper, spliterator, Nodes.castingArray())
.spliterator();
- }
- else {
+ } else {
return new UnorderedWhileSpliterator.OfRef.Taking<>(
helper.wrapSpliterator(spliterator), false, predicate);
}
@@ -85,7 +84,7 @@ <P_IN> Node<T> opEvaluateParallel(PipelineHelper<T> helper,
@Override
Sink<T> opWrapSink(int flags, Sink<T> sink) {
- return new Sink.ChainedReference<T, T>(sink) {
+ return new Sink.ChainedReference<>(sink) {
boolean take = true;
@Override
@@ -118,15 +117,14 @@ public boolean cancellationRequested() {
static IntStream makeTakeWhileInt(AbstractPipeline<?, Integer, ?> upstream,
IntPredicate predicate) {
Objects.requireNonNull(predicate);
- return new IntPipeline.StatefulOp<Integer>(upstream, StreamShape.INT_VALUE, TAKE_FLAGS) {
+ return new IntPipeline.StatefulOp<>(upstream, StreamShape.INT_VALUE, TAKE_FLAGS) {
@Override
<P_IN> Spliterator<Integer> opEvaluateParallelLazy(PipelineHelper<Integer> helper,
Spliterator<P_IN> spliterator) {
if (StreamOpFlag.ORDERED.isKnown(helper.getStreamAndOpFlags())) {
return opEvaluateParallel(helper, spliterator, Integer[]::new)
.spliterator();
- }
- else {
+ } else {
return new UnorderedWhileSpliterator.OfInt.Taking(
(Spliterator.OfInt) helper.wrapSpliterator(spliterator), false, predicate);
}
@@ -142,7 +140,7 @@ <P_IN> Node<Integer> opEvaluateParallel(PipelineHelper<Integer> helper,
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt<Integer>(sink) {
+ return new Sink.ChainedInt<>(sink) {
boolean take = true;
@Override
@@ -175,15 +173,14 @@ public boolean cancellationRequested() {
static LongStream makeTakeWhileLong(AbstractPipeline<?, Long, ?> upstream,
LongPredicate predicate) {
Objects.requireNonNull(predicate);
- return new LongPipeline.StatefulOp<Long>(upstream, StreamShape.LONG_VALUE, TAKE_FLAGS) {
+ return new LongPipeline.StatefulOp<>(upstream, StreamShape.LONG_VALUE, TAKE_FLAGS) {
@Override
<P_IN> Spliterator<Long> opEvaluateParallelLazy(PipelineHelper<Long> helper,
Spliterator<P_IN> spliterator) {
if (StreamOpFlag.ORDERED.isKnown(helper.getStreamAndOpFlags())) {
return opEvaluateParallel(helper, spliterator, Long[]::new)
.spliterator();
- }
- else {
+ } else {
return new UnorderedWhileSpliterator.OfLong.Taking(
(Spliterator.OfLong) helper.wrapSpliterator(spliterator), false, predicate);
}
@@ -199,7 +196,7 @@ <P_IN> Node<Long> opEvaluateParallel(PipelineHelper<Long> helper,
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong<Long>(sink) {
+ return new Sink.ChainedLong<>(sink) {
boolean take = true;
@Override
@@ -232,15 +229,14 @@ public boolean cancellationRequested() {
static DoubleStream makeTakeWhileDouble(AbstractPipeline<?, Double, ?> upstream,
DoublePredicate predicate) {
Objects.requireNonNull(predicate);
- return new DoublePipeline.StatefulOp<Double>(upstream, StreamShape.DOUBLE_VALUE, TAKE_FLAGS) {
+ return new DoublePipeline.StatefulOp<>(upstream, StreamShape.DOUBLE_VALUE, TAKE_FLAGS) {
@Override
<P_IN> Spliterator<Double> opEvaluateParallelLazy(PipelineHelper<Double> helper,
Spliterator<P_IN> spliterator) {
if (StreamOpFlag.ORDERED.isKnown(helper.getStreamAndOpFlags())) {
return opEvaluateParallel(helper, spliterator, Double[]::new)
.spliterator();
- }
- else {
+ } else {
return new UnorderedWhileSpliterator.OfDouble.Taking(
(Spliterator.OfDouble) helper.wrapSpliterator(spliterator), false, predicate);
}
@@ -256,7 +252,7 @@ <P_IN> Node<Double> opEvaluateParallel(PipelineHelper<Double> helper,
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble<Double>(sink) {
+ return new Sink.ChainedDouble<>(sink) {
boolean take = true;
@Override