Commit Graph

2616 Commits

Author SHA1 Message Date
VampireAchao
814b55cc87 Merge remote-tracking branch 'origin/v6-dev' into v6-dev
# Conflicts:
#	hutool-core/src/main/java/cn/hutool/core/stream/TerminableWrappedStream.java
#	hutool-core/src/main/java/cn/hutool/core/stream/TransformableWrappedStream.java
2022-09-09 14:40:39 +08:00
VampireAchao
492a281cf9 :trollface: 增强EasyStream#zip对并行流的支持,提供CollectorUtil.entryToMap对Entry转map提供支持,完善javadoc 2022-09-09 14:38:28 +08:00
Looly
63028906b9 add converter for json 2022-09-08 02:21:05 +08:00
Looly
bb99d52a87 fix code 2022-09-08 01:46:07 +08:00
Looly
2200701d7e add test 2022-09-07 17:20:47 +08:00
Looly
a8a4f16bec fix comment 2022-09-07 16:40:56 +08:00
Looly
ac9d4cef37 fix comment 2022-09-07 16:36:03 +08:00
Looly
d0ec0a4b5a
!800 【6.x】重构Lambda体系
Merge pull request !800 from 阿超/v6-dev
2022-09-07 08:26:51 +00:00
achao
b7d924b34d :trollface: 解决冲突 2022-09-07 15:57:29 +08:00
阿超
e847ff6501 Merge branch 'v6-dev' of gitee.com:dromara/hutool into v6-dev
Signed-off-by: 阿超 <achao1441470436@gmail.com>
2022-09-07 07:55:05 +00:00
Looly
58d1a9a92b fix code 2022-09-07 15:53:33 +08:00
achao
f732d14809 重构Jdk自带的Lambda体系,支持序列化+包裹受检异常
改动如下:
1. AnnotationUtil 115行 简化 predicate::test 为 predicate
2. 调整 Func1 为 SerFunction
3. 调整 Func0 为 SerSupplier
4. 移除 GenericBuilder 对于多参数构造双冒号简写支持,直接采用lambda方式,例如GenericBuilder.of(Box::new, 2048L, "Hello Partner!", 222, 333, 444)改为GenericBuilder.of(() -> new Box(2048L, "Hello Partner!", 222, 333, 444))
5. 移除 CheckedUtil,现有重构后的Lambda 支持包裹异常
6. 移除 Func,该函数式接口属于泛型可变参数,不推荐使用
7. 移除 Supplier1,1参数Supplier应该使用SerFunction替代
8. 移除 Supplier2,2参数Supplier应该使用SerBiFunction替代
9. 移除 Supplier3,3参数Supplier应该使用SerFunction3替代(因第4条更改思路,该SerFunction3并未添加)
10. 移除 Supplier4,4参数Supplier应该使用SerFunction4替代(因第4条更改思路,该SerFunction4并未添加)
11. 移除 Supplier5,5参数Supplier应该使用SerFunction5替代(因第4条更改思路,该SerFunction5并未添加)
12. 移除 VoidFunc,该函数式接口属于泛型可变参数,不推荐使用
13. 调整 VoidFunc0 为 SerRunnable
14. 调整 VoidFunc1 为 SerConsumer
15. 调整 EntryStream 泛型命名、完善javadoc
16. EnumUtil 273行 简化 field::callWithRuntimeException 为 field
2022-09-07 15:08:11 +08:00
huangchengxing
7d680792d4 使用CollectorUtil.joining替换Collectors.joining 2022-09-07 09:34:35 +08:00
huangchengxing
89c3f3c4bc Merge branch 'v6-dev' into refactor-stream
# Conflicts:
#	hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
2022-09-07 09:33:09 +08:00
Looly
4204cb8532 simle code 2022-09-07 09:27:08 +08:00
huangchengxing
d58502ad76 调整方法名称 2022-09-06 13:32:32 +08:00
huangchengxing
924a1c6a22 fix code 2022-09-06 12:44:48 +08:00
huangchengxing
b463b11364 Merge branch 'v6-dev' into refactor-stream
# Conflicts:
#	hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
#	hutool-core/src/main/java/cn/hutool/core/stream/WrappedStream.java
2022-09-06 12:39:02 +08:00
huangchengxing
717305e039 fix code 2022-09-06 12:21:41 +08:00
huangchengxing
741f0aa53a 重构增强流:
1.移除SimpleStreamWrapper;
2.将EasyStream中部分方法移动至接口中;
3.调整类名、方法名、变量名与部分注释;
4.为实例方法添加空值校验;
5.补充测试用例;
2022-09-06 11:21:38 +08:00
VampireAchao
056eb5ded6 CollectorUtil 新增两个对toMap的重载,并将EasyStream中join采用CollectorUtil中的joining 2022-09-06 11:18:06 +08:00
Looly
7fb7667e14 fix code 2022-09-04 21:29:29 +08:00
Looly
d52d36cfdc fix code 2022-09-04 20:57:26 +08:00
Looly
c72e2bb5ba fix code 2022-09-04 20:11:25 +08:00
Looly
d1a5818a8e
!781 【6.x】新增基于键值对类型元素的Stream增强流实现
Merge pull request !781 from Createsequence/feat-stream-ext
2022-09-04 11:42:51 +00:00
Looly
f942bd59da fix code 2022-09-02 23:44:45 +08:00
Looly
b02610ed27
!790 补充collection.iter包下的测试用例、注释
Merge pull request !790 from Createsequence/fix-coll
2022-09-02 15:43:21 +00:00
duandazhi
97174e2ffc 修复availableProcessors,潜在的native方法获取CPU个数失败的问题 2022-09-02 23:03:01 +08:00
huangchengxing
2d1255cbff 将增强流中的部分通用方法分离为接口中的默认方法 2022-09-02 18:06:50 +08:00
huangchengxing
3c5313f0a7 将键值对流的键值对对象从内部类调整为AbstractMap.SimpleImmutableEntry 2022-09-02 16:14:47 +08:00
huangchengxing
43bd15b515 Merge remote-tracking branch 'gitee/v6-dev' into feat-stream-ext 2022-09-02 13:43:11 +08:00
huangchengxing
7b5683a3c4 fix code and test case 2022-09-02 11:30:04 +08:00
Looly
4a0a977397 fix doc 2022-09-01 17:57:39 +08:00
Looly
14ff5c43ea
!788 补充 collection.iter包下的测试用例,完善注释并为部分方法补充空值校验
Merge pull request !788 from Createsequence/fix-coll
2022-09-01 09:55:26 +00:00
huangchengxing
ce7a075b1e fix code and test case 2022-09-01 13:45:26 +08:00
huangchengxing
55fa1812a9 fix docs and test cases 2022-08-31 13:22:00 +08:00
Looly
3bddce1a0b fix doc 2022-08-31 00:53:20 +08:00
Looly
05bd3cca9f
!771 【6.x】优化支持一键多值的Map集合扩展,为其添加统一接口
Merge pull request !771 from Createsequence/feat-multi-map
2022-08-30 16:27:53 +00:00
Looly
fe6c48f08d fix code 2022-08-30 23:32:15 +08:00
Looly
4e8060e441 fix code 2022-08-30 23:13:55 +08:00
Looly
26d550dbab
!780 修复Issue #I5OSFC(更友好提示),完善Zodiac单元测试
Merge pull request !780 from Husky/v6-dev
2022-08-30 13:48:16 +00:00
Looly
dd3148ca0a 更新测试 2022-08-30 21:42:03 +08:00
Looly
dd64ab878e
!782 完善annotation包相关测试用例
Merge pull request !782 from Createsequence/v6-dev
2022-08-30 13:40:49 +00:00
Looly
1361e11592 将ObjUtil.defaultIfNull检验参数类型从Object改为泛型 2022-08-30 21:38:57 +08:00
Husky
39a618ff10 ZoneUtilTest 完善 2022-08-30 17:44:36 +08:00
Husky
d9d8ad0d62 WeekTest 完善 2022-08-30 17:35:45 +08:00
huangchengxing
9077297966 将defaultIfNull检验参数类型改为泛型,并补充重载方法 2022-08-30 16:47:50 +08:00
huangchengxing
e20c5c3d81 完善annotation包相关测试用例 2022-08-30 15:22:32 +08:00
huangchengxing
95af267855 添加键值对流 2022-08-30 15:05:00 +08:00
huangchengxing
4893a5e9aa 添加支持对流进行转换的收集器 2022-08-30 15:04:30 +08:00
huangchengxing
9e20dbb7a0 将EasyStream部分代理方法分离至公共父类 2022-08-30 15:00:59 +08:00
贾正全
f7ebc9f0fa Zodiac test完善 2022-08-30 12:06:57 +08:00
Looly
c58418017e fix bug and add test 2022-08-29 10:16:16 +08:00
Looly
514483010e fix code 2022-08-28 19:56:51 +08:00
Looly
680c12e423 fix code 2022-08-28 19:55:20 +08:00
Looly
83798c3bf7 fix code 2022-08-28 19:54:30 +08:00
Looly
82fb4e22b1 fix test 2022-08-28 19:25:22 +08:00
Looly
e8a50775d0 fix doc 2022-08-28 19:19:54 +08:00
Looly
282d6245a4 fix bug 2022-08-27 01:06:01 +08:00
Looly
d815af53de add method 2022-08-27 00:53:47 +08:00
Looly
923da89622 fix doc 2022-08-26 16:29:49 +08:00
Looly
54ffe1ed0e add commnent 2022-08-26 16:17:05 +08:00
Looly
80a9af499c fix code 2022-08-26 15:19:01 +08:00
Looly
7d3c567961
!770 对EasyStream中补充peekIdx()方法,修改mapMulti()方法适配于更高版本JDK
Merge pull request !770 from ZVerify/v6-dev
2022-08-26 01:23:19 +00:00
Looly
d04feb8f70 fix code 2022-08-26 09:13:17 +08:00
huangchengxing
6c001e868b 优化支持一键多值的Map集合扩展,为其添加统一接口 2022-08-25 12:13:00 +08:00
Looly
9878264882 add method 2022-08-25 11:37:57 +08:00
臧臧
97ce543b47 对EasyStream中补充peekIdx()方法,mapMulti适配于更高版本JDK 2022-08-24 13:49:09 +08:00
臧臧
e410b2685e 对EasyStream中补充peekIdx()方法,mapMulti适配于更高版本JDK 2022-08-24 13:26:37 +08:00
臧臧
aae72484f1 对EasyStream中补充peekIdx()方法,mapMulti适配于更高版本JDK 2022-08-24 13:16:31 +08:00
Looly
ccb7b61b8c
!766 EasyStream 对递归树结构的支持,提供结束操作toTree、中间操作flatTree函数
Merge pull request !766 from 阿超/v6-dev
2022-08-24 00:55:57 +00:00
Looly
3f77f0eda2 fix doc 2022-08-24 08:54:37 +08:00
Looly
01ea2fc921
!767 轻量级pr, v6-dev-DatePattern-add-UTC-notes-2022-08-23
Merge pull request !767 from dazer007/v6-dev-DatePattern-add-UTC-notes-2022-08-23
2022-08-24 00:51:11 +00:00
duandazhi
755cb0de26 DatePattern增加:对UTC时间详细说明,易错,易混淆。 2022-08-23 04:13:07 -04:00
Looly
bb19e7d263
!765 简化LambdaInfo初始化方法,调整实例化方法参数类型名称
Merge pull request !765 from Createsequence/v6-lambda
2022-08-23 07:26:19 +00:00
achao
563f398625 test 2022-08-23 14:20:56 +08:00
阿超
4ecdc17ffe Merge branch 'v6-dev' of gitee.com:dromara/hutool into v6-dev
Signed-off-by: 阿超 <achao1441470436@gmail.com>
2022-08-23 05:19:03 +00:00
Looly
e0172b9500 EasyStream相关:完善了注释,为部分工厂方法添加空值处理,并补充一个新方法 2022-08-23 11:15:37 +08:00
Looly
eec386d179
!764 EasyStream相关:完善了注释,为部分工厂方法添加空值处理,并补充一个新方法
Merge pull request !764 from Createsequence/v6-dev
2022-08-23 03:01:51 +00:00
Looly
76ba6f0836 remove class 2022-08-23 10:27:51 +08:00
Looly
608928d400
!761 CompareUtil中comparingIndexed
Merge pull request !761 from dazer007/v6-dev-comparingIndexed-support-list
2022-08-23 01:39:18 +00:00
Looly
ceb6049614
!760 CompareUtilTest添加comparingIndexedTest的测试方法到v6.x
Merge pull request !760 from dazer007/v6-dev-compareUtilsTestAdd
2022-08-23 01:25:23 +00:00
VampireAchao
4c8ed54241 并行流适配 2022-08-22 22:57:54 +08:00
VampireAchao
699217b4c3 EasyStream 对递归树结构的支持 2022-08-22 19:37:14 +08:00
huangchengxing
45017b003e 调整变量名,简化初始化方法 2022-08-22 12:29:37 +08:00
huangchengxing
0caf36e794 优化注释 2022-08-22 11:01:06 +08:00
huangchengxing
227313c632 补充方法,并为部分工厂方法添加空值处理 2022-08-22 11:00:42 +08:00
duandazhi
f49bced8b5 增加:对null友好的,注释 2022-08-20 20:41:10 +08:00
duandazhi
eb2c09a9bd comparingIndexed增加对集合的支持,可变参数不够友好。
说明:生产中,使用数组、集合更多
2022-08-20 19:50:35 +08:00
duandazhi
07a78f44b6 CompareUtilTest 添加 comparingIndexed 的测试方法 2022-08-20 18:26:40 +08:00
Looly
d567efde00 fix code 2022-08-20 00:46:03 +08:00
Looly
b5dc741079 fix code 2022-08-20 00:38:00 +08:00
Looly
d17eb88635
!759 建议将FastStream修改为EasyStream
Merge pull request !759 from emptypoint/modify-FastStream
2022-08-19 15:11:12 +00:00
Looly
6af1c3736b fix code 2022-08-19 23:10:27 +08:00
emptypoint
18fff4ea87 修改FastStream名称为EasyStream; 2022-08-19 20:06:56 +08:00
Looly
0842ff0f50 add CollectionOperation 2022-08-19 12:28:27 +08:00
Looly
136cc3b08a
!756 优化CollUtil部分方法
Merge pull request !756 from emptypoint/v6-CollUtil-update
2022-08-19 03:04:42 +00:00
Looly
4a6d218a2b fix code 2022-08-19 10:50:26 +08:00
Looly
e82d3c30e1
!757 【6.x】修复LambdaUtil对多参数且参数为包含数组的lambda的支持;优化clazz获取逻辑,直接从executable获取而不是反射
Merge pull request !757 from 阿超/v6-dev
2022-08-19 00:52:12 +00:00
Looly
3da46bbc02
!758 优化Opt.ofEmptyAble(), 避免无意义的判断;
Merge pull request !758 from emptypoint/v6-Opt-update
2022-08-19 00:51:11 +00:00