Skip to content

Commit 376ea9b

Browse files
committed
Format the rest
1 parent d3c0773 commit 376ea9b

File tree

2 files changed

+40
-39
lines changed

2 files changed

+40
-39
lines changed

src/java.base/share/classes/java/util/stream/Collectors.java

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -328,16 +328,16 @@ static <T, A, R> CollectorImpl<T, A, R> of(Supplier<A> supplier,
328328
public static <T>
329329
Collector<T, ?, Set<T>> toSet() {
330330
return CollectorImpl.ofUnsized(HashSet::new, Set::add,
331-
(left, right) -> {
332-
if (left.size() < right.size()) {
333-
right.addAll(left);
334-
return right;
335-
} else {
336-
left.addAll(right);
337-
return left;
338-
}
339-
},
340-
CH_UNORDERED_ID);
331+
(left, right) -> {
332+
if (left.size() < right.size()) {
333+
right.addAll(left);
334+
return right;
335+
} else {
336+
left.addAll(right);
337+
return left;
338+
}
339+
},
340+
CH_UNORDERED_ID);
341341
}
342342

343343
/**
@@ -359,17 +359,17 @@ static <T, A, R> CollectorImpl<T, A, R> of(Supplier<A> supplier,
359359
public static <T>
360360
Collector<T, ?, Set<T>> toUnmodifiableSet() {
361361
return CollectorImpl.ofUnsized(HashSet::new, Set::add,
362-
(left, right) -> {
363-
if (left.size() < right.size()) {
364-
right.addAll(left);
365-
return right;
366-
} else {
367-
left.addAll(right);
368-
return left;
369-
}
370-
},
371-
set -> (Set<T>) Set.of(set.toArray()),
372-
CH_UNORDERED_NOID);
362+
(left, right) -> {
363+
if (left.size() < right.size()) {
364+
right.addAll(left);
365+
return right;
366+
} else {
367+
left.addAll(right);
368+
return left;
369+
}
370+
},
371+
set -> (Set<T>) Set.of(set.toArray()),
372+
CH_UNORDERED_NOID);
373373
}
374374

375375
/**
@@ -380,12 +380,13 @@ static <T, A, R> CollectorImpl<T, A, R> of(Supplier<A> supplier,
380380
* {@code String}, in encounter order
381381
*/
382382
public static Collector<CharSequence, ?, String> joining() {
383-
return CollectorImpl.ofUnsized(StringBuilder::new, StringBuilder::append,
384-
(r1, r2) -> {
385-
r1.append(r2);
386-
return r1;
387-
},
388-
StringBuilder::toString, CH_NOID);
383+
return CollectorImpl.ofUnsized(
384+
StringBuilder::new, StringBuilder::append,
385+
(r1, r2) -> {
386+
r1.append(r2);
387+
return r1;
388+
},
389+
StringBuilder::toString, CH_NOID);
389390
}
390391

391392
/**
@@ -417,10 +418,10 @@ static <T, A, R> CollectorImpl<T, A, R> of(Supplier<A> supplier,
417418
CharSequence prefix,
418419
CharSequence suffix) {
419420
return CollectorImpl.of(
420-
() -> new StringJoiner(delimiter, prefix, suffix),
421-
exactSize -> new StringJoiner(delimiter, prefix, suffix, exactSize),
422-
StringJoiner::add, StringJoiner::merge,
423-
StringJoiner::toString, CH_NOID);
421+
() -> new StringJoiner(delimiter, prefix, suffix),
422+
exactSize -> new StringJoiner(delimiter, prefix, suffix, exactSize),
423+
StringJoiner::add, StringJoiner::merge,
424+
StringJoiner::toString, CH_NOID);
424425
}
425426

426427
/**
@@ -476,7 +477,7 @@ BinaryOperator<M> mapMerger(BinaryOperator<V> mergeFunction) {
476477
Collector<? super U, A, R> downstream) {
477478
BiConsumer<A, ? super U> downstreamAccumulator = downstream.accumulator();
478479
return new CollectorImpl<>(downstream.supplier(), downstream.sizedSupplier(),
479-
(r, t) -> downstreamAccumulator.accept(r, mapper.apply(t)),
480+
(r, t) -> downstreamAccumulator.accept(r, mapper.apply(t)),
480481
downstream.combiner(), downstream.finisher(),
481482
downstream.characteristics());
482483
}
@@ -612,7 +613,7 @@ public static<T,A,R,RR> Collector<T,A,RR> collectingAndThen(Collector<T,A,R> dow
612613
}
613614
}
614615
return new CollectorImpl<>(downstream.supplier(), downstream.sizedSupplier(),
615-
downstream.accumulator(),
616+
downstream.accumulator(),
616617
downstream.combiner(),
617618
downstream.finisher().andThen(finisher),
618619
characteristics);
@@ -1487,10 +1488,10 @@ public void accept(T t) {
14871488
// uniqKeysMapMerger() throws if duplicate keys are encountered, so
14881489
// presizing is generally beneficial.
14891490
return CollectorImpl.of(HashMap::new,
1490-
HashMap::newHashMap,
1491-
uniqKeysMapAccumulator(keyMapper, valueMapper),
1492-
uniqKeysMapMerger(),
1493-
CH_ID);
1491+
HashMap::newHashMap,
1492+
uniqKeysMapAccumulator(keyMapper, valueMapper),
1493+
uniqKeysMapMerger(),
1494+
CH_ID);
14941495
}
14951496

14961497
/**

src/java.base/share/classes/java/util/stream/GathererOp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@ protected Hybrid(Spliterator<T> spliterator) {
468468
this.targetSize =
469469
AbstractTask.suggestTargetSize(estimatedSize);
470470
this.localResult = new Sequential(spliterator.hasCharacteristics(Spliterator.SIZED)
471-
? estimatedSize
472-
: -1);
471+
? estimatedSize
472+
: -1);
473473
this.cancelled = greedy ? null : new AtomicBoolean(false);
474474
this.leftPredecessor = null;
475475
}

0 commit comments

Comments
 (0)