Skip to content

Commit c476c7c

Browse files
lokiclokic
committed
refactor: rename class
1 parent 1c023fa commit c476c7c

12 files changed

Lines changed: 41 additions & 42 deletions

File tree

src/main/java/com/github/lokic/javaext/CollectorExt.java renamed to src/main/java/com/github/lokic/javaext/Collectors.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
import java.util.Map;
77
import java.util.function.Function;
88
import java.util.stream.Collector;
9-
import java.util.stream.Collectors;
109

11-
public class CollectorExt {
10+
public class Collectors {
1211

1312
public static class Reversed {
1413

@@ -31,7 +30,7 @@ public static class Reversed {
3130
* @return
3231
*/
3332
public static <T, R> Collector<T, ?, R> reversed(Function<List<T>, R> finisher) {
34-
return Collectors.collectingAndThen(Collectors.toList(), list -> {
33+
return java.util.stream.Collectors.collectingAndThen(java.util.stream.Collectors.toList(), list -> {
3534
Collections.reverse(list);
3635
return finisher.apply(list);
3736
});
@@ -72,7 +71,7 @@ public static class Distinct {
7271
* 基于 {@code keyExtractor} 进行去重，只保存第一个值，之后的都忽略。
7372
* <p>
7473
* Note：
75-
* 也可以使用 {@link PredicateExt#distinctByKey(Function)}，以获得更好的性能
74+
* 也可以使用 {@link Predicates#distinctByKey(Function)}，以获得更好的性能
7675
*
7776
* @param keyExtractor
7877
* @param <T>
@@ -85,16 +84,16 @@ public static class Distinct {
8584
private static <T> Collector<T, ?, List<T>> distinctByKey(
8685
Function<? super T, ?> keyExtractor, Order order, Function<List<T>, T> finisher) {
8786

88-
return Collectors.collectingAndThen(
89-
Collectors.groupingBy(
87+
return java.util.stream.Collectors.collectingAndThen(
88+
java.util.stream.Collectors.groupingBy(
9089
keyExtractor,
9190
() -> buildMap(order),
92-
Collectors.toList()
91+
java.util.stream.Collectors.toList()
9392
),
9493
res -> res.values()
9594
.stream()
9695
.map(finisher)
97-
.collect(Collectors.toList()));
96+
.collect(java.util.stream.Collectors.toList()));
9897
}
9998

10099
private static <K, V> Map<K, V> buildMap(Order order) {

src/main/java/com/github/lokic/javaext/ConsumerExt.java renamed to src/main/java/com/github/lokic/javaext/Consumers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.function.Consumer;
66
import java.util.function.Function;
77

8-
public class ConsumerExt {
8+
public class Consumers {
99

1010
/**
1111
* 在遍历的场景，可以通过该方法，在 {@code biConsumer} 中拿到遍历的下标

src/main/java/com/github/lokic/javaext/DateExt.java renamed to src/main/java/com/github/lokic/javaext/Dates.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.time.ZoneId;
66
import java.util.Date;
77

8-
public class DateExt {
8+
public class Dates {
99

1010
public static LocalDateTime dateToLocalDateTime(Date date) {
1111
Instant instant = date.toInstant();

src/main/java/com/github/lokic/javaext/FunctionExt.java renamed to src/main/java/com/github/lokic/javaext/Functions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
import java.util.function.BiFunction;
55
import java.util.function.Function;
66

7-
public class FunctionExt {
7+
public class Functions {
88

99
/**
1010
* 在某些遍历的场景，可以通过该方法，在 {@code biFunction} 中拿到遍历的下标
1111
*
1212
* <pre>{@code
1313
* List(...)
1414
* .stream()
15-
* .map(FunctionEx.mapWithIndex((index, item) -> {
15+
* .map(Functions.mapWithIndex((index, item) -> {
1616
* ...
1717
* })
1818
* }</pre>

src/main/java/com/github/lokic/javaext/OptionalExt.java renamed to src/main/java/com/github/lokic/javaext/Optionals.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.function.Consumer;
55
import java.util.function.Supplier;
66

7-
public class OptionalExt {
7+
public class Optionals {
88

99
/**
1010
* 在java8中，{@link Optional} 只有 {@link Optional#ifPresent(Consumer)} 和 {@link Optional#orElseGet(Supplier)}，
@@ -25,7 +25,7 @@ public class OptionalExt {
2525
* .run();}
2626
* </pre>
2727
* <p>
28-
* See also: 可以使用 {@link ConsumerExt#toRunnable(Consumer)} 转换Consumer到Runnable
28+
* See also: 可以使用 {@link Consumers#toRunnable(Consumer)} 转换Consumer到Runnable
2929
* <p>
3030
*
3131
* @param c

src/main/java/com/github/lokic/javaext/PredicateExt.java renamed to src/main/java/com/github/lokic/javaext/Predicates.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.function.Function;
66
import java.util.function.Predicate;
77

8-
public class PredicateExt {
8+
public class Predicates {
99

1010
/**
1111
* 基于 {@code keyExtractor}, 来进行去重，只保存第一个值，之后的都忽略。

src/main/java/com/github/lokic/javaext/StreamExt.java renamed to src/main/java/com/github/lokic/javaext/Streams.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* 对 {@link Stream} 进行的一些方法扩展
1313
*/
14-
public class StreamExt {
14+
public class Streams {
1515

1616
/**
1717
* 返回一个不包含null的Stream
@@ -22,7 +22,7 @@ public class StreamExt {
2222
*/
2323
public static <T> Stream<T> ofNullable(T... values) {
2424
return Stream.of(values)
25-
.flatMap(StreamExt::ofNullable);
25+
.flatMap(Streams::ofNullable);
2626
}
2727

2828
/**
@@ -38,7 +38,7 @@ public static <T> Stream<T> ofNullable(T... values) {
3838
public static <T> Stream<T> ofNullable(Optional<T>... optValues) {
3939
return Stream.of(optValues)
4040
.map(Objects::requireNonNull)
41-
.flatMap(StreamExt::ofNullable);
41+
.flatMap(Streams::ofNullable);
4242
}
4343

4444
/**

src/main/java/com/github/lokic/javaext/TypeExt.java renamed to src/main/java/com/github/lokic/javaext/Types.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.github.lokic.javaext;
22

3-
public class TypeExt {
3+
public class Types {
44

55
/**
66
* 更加优雅得进行类型转换。
77
* <p>
88
* 一些泛型类，如果需要进行转换，
99
* 使用 {@link Class#cast(Object)} 将无能为力，
10-
* 使用 {@code TypeEx#cast(Object)} 可以很方便地支持泛型类的转换。
10+
* 使用 {@code Types#cast(Object)} 可以很方便地支持泛型类的转换。
1111
* <p>
1212
* <p>
1313
* 如 {@code Optional<String>} 的转换，
1414
* 通过 {@code Optional.class#cast(Object)} 可以转换成Optional，但是泛型的String无法体现；
15-
* 通过 {@code TypeEx.<Optional<String>>cast(Object)} 可以很方便地支持 {@code Optional<String>} 的转换。
15+
* 通过 {@code Types.<Optional<String>>cast(Object)} 可以很方便地支持 {@code Optional<String>} 的转换。
1616
* <p>
1717
* Note:
1818
* 在赋值给变量的时候，由于有上下文的类型推导，可以很方便的写成如下：
@@ -23,7 +23,7 @@ public class TypeExt {
2323
* Optional<String> opt = (Optional<String>) o;
2424
*
2525
* // 现在的写法
26-
* Optional<String> opt = TypeEx.cast(o);
26+
* Optional<String> opt = Types.cast(o);
2727
* }</pre>
2828
* 可以看到，新的写法规避了 {@code Optional<String>} 的2次出现，其可以通过需要赋值的类型进行类型推导
2929
*

‎src/main/java/com/github/lokic/javaext/package-info.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* <p>
1818
* {@link java.util.function.Function}相关扩展：
1919
* <ul>
20-
* <li>{@link com.github.lokic.javaext.FunctionExt}
20+
* <li>{@link com.github.lokic.javaext.Functions}
2121
* <li>{@link com.github.lokic.javaext.func.sneakythrows.SneakyThrowFunction1}
2222
* <li>{@link com.github.lokic.javaext.func.sneakythrows.SneakyThrowFunction2}
2323
* <li>{@link com.github.lokic.javaext.func.sneakythrows.SneakyThrowFunction3}
@@ -28,7 +28,7 @@
2828
* <p>
2929
* {@link java.util.function.Consumer}相关扩展：
3030
* <ul>
31-
* <li>{@link com.github.lokic.javaext.ConsumerExt}
31+
* <li>{@link com.github.lokic.javaext.Consumers}
3232
* <li>{@link com.github.lokic.javaext.func.sneakythrows.SneakyThrowConsumer1}
3333
* <li>{@link com.github.lokic.javaext.func.tuple.TupleConsumer2}
3434
* <li>{@link com.github.lokic.javaext.func.tuple.TupleConsumer3}
@@ -42,12 +42,12 @@
4242
* <p>
4343
* {@link java.util.Optional} 相关扩展：
4444
* <ul>
45-
* <li>{@link com.github.lokic.javaext.OptionalExt}
45+
* <li>{@link com.github.lokic.javaext.Optionals}
4646
* </ul>
4747
* <p>
4848
* {@link java.util.stream.Stream} 相关扩展：
4949
* <ul>
50-
* <li>{@link com.github.lokic.javaext.StreamExt}
50+
* <li>{@link com.github.lokic.javaext.Streams}
5151
* </ul>
5252
* <p>
5353
* {@link java.lang.Enum} 相关扩展：
@@ -57,18 +57,18 @@
5757
* <p>
5858
* {@link java.util.function.Predicate} 相关扩展：
5959
* <ul>
60-
* <li>{@link com.github.lokic.javaext.PredicateExt}
60+
* <li>{@link com.github.lokic.javaext.Predicates}
6161
* </ul>
6262
* <p>
63-
* {@link com.github.lokic.javaext.CollectorExt} 相关扩展：
63+
* {@link com.github.lokic.javaext.Collectors} 相关扩展：
6464
* <ul>
65-
* <li>{@link com.github.lokic.javaext.CollectorExt.Reversed} 倒序
66-
* <li>{@link com.github.lokic.javaext.CollectorExt.Distinct} 去重
65+
* <li>{@link com.github.lokic.javaext.Collectors.Reversed} 倒序
66+
* <li>{@link com.github.lokic.javaext.Collectors.Distinct} 去重
6767
* </ul>
6868
* <p>
6969
* 其他：
7070
* <ul>
71-
* <li>{@link com.github.lokic.javaext.TypeExt} 类型相关
71+
* <li>{@link com.github.lokic.javaext.Types} 类型相关
7272
* </ul>
7373
*/
7474
package com.github.lokic.javaext;

src/test/java/com/github/lokic/javaext/CollectorExtTest.java renamed to src/test/java/com/github/lokic/javaext/CollectorsTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,37 @@
77

88
import java.util.stream.Stream;
99

10-
public class CollectorExtTest {
10+
public class CollectorsTest {
1111

1212
@Test
1313
public void test_distinctFirstPut() {
1414
Assertions.assertThat(
1515
Stream.of("A", "B", "A", "C")
16-
.collect(CollectorExt.Distinct.distinctFirstPut()))
16+
.collect(Collectors.Distinct.distinctFirstPut()))
1717
.containsExactly("A", "B", "C");
1818
}
1919

2020
@Test
2121
public void test_distinctLastPut() {
2222
Assertions.assertThat(
2323
Stream.of("A", "B", "A", "C")
24-
.collect(CollectorExt.Distinct.distinctLastPut()))
24+
.collect(Collectors.Distinct.distinctLastPut()))
2525
.containsExactly("B", "A", "C");
2626
}
2727

2828
@Test
2929
public void test_distinctFirstPutByKey() {
3030
Assertions.assertThat(
3131
Stream.of(new DataInfo("A", "A1"), new DataInfo("B", "B1"), new DataInfo("A", "A2"), new DataInfo("C", "C1"))
32-
.collect(CollectorExt.Distinct.distinctFirstPutByKey(DataInfo::getKey)))
32+
.collect(Collectors.Distinct.distinctFirstPutByKey(DataInfo::getKey)))
3333
.containsExactly(new DataInfo("A", "A1"), new DataInfo("B", "B1"), new DataInfo("C", "C1"));
3434
}
3535

3636
@Test
3737
public void test_distinctLastPutByKey() {
3838
Assertions.assertThat(
3939
Stream.of(new DataInfo("A", "A1"), new DataInfo("B", "B1"), new DataInfo("A", "A2"), new DataInfo("C", "C1"))
40-
.collect(CollectorExt.Distinct.distinctLastPutByKey(DataInfo::getKey)))
40+
.collect(Collectors.Distinct.distinctLastPutByKey(DataInfo::getKey)))
4141
.containsExactly(new DataInfo("B", "B1"), new DataInfo("A", "A2"), new DataInfo("C", "C1"));
4242
}
4343

0 commit comments

Comments
 (0)