Skip to content

Commit 7aa5d08

Browse files
committed
删除过期方法
1 parent 0fd68fc commit 7aa5d08

File tree

2 files changed

+5
-57
lines changed

2 files changed

+5
-57
lines changed

src/main/java/com/github/sd4324530/jtuple/Tuple.java

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.util.stream.Collectors;
88
import java.util.stream.IntStream;
99
import java.util.stream.Stream;
10-
import java.util.stream.StreamSupport;
1110

1211
import static java.util.Objects.isNull;
1312
import static java.util.Objects.requireNonNull;
@@ -94,7 +93,7 @@ public final Spliterator<Object> spliterator() {
9493
* @return 流
9594
*/
9695
public final Stream<Object> stream() {
97-
return StreamSupport.stream(spliterator(), false);
96+
return this.valueList.stream();
9897
}
9998

10099
/**
@@ -103,7 +102,7 @@ public final Stream<Object> stream() {
103102
* @return 流
104103
*/
105104
public final Stream<Object> parallelStream() {
106-
return StreamSupport.stream(spliterator(), true);
105+
return this.valueList.parallelStream();
107106
}
108107

109108
/**
@@ -242,32 +241,4 @@ public final String toString() {
242241
* @return 反转后的元组
243242
*/
244243
public abstract Tuple swap();
245-
246-
/**
247-
* 从一个列表生成一个元组
248-
*
249-
* @param list 列表
250-
* @return 元组
251-
* @deprecated 此方法有些多余,会在未来版本删除,可以直接使用各个元组类的with系列方法,比如{@link Tuple2#with(List)}
252-
*/
253-
@Deprecated
254-
public static Tuple withList(final List<Object> list) {
255-
requireNonNull(list, "list is null");
256-
switch (list.size()) {
257-
case 0:
258-
return Tuple0.with();
259-
case 1:
260-
return Tuple1.with(list.get(0));
261-
case 2:
262-
return Tuple2.with(list.get(0), list.get(1));
263-
case 3:
264-
return Tuple3.with(list.get(0), list.get(1), list.get(2));
265-
case 4:
266-
return Tuple4.with(list.get(0), list.get(1), list.get(2), list.get(3));
267-
case 5:
268-
return Tuple5.with(list.get(0), list.get(1), list.get(2), list.get(3), list.get(4));
269-
default:
270-
return TupleN.withList(list);
271-
}
272-
}
273244
}

src/test/java/com/github/sd4324530/jtuple/TupleTest.java

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ public void testForeach() {
2828
TupleN tuple = TupleN.with("hello", 123, true, 186.5, null);
2929
log.debug("foreach:");
3030
tuple.forEach(o -> log.debug(Objects.toString(o)));
31+
for (Object object : tuple) {
32+
log.debug(Objects.toString(object));
33+
}
3134
}
3235

3336
@Test
@@ -168,30 +171,4 @@ public void testHashCode() {
168171
Tuple2 tuple2 = Tuple2.with("hello", 123);
169172
log.debug("hashCode:{}", tuple2.hashCode());
170173
}
171-
172-
@Deprecated
173-
@Test
174-
public void testWithList() {
175-
List<Object> list = new ArrayList<>();
176-
Tuple tuple0 = Tuple.withList(list);
177-
log.debug("tuple0:{}", tuple0.toString());
178-
list.add("test");
179-
Tuple tuple1 = Tuple.withList(list);
180-
log.debug("tuple1:{}", tuple1.toString());
181-
list.add(123);
182-
Tuple tuple2 = Tuple.withList(list);
183-
log.debug("tuple2:{}", tuple2.toString());
184-
list.add(true);
185-
Tuple tuple3 = Tuple.withList(list);
186-
log.debug("tuple3:{}", tuple3.toString());
187-
list.add(186.5);
188-
Tuple tuple4 = Tuple.withList(list);
189-
log.debug("tuple4:{}", tuple4.toString());
190-
list.add('D');
191-
Tuple tuple5 = Tuple.withList(list);
192-
log.debug("tuple5:{}", tuple5.toString());
193-
list.add(null);
194-
Tuple tuple6 = Tuple.withList(list);
195-
log.debug("tuple6:{}", tuple6.toString());
196-
}
197174
}

0 commit comments

Comments
 (0)