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 fb337d1e2..c77688183 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 @@ -567,7 +567,7 @@ public class CollUtil { */ public static List popPart(Stack surplusAlaDatas, int partSize) { if (isEmpty(surplusAlaDatas)) { - return null; + return ListUtil.empty(); } final List currentAlaDatas = new ArrayList<>(); @@ -596,7 +596,7 @@ public class CollUtil { */ public static List popPart(Deque surplusAlaDatas, int partSize) { if (isEmpty(surplusAlaDatas)) { - return null; + return ListUtil.empty(); } final List currentAlaDatas = new ArrayList<>(); @@ -1101,7 +1101,7 @@ public class CollUtil { */ public static List sub(Collection list, int start, int end, int step) { if (list == null || list.isEmpty()) { - return null; + return ListUtil.empty(); } return sub(new ArrayList<>(list), start, end, step); @@ -1768,7 +1768,7 @@ public class CollUtil { */ public static Map zip(Collection keys, Collection values) { if (isEmpty(keys) || isEmpty(values)) { - return null; + return MapUtil.empty(); } int entryCount = Math.min(keys.size(), values.size()); @@ -2845,6 +2845,7 @@ public class CollUtil { * @param 处理参数类型 * @author Looly */ + @FunctionalInterface public interface Consumer { /** * 接受并处理一个参数 @@ -2862,6 +2863,7 @@ public class CollUtil { * @param VALUE类型 * @author Looly */ + @FunctionalInterface public interface KVConsumer { /** * 接受并处理一对参数