From 680ad52f0c62b0b3bf624165847fad724e00ba32 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Tue, 18 Oct 2022 09:52:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:trollface:=20=E5=8E=BB=E6=8E=89transform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/core/stream/EasyStream.java | 12 ------------ .../main/java/cn/hutool/core/stream/EntryStream.java | 12 ------------ .../core/stream/TransformableWrappedStream.java | 4 ++-- .../java/cn/hutool/core/stream/WrappedStream.java | 8 -------- .../stream/AbstractEnhancedWrappedStreamTest.java | 12 ------------ 5 files changed, 2 insertions(+), 46 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java index d6ff7879b..4570b25fe 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java @@ -263,18 +263,6 @@ public class EasyStream extends AbstractEnhancedWrappedStream(stream); } - /** - * 转换为子类实现 - * - * @param stream 流 - * @return 子类实现 - */ - @Override - public EasyStream transform(Stream stream) { - this.stream = stream; - return this; - } - /** * 建造者 * diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/EntryStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/EntryStream.java index d31d9e2b7..f712f40fd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/EntryStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/stream/EntryStream.java @@ -756,18 +756,6 @@ public class EntryStream extends AbstractEnhancedWrappedStream(stream); } - /** - * 转换为子类实现 - * - * @param stream 流 - * @return 子类实现 - */ - @Override - public EntryStream transform(Stream> stream) { - this.stream = stream; - return this; - } - /** * key重复时直接抛出异常 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java index ef85e8ad1..ea2926c70 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java @@ -269,7 +269,7 @@ public interface TransformableWrappedStream idxMap = easyStream().toIdxMap(); - return transform(EasyStream.of(idxMap.entrySet()) + return wrap(EasyStream.of(idxMap.entrySet()) .parallel(isParallel()) .peek(e -> action.accept(e.getValue(), e.getKey())) .map(Map.Entry::getValue)); @@ -373,7 +373,7 @@ public interface TransformableWrappedStream idxMap = easyStream().toIdxMap(); - return transform(EasyStream.of(idxMap.entrySet()) + return wrap(EasyStream.of(idxMap.entrySet()) .parallel(isParallel()) .filter(e -> predicate.test(e.getValue(), e.getKey())) .map(Map.Entry::getValue)); diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java index e89f03262..48e0da2cc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java @@ -603,12 +603,4 @@ public interface WrappedStream> extends Stream< } } - /** - * 转换为子类实现 - * - * @param stream 流 - * @return 子类实现 - */ - S transform(Stream stream); - } diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java index 4071bd502..de5b853c9 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java @@ -704,18 +704,6 @@ public class AbstractEnhancedWrappedStreamTest { return new Wrapper<>(source); } - /** - * 转换为子类实现 - * - * @param stream 流 - * @return 子类实现 - */ - @Override - public Wrapper transform(final Stream stream) { - this.stream = stream; - return this; - } - } @Setter From fa089a2a67b970a1fc1e914189772cfbb39c5d42 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Tue, 18 Oct 2022 10:36:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:trollface:=20=E5=8E=BB=E6=8E=89transform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hutool/core/stream/TerminableWrappedStream.java | 12 ------------ .../stream/AbstractEnhancedWrappedStreamTest.java | 8 ++------ .../java/cn/hutool/core/stream/EasyStreamTest.java | 9 --------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java index 4dbef1997..479c86f47 100644 --- a/hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java @@ -289,18 +289,6 @@ public interface TerminableWrappedStream 转换类型 - * @param transform 转换 - * @return 转换后的流 - */ - default Optional transform(final Function transform) { - Objects.requireNonNull(transform); - return Optional.ofNullable(transform.apply(wrap(this))); - } - /** * 获取与给定断言匹配的第一个元素 * diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java index de5b853c9..afc8a1c4f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/stream/AbstractEnhancedWrappedStreamTest.java @@ -97,12 +97,6 @@ public class AbstractEnhancedWrappedStreamTest { }, toZip); } - @Test - public void testTransform() { - final List list = wrap(1, 2, 3).transform(Wrapper::toList).orElse(null); - Assert.assertEquals(asList(1, 2, 3), list); - } - @Test public void testFindFirst() { final List list = asList(1, 2, 3); @@ -181,6 +175,7 @@ public class AbstractEnhancedWrappedStreamTest { final List list = asList(1, 2, 3); final Map> map = new HashMap>() { private static final long serialVersionUID = 1L; + { put(Boolean.TRUE, singletonList(2)); put(Boolean.FALSE, asList(1, 3)); @@ -624,6 +619,7 @@ public class AbstractEnhancedWrappedStreamTest { public void testToEntries() { final Map expect = new HashMap() { private static final long serialVersionUID = 1L; + { put(1, 1); put(2, 2); diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/EasyStreamTest.java b/hutool-core/src/test/java/cn/hutool/core/stream/EasyStreamTest.java index de43e3b4b..c5128e2f4 100644 --- a/hutool-core/src/test/java/cn/hutool/core/stream/EasyStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/stream/EasyStreamTest.java @@ -556,13 +556,4 @@ public class EasyStreamTest { } } - @Test - public void testTransform() { - final boolean result = EasyStream.of(1, 2, 3) - .transform(EasyStream::toList) - .map(List::isEmpty) - .orElse(false); - Assert.assertFalse(result); - } - }