From 5302edf980c08a9e931317769f5ac862f8c48172 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 17 Jun 2021 18:52:19 +0800 Subject: [PATCH] fix code --- .../main/java/cn/hutool/core/bean/BeanUtil.java | 3 +-- .../java/cn/hutool/core/collection/CollUtil.java | 4 ++-- .../hutool/cron/pattern/CronPatternUtilTest.java | 15 +++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java index 7839f7c29..33ffde3f6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java @@ -6,7 +6,6 @@ import cn.hutool.core.bean.copier.ValueProvider; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Editor; -import cn.hutool.core.lang.Filter; import cn.hutool.core.map.CaseInsensitiveMap; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; @@ -198,7 +197,7 @@ public class BeanUtil { } catch (IntrospectionException e) { throw new BeanException(e); } - return ArrayUtil.filter(beanInfo.getPropertyDescriptors(), (Filter) t -> { + return ArrayUtil.filter(beanInfo.getPropertyDescriptors(), t -> { // 过滤掉getClass方法 return false == "class".equals(t.getName()); }); diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java index 053514783..a995093d0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java @@ -255,7 +255,7 @@ public class CollUtil { * @param coll1 集合1 * @param coll2 集合2 * @param otherColls 其它集合 - * @return 并集的集合,返回 {@link ArrayList} + * @return 交集的集合,返回 {@link ArrayList} */ @SafeVarargs public static Collection intersection(Collection coll1, Collection coll2, Collection... otherColls) { @@ -282,7 +282,7 @@ public class CollUtil { * @param coll1 集合1 * @param coll2 集合2 * @param otherColls 其它集合 - * @return 并集的集合,返回 {@link LinkedHashSet} + * @return 交集的集合,返回 {@link LinkedHashSet} * @since 5.3.9 */ @SafeVarargs diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java index 792ab7c37..9ce4a5622 100644 --- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java +++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java @@ -1,15 +1,14 @@ package cn.hutool.cron.pattern; +import cn.hutool.core.date.DateUtil; +import org.junit.Assert; +import org.junit.Test; + import java.util.Date; import java.util.List; -import org.junit.Assert; -import org.junit.Test; - -import cn.hutool.core.date.DateUtil; - public class CronPatternUtilTest { - + @Test public void matchedDatesTest() { //测试每30秒执行 @@ -21,7 +20,7 @@ public class CronPatternUtilTest { Assert.assertEquals("2018-10-15 14:35:00", matchedDates.get(3).toString()); Assert.assertEquals("2018-10-15 14:35:30", matchedDates.get(4).toString()); } - + @Test public void matchedDatesTest2() { //测试每小时执行 @@ -33,7 +32,7 @@ public class CronPatternUtilTest { Assert.assertEquals("2018-10-15 18:00:00", matchedDates.get(3).toString()); Assert.assertEquals("2018-10-15 19:00:00", matchedDates.get(4).toString()); } - + @Test public void matchedDatesTest3() { //测试最后一天