From 44580782f1a65b73963880095b77409466483794 Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Wed, 7 Feb 2024 11:24:44 +0800
Subject: [PATCH] =?UTF-8?q?MapUtil=E5=A2=9E=E5=8A=A0partition=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 +-
 .../main/java/cn/hutool/core/map/MapUtil.java | 61 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f356c06f..ceb863ea8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,11 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.26(2024-02-03)
+# 5.8.26(2024-02-07)
 
 ### 🐣新特性
 * 【db    】      RedisDS增加user支持（issue#I8XEQ4@Gitee）
+* 【core  】      MapUtil增加partition方法（pr#1170@Gitee）
 
 ### 🐞Bug修复
 * 【crypto】      修复BouncyCastleProvider导致graalvm应用报错UnsupportedFeatureError（pr#3464@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java
index f6c9b7e64..19699be31 100755
--- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java
@@ -3,10 +3,7 @@ package cn.hutool.core.map;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.exceptions.UtilException;
-import cn.hutool.core.lang.Editor;
-import cn.hutool.core.lang.Filter;
-import cn.hutool.core.lang.Pair;
-import cn.hutool.core.lang.TypeReference;
+import cn.hutool.core.lang.*;
 import cn.hutool.core.stream.CollectorUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.JdkUtil;
@@ -674,7 +671,7 @@ public class MapUtil {
 		}
 
 		// issue#3162@Github，在构造中put值，会导致新建map带有值内容，此处清空
-		if(false == map2.isEmpty()){
+		if (false == map2.isEmpty()) {
 			map2.clear();
 		}
 
@@ -755,7 +752,7 @@ public class MapUtil {
 		}
 
 		// issue#3162@Github，在构造中put值，会导致新建map带有值内容，此处清空
-		if(false == map2.isEmpty()){
+		if (false == map2.isEmpty()) {
 			map2.clear();
 		}
 
@@ -1490,7 +1487,7 @@ public class MapUtil {
 	 * This class should be removed once we drop Java 8 support.
 	 *
 	 * <p>
-	 *     注意此方法只能用于JDK8
+	 * 注意此方法只能用于JDK8
 	 * </p>
 	 *
 	 * @param <K>             键类型
@@ -1506,7 +1503,7 @@ public class MapUtil {
 		if (null == value) {
 			value = mappingFunction.apply(key);
 			final V res = map.putIfAbsent(key, value);
-			if(null != res){
+			if (null != res) {
 				// issues#I6RVMY
 				// 如果旧值存在，说明其他线程已经赋值成功，putIfAbsent没有执行，返回旧值
 				return res;
@@ -1521,28 +1518,30 @@ public class MapUtil {
 	}
 
 	/**
-     * 将一个Map按照固定大小拆分成多个子Map
-     *
-     * @param map  Map
-     * @param size 子Map的大小
-     * @return 子Map列表
-     */
+	 * 将一个Map按照固定大小拆分成多个子Map
+	 *
+	 * @param <K>  键类型
+	 * @param <V>  值类型
+	 * @param map  Map
+	 * @param size 子Map的大小
+	 * @return 子Map列表
+	 * @since 5.8.26
+	 */
 	public static <K, V> List<Map<K, V>> partition(Map<K, V> map, int size) {
-        if (map == null) {
-            throw new NullPointerException("Map must not be null");
-        } else if (size <= 0) {
-            throw new IllegalArgumentException("Size must be greater than 0");
-        }
-        List<Map<K, V>> list = new ArrayList<>();
-        Iterator<Map.Entry<K, V>> iterator = map.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map<K, V> subMap = new HashMap<>(size);
-            for (int i = 0; i < size && iterator.hasNext(); i++) {
-                Map.Entry<K, V> entry = iterator.next();
-                subMap.put(entry.getKey(), entry.getValue());
-            }
-            list.add(subMap);
-        }
-        return list;
-    }
+		Assert.notNull(map);
+		if (size <= 0) {
+			throw new IllegalArgumentException("Size must be greater than 0");
+		}
+		List<Map<K, V>> list = new ArrayList<>();
+		Iterator<Map.Entry<K, V>> iterator = map.entrySet().iterator();
+		while (iterator.hasNext()) {
+			Map<K, V> subMap = new HashMap<>(size);
+			for (int i = 0; i < size && iterator.hasNext(); i++) {
+				Map.Entry<K, V> entry = iterator.next();
+				subMap.put(entry.getKey(), entry.getValue());
+			}
+			list.add(subMap);
+		}
+		return list;
+	}
 }