From a35cbd9d5e1cb1f2a6f82d04e1c969e108095bac Mon Sep 17 00:00:00 2001
From: luna <iszychen@gmail.com>
Date: Wed, 25 May 2022 21:42:13 +0800
Subject: [PATCH] 2.0.2

---
 pom.xml                                       | 22 ++++++++++++-------
 .../java/com/luna/common/net/HttpUtils.java   |  3 +--
 .../java/com/luna/common/net/RestUtils.java   |  3 ++-
 .../java/com/luna/common/text/Assert.java     |  4 ++--
 .../text/{MapUtils.java => MapTools.java}     |  9 +++-----
 .../com/luna/common/text/ObjectUtils.java     |  2 +-
 .../com/luna/common/text/StringTools.java     |  2 +-
 7 files changed, 24 insertions(+), 21 deletions(-)
 rename src/main/java/com/luna/common/text/{MapUtils.java => MapTools.java} (91%)

diff --git a/pom.xml b/pom.xml
index 41dc279d..17d81668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>io.github.lunasaw</groupId>
     <artifactId>luna-common</artifactId>
     <name>luna-common</name>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.2-SNAPSHOT</version>
     <description>common is project which contains common utils</description>
     <url>https://github.com/lunasaw/luna-common</url>
 
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!--dependencies-->
-        <commons-collections4.version>4.3</commons-collections4.version>
+        <commons-collections4.version>4.4</commons-collections4.version>
         <commons-validator.version>1.7</commons-validator.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-io.version>2.11.0</commons-io.version>
@@ -49,6 +49,18 @@
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
             <version>${commons-validator.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
@@ -56,12 +68,6 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
diff --git a/src/main/java/com/luna/common/net/HttpUtils.java b/src/main/java/com/luna/common/net/HttpUtils.java
index 620048b3..b51b3a76 100644
--- a/src/main/java/com/luna/common/net/HttpUtils.java
+++ b/src/main/java/com/luna/common/net/HttpUtils.java
@@ -1,11 +1,10 @@
 package com.luna.common.net;
 
 import com.google.common.collect.ImmutableList;
-import com.luna.common.constant.Constant;
 import com.luna.common.constant.StrPoolConstant;
 import com.luna.common.net.method.HttpDelete;
 import com.luna.common.text.CharsetUtil;
-import com.luna.common.text.MapUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.*;
diff --git a/src/main/java/com/luna/common/net/RestUtils.java b/src/main/java/com/luna/common/net/RestUtils.java
index 8622133f..a848ad66 100644
--- a/src/main/java/com/luna/common/net/RestUtils.java
+++ b/src/main/java/com/luna/common/net/RestUtils.java
@@ -2,7 +2,8 @@
 
 import java.util.Map;
 
-import com.luna.common.text.MapUtils;
+import com.luna.common.text.MapTools;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.http.HttpResponse;
 
 import com.google.common.collect.Maps;
diff --git a/src/main/java/com/luna/common/text/Assert.java b/src/main/java/com/luna/common/text/Assert.java
index 6b1e923a..7e222692 100755
--- a/src/main/java/com/luna/common/text/Assert.java
+++ b/src/main/java/com/luna/common/text/Assert.java
@@ -20,8 +20,8 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 
 import javax.annotation.Nullable;
diff --git a/src/main/java/com/luna/common/text/MapUtils.java b/src/main/java/com/luna/common/text/MapTools.java
similarity index 91%
rename from src/main/java/com/luna/common/text/MapUtils.java
rename to src/main/java/com/luna/common/text/MapTools.java
index 562e5357..2ed6bff9 100644
--- a/src/main/java/com/luna/common/text/MapUtils.java
+++ b/src/main/java/com/luna/common/text/MapTools.java
@@ -1,5 +1,6 @@
 package com.luna.common.text;
 
+import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,13 +11,9 @@
  * @author luna
  * 2021/8/16
  */
-public class MapUtils extends org.apache.commons.collections.MapUtils {
+public class MapTools {
 
-    private static final Logger log = LoggerFactory.getLogger(MapUtils.class);
-
-    public MapUtils() {
-        super();
-    }
+    private static final Logger log = LoggerFactory.getLogger(MapTools.class);
 
     public static Object getParam(String paramName, Map<String, Object> mapParam, Class<?> clazz) {
         Map<String, Object> map = checkMap(paramName, mapParam);
diff --git a/src/main/java/com/luna/common/text/ObjectUtils.java b/src/main/java/com/luna/common/text/ObjectUtils.java
index 6d6bfc44..b30b32e1 100755
--- a/src/main/java/com/luna/common/text/ObjectUtils.java
+++ b/src/main/java/com/luna/common/text/ObjectUtils.java
@@ -16,7 +16,7 @@
 
 package com.luna.common.text;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import javax.annotation.Nullable;
 import java.lang.reflect.Array;
diff --git a/src/main/java/com/luna/common/text/StringTools.java b/src/main/java/com/luna/common/text/StringTools.java
index 09da148f..382985a8 100644
--- a/src/main/java/com/luna/common/text/StringTools.java
+++ b/src/main/java/com/luna/common/text/StringTools.java
@@ -7,7 +7,7 @@
 import com.luna.common.constant.StrPoolConstant;
 import com.luna.common.regex.DesensitizedUtil;
 import com.luna.common.regex.ReUtil;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import javax.annotation.Nullable;
 import java.io.ByteArrayOutputStream;