zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-09-07 15:53:33 +08:00
parent e21ca277c3
commit 58d1a9a92b
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
View File

@@ -342,7 +342,7 @@ public class EasyStream<T> extends AbstractEnhancedWrappedStream<T, EasyStream<T
Objects.requireNonNull(pIdValuesMap); Objects.requireNonNull(pIdValuesMap);
final MutableObj<Consumer<List<T>>> recursiveRef = new MutableObj<>(); final MutableObj<Consumer<List<T>>> recursiveRef = new MutableObj<>();
final Consumer<List<T>> recursive = values -> EasyStream.of(values, isParallel()).forEach(value -> { final Consumer<List<T>> recursive = values -> EasyStream.of(values, isParallel()).forEach(value -> {
List<T> children = pIdValuesMap.get(idGetter.apply(value)); final List<T> children = pIdValuesMap.get(idGetter.apply(value));
childrenSetter.accept(value, children); childrenSetter.accept(value, children);
recursiveRef.get().accept(children); recursiveRef.get().accept(children);
}); });

10
hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java
View File

@@ -173,10 +173,10 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
* @return map * @return map
*/ */
default <K, U, M extends Map<K, U>> M toMap( default <K, U, M extends Map<K, U>> M toMap(
final Function<? super T, ? extends K> keyMapper, final Function<? super T, ? extends K> keyMapper,
final Function<? super T, ? extends U> valueMapper, final Function<? super T, ? extends U> valueMapper,
final BinaryOperator<U> mergeFunction, final BinaryOperator<U> mergeFunction,
Supplier<M> mapSupplier) { final Supplier<M> mapSupplier) {
Objects.requireNonNull(keyMapper); Objects.requireNonNull(keyMapper);
Objects.requireNonNull(valueMapper); Objects.requireNonNull(valueMapper);
Objects.requireNonNull(mergeFunction); Objects.requireNonNull(mergeFunction);
@@ -205,7 +205,7 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
if (this.isParallel()) { if (this.isParallel()) {
final List<T> keyList = toList(); final List<T> keyList = toList();
final Map<T, R> map = new HashMap<>(keyList.size()); final Map<T, R> map = new HashMap<>(keyList.size());
for (T key : keyList) { for (final T key : keyList) {
map.put(key, iterator.hasNext() ? iterator.next() : null); map.put(key, iterator.hasNext() ? iterator.next() : null);
} }
return map; return map;

5
hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java
View File

@@ -155,6 +155,7 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
* @param items 放入值 * @param items 放入值
* @return 操作后的流 * @return 操作后的流
*/ */
@SuppressWarnings("unchecked")
default S splice(final int start, final int deleteCount, final T... items) { default S splice(final int start, final int deleteCount, final T... items) {
final List<T> elements = unwrap().collect(Collectors.toList()); final List<T> elements = unwrap().collect(Collectors.toList());
return wrap(ListUtil.splice(elements, start, deleteCount, items).stream()) return wrap(ListUtil.splice(elements, start, deleteCount, items).stream())
@@ -279,7 +280,7 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
if (isParallel()) { if (isParallel()) {
return peek(e -> action.accept(e, NOT_FOUND_ELEMENT_INDEX)); return peek(e -> action.accept(e, NOT_FOUND_ELEMENT_INDEX));
} else { } else {
AtomicInteger index = new AtomicInteger(NOT_FOUND_ELEMENT_INDEX); final AtomicInteger index = new AtomicInteger(NOT_FOUND_ELEMENT_INDEX);
return peek(e -> action.accept(e, index.incrementAndGet())); return peek(e -> action.accept(e, index.incrementAndGet()));
} }
} }
@@ -318,6 +319,7 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
* @param obj 元素 * @param obj 元素
* @return 流 * @return 流
*/ */
@SuppressWarnings({"SpellCheckingInspection", "unchecked"})
default S unshift(final T... obj) { default S unshift(final T... obj) {
Stream<T> result = unwrap(); Stream<T> result = unwrap();
if (ArrayUtil.isNotEmpty(obj)) { if (ArrayUtil.isNotEmpty(obj)) {
@@ -489,6 +491,7 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
Objects.requireNonNull(childrenGetter); Objects.requireNonNull(childrenGetter);
Objects.requireNonNull(childrenSetter); Objects.requireNonNull(childrenSetter);
final MutableObj<Function<T, EasyStream<T>>> recursiveRef = new MutableObj<>(); final MutableObj<Function<T, EasyStream<T>>> recursiveRef = new MutableObj<>();
@SuppressWarnings("unchecked")
final Function<T, EasyStream<T>> recursive = e -> EasyStream.of(childrenGetter.apply(e)) final Function<T, EasyStream<T>> recursive = e -> EasyStream.of(childrenGetter.apply(e))
.flat(recursiveRef.get()) .flat(recursiveRef.get())
.unshift(e); .unshift(e);

3
hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java
View File

@@ -269,6 +269,7 @@ public interface WrappedStream<T, S extends WrappedStream<T, S>> extends Stream<
@Override @Override
default <A> A[] toArray(final IntFunction<A[]> generator) { default <A> A[] toArray(final IntFunction<A[]> generator) {
Objects.requireNonNull(generator); Objects.requireNonNull(generator);
//noinspection SuspiciousToArrayCall
return unwrap().toArray(generator); return unwrap().toArray(generator);
} }
@@ -547,7 +548,7 @@ public interface WrappedStream<T, S extends WrappedStream<T, S>> extends Stream<
* @return 流 * @return 流
*/ */
@Override @Override
default S onClose(Runnable closeHandler) { default S onClose(final Runnable closeHandler) {
return wrap(unwrap().onClose(closeHandler)); return wrap(unwrap().onClose(closeHandler));
} }