From 8336b993acbae12435b217ba1d1fb009133aa6d5 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 3 Apr 2023 11:26:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A9=BA=E5=80=BC=E9=92=88?= =?UTF-8?q?=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/common/collect/ListUtils.java | 21 ++++++++++++ .../com/jeesite/common/collect/MapUtils.java | 33 +++++-------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/collect/ListUtils.java b/common/src/main/java/com/jeesite/common/collect/ListUtils.java index b4e4ef30..5408391b 100644 --- a/common/src/main/java/com/jeesite/common/collect/ListUtils.java +++ b/common/src/main/java/com/jeesite/common/collect/ListUtils.java @@ -65,17 +65,26 @@ public class ListUtils extends org.apache.commons.collections.ListUtils { @SafeVarargs public static ArrayList newArrayList(E... elements) { + if (elements == null) { + return newArrayList(); + } ArrayList list = new ArrayList(elements.length); Collections.addAll(list, elements); return list; } public static ArrayList newArrayList(Iterable elements) { + if (elements == null) { + return newArrayList(); + } return (elements instanceof Collection) ? new ArrayList(cast(elements)) : newArrayList(elements.iterator()); } public static ArrayList newArrayList(Iterator elements) { + if (elements == null) { + return newArrayList(); + } ArrayList list = newArrayList(); addAll(list, elements); return list; @@ -86,6 +95,9 @@ public class ListUtils extends org.apache.commons.collections.ListUtils { } public static LinkedList newLinkedList(Iterable elements) { + if (elements == null) { + return newLinkedList(); + } LinkedList list = newLinkedList(); addAll(list, elements); return list; @@ -96,6 +108,9 @@ public class ListUtils extends org.apache.commons.collections.ListUtils { } public static CopyOnWriteArrayList newCopyOnWriteArrayList(Iterable elements) { + if (elements == null) { + return new CopyOnWriteArrayList(); + } Collection elementsCollection = (elements instanceof Collection) ? cast(elements) : newArrayList(elements); return new CopyOnWriteArrayList(elementsCollection); @@ -106,6 +121,9 @@ public class ListUtils extends org.apache.commons.collections.ListUtils { } private static boolean addAll(Collection addTo, Iterator iterator) { + if (addTo == null || iterator == null) { + return false; + } boolean wasModified = false; while (iterator.hasNext()) { wasModified |= addTo.add(iterator.next()); @@ -114,6 +132,9 @@ public class ListUtils extends org.apache.commons.collections.ListUtils { } public static boolean addAll(Collection addTo, Iterable elementsToAdd) { + if (addTo == null || elementsToAdd == null) { + return false; + } if (elementsToAdd instanceof Collection) { Collection c = cast(elementsToAdd); return addTo.addAll(c); diff --git a/common/src/main/java/com/jeesite/common/collect/MapUtils.java b/common/src/main/java/com/jeesite/common/collect/MapUtils.java index 9ac68573..b30f134c 100644 --- a/common/src/main/java/com/jeesite/common/collect/MapUtils.java +++ b/common/src/main/java/com/jeesite/common/collect/MapUtils.java @@ -4,25 +4,14 @@ */ package com.jeesite.common.collect; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.IdentityHashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - +import com.jeesite.common.lang.StringUtils; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.PropertyUtils; -import com.jeesite.common.lang.StringUtils; +import java.lang.reflect.InvocationTargetException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; /** * Map工具类，实现 Map <-> Bean 互相转换 @@ -85,8 +74,7 @@ public class MapUtils extends org.apache.commons.collections.MapUtils { * @param clazz * @param list */ - public static List toObjectList(Class clazz, List> list) throws Exception, - InvocationTargetException, NoSuchMethodException, InstantiationException { + public static List toObjectList(Class clazz, List> list) throws Exception { List retList = new ArrayList(); if (list != null && !list.isEmpty()) { for (HashMap m : list) { @@ -101,8 +89,7 @@ public class MapUtils extends org.apache.commons.collections.MapUtils { * @param clazz 目标对象的类 * @param map 待转换Map */ - public static T toObject(Class clazz, Map map) throws Exception, - InvocationTargetException { + public static T toObject(Class clazz, Map map) throws Exception { T object = clazz.getDeclaredConstructor().newInstance(); return toObject(object, map); } @@ -113,15 +100,13 @@ public class MapUtils extends org.apache.commons.collections.MapUtils { * @param map 待转换Map * @param toCamelCase 是否去掉下划线 */ - public static T toObject(Class clazz, Map map, boolean toCamelCase) throws Exception, - InvocationTargetException { + public static T toObject(Class clazz, Map map, boolean toCamelCase) throws Exception { T object = clazz.getDeclaredConstructor().newInstance(); return toObject(object, map, toCamelCase); } /** * 将Map转换为Object - * @param clazz 目标对象的类 * @param map 待转换Map */ public static T toObject(T object, Map map) throws InstantiationException, IllegalAccessException, InvocationTargetException { @@ -203,9 +188,7 @@ public class MapUtils extends org.apache.commons.collections.MapUtils { /** * 转换成Map并提供字段命名驼峰转平行 - * @param clazz 目标对象所在类 * @param object 目标对象 - * @param map 待转换Map * @throws NoSuchMethodException * @throws InvocationTargetException * @throws IllegalAccessException