opt;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java

@@ -5,7 +5,6 @@
 package com.liquidnet.commons.lang.util;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 
 /**
@@ -13,146 +12,137 @@ import java.util.function.Predicate;
  * @version 1.0 2015年12月01日 11:42:00
  */
 public class CollectionUtil {
-
-	/**
-	 * 构建泛型类型的HashMap,该Map的初始容量是0
-	 *
-	 * @param <K>
-	 * @param <V>
-	 * @return
-	 */
-	public static <K, V> Map<K, V> hashMap() {
-		return new HashMap<K, V>(0);
-	}
-
-	public static <K, V> Map<K, V> concurrentMap() {
-		return new ConcurrentHashMap<K, V>();
-	}
-
-
-	public static <E> List<E> arrayList () {
-		return new ArrayList<E>();
-	}
-
-	public static <E> List<E> arrayList (E obj) {
-		List<E> _list = arrayList();
-		_list.add(obj);
-		return _list;
-	}
-
-	public static <E> LinkedList<E> linkedList () {
-		return new LinkedList<E>();
-	}
-
-	public static <E> Set<E> hashSet () {
-		return new HashSet<E>();
-	}
-
-	public static <E> List<E> arrayList (Collection<E> c) {
-		return new ArrayList<E>(c);
-	}
-
-	public static <E> Set<E> hashSet (Collection<E> c) {
-		return new HashSet<E>(c);
-	}
-
-
-	@SuppressWarnings("unchecked")
-	public static <T> T get (Map<?, ?> map, Object obj, Class<T> clazz) {
-		return (T)map.get(obj);
-	}
-
-	public static <E> boolean isEmpty (Collection<E> c) {
-		return c == null || c.isEmpty();
-	}
-
-	/**
-	 * 移除集合中符合条件的元素
-	 * @param list List集合
-	 * @param test 移除条件
-	 * @param breakIfFind 是否在第一次移除后就停止查找
-	 * @param <T>
-	 */
-	public static <T> void remove(List<T> list,Predicate<T> test,boolean breakIfFind){
-		if(list == null) {
+    private static final HashMap<String, String> STRING_STRING_HASH_MAP = new HashMap<>();
+    private static final HashMap<String, Object> STRING_OBJECT_HASH_MAP = new HashMap<>();
+    private static final LinkedList<String> STRING_LINKED_LIST = new LinkedList<>();
+    private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
+    private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
+
+
+    public static HashMap<String, String> mapStringString() {
+        return (HashMap<String, String>) STRING_STRING_HASH_MAP.clone();
+    }
+
+    public static HashMap<String, Object> mapStringObject() {
+        return (HashMap<String, Object>) STRING_OBJECT_HASH_MAP.clone();
+    }
+
+    public static LinkedList<String> linkedListString() {
+        return (LinkedList<String>) STRING_LINKED_LIST.clone();
+    }
+
+    public static LinkedList<Object[]> linkedListObjectArr() {
+        return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone();
+    }
+
+    public static ArrayList<Object> arrayListObject() {
+        return (ArrayList<Object>) OBJECT_ARRAY_LIST.clone();
+    }
+
+
+    @SuppressWarnings("unchecked")
+    public static <T> T get(Map<?, ?> map, Object obj, Class<T> clazz) {
+        return (T) map.get(obj);
+    }
+
+    public static <E> boolean isEmpty(Collection<E> c) {
+        return c == null || c.isEmpty();
+    }
+
+    /**
+     * 移除集合中符合条件的元素
+     *
+     * @param list        List集合
+     * @param test        移除条件
+     * @param breakIfFind 是否在第一次移除后就停止查找
+     * @param <T>
+     */
+    public static <T> void remove(List<T> list, Predicate<T> test, boolean breakIfFind) {
+        if (list == null) {
             return;
         }
-		Iterator<T> it = list.iterator();
-		while (it.hasNext()){
-			if(test.test(it.next())){
-				it.remove();
-				if (breakIfFind) {
-					break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * 遍历全部元素,并移除其中符合条件的元素
-	 * @param list List集合
-	 * @param test 移除条件
-	 * @param <T>
-	 */
-	public static <T> void remove(List<T> list,Predicate<T> test){
-		remove(list,test,false);
-	}
-
-	/**
-	 * 遍历全部元素,并移除其中与目标对象相同的元素
-	 * @param list List集合
-	 * @param targetElement 目标对象
-	 * @param <T>
-	 */
-	public static <T> void remove(List<T> list, T targetElement) {
-		remove(list, (Predicate<T>) t -> t.equals(targetElement));
-	}
-
-	/**
-	 * 遍历全部元素,并移除其中的null元素
-	 * @param list List集合
-	 * @param <T>
-	 */
-	public static <T> void removeNull(List<T> list) {
-		remove(list, (Predicate<T>) t -> t == null);
-	}
-
-
-	/**
-	 * 遍历map中的全部value,并且移除符合条件的元素
-	 * @param map Map集合
-	 * @param test 移除条件
-	 * @param <V>
-	 */
-	public static <V> void remove(Map<?, V> map, Predicate<V> test) {
-		if(map == null) {
+        Iterator<T> it = list.iterator();
+        while (it.hasNext()) {
+            if (test.test(it.next())) {
+                it.remove();
+                if (breakIfFind) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * 遍历全部元素,并移除其中符合条件的元素
+     *
+     * @param list List集合
+     * @param test 移除条件
+     * @param <T>
+     */
+    public static <T> void remove(List<T> list, Predicate<T> test) {
+        remove(list, test, false);
+    }
+
+    /**
+     * 遍历全部元素,并移除其中与目标对象相同的元素
+     *
+     * @param list          List集合
+     * @param targetElement 目标对象
+     * @param <T>
+     */
+    public static <T> void remove(List<T> list, T targetElement) {
+        remove(list, (Predicate<T>) t -> t.equals(targetElement));
+    }
+
+    /**
+     * 遍历全部元素,并移除其中的null元素
+     *
+     * @param list List集合
+     * @param <T>
+     */
+    public static <T> void removeNull(List<T> list) {
+        remove(list, (Predicate<T>) t -> t == null);
+    }
+
+
+    /**
+     * 遍历map中的全部value,并且移除符合条件的元素
+     *
+     * @param map  Map集合
+     * @param test 移除条件
+     * @param <V>
+     */
+    public static <V> void remove(Map<?, V> map, Predicate<V> test) {
+        if (map == null) {
             return;
         }
-		Iterator<V> it = map.values().iterator();
-		while (it.hasNext()) {
-			if (test.test(it.next())) {
-				it.remove();
-			}
-		}
-	}
-
-	/**
-	 * 遍历map中的全部value,并且移除与目标对象相同的元素
-	 * @param map Map集合
-	 * @param targetElement 目标对象
-	 * @param <V>
-	 */
-	public static <V> void remove(Map<?, V> map, V targetElement) {
-		remove(map, (Predicate<V>) v -> v.equals(targetElement));
-	}
-
-	/**
-	 * 遍历map中的全部value,并且移除其中的null值元素
-	 * @param map Map集合
-	 * @param <V>
-	 */
-	public static <V> void removeNull(Map<?, V> map) {
-		remove(map, (Predicate<V>) v -> v == null);
-	}
+        Iterator<V> it = map.values().iterator();
+        while (it.hasNext()) {
+            if (test.test(it.next())) {
+                it.remove();
+            }
+        }
+    }
+
+    /**
+     * 遍历map中的全部value,并且移除与目标对象相同的元素
+     *
+     * @param map           Map集合
+     * @param targetElement 目标对象
+     * @param <V>
+     */
+    public static <V> void remove(Map<?, V> map, V targetElement) {
+        remove(map, (Predicate<V>) v -> v.equals(targetElement));
+    }
+
+    /**
+     * 遍历map中的全部value,并且移除其中的null值元素
+     *
+     * @param map Map集合
+     * @param <V>
+     */
+    public static <V> void removeNull(Map<?, V> map) {
+        remove(map, (Predicate<V>) v -> v == null);
+    }
 
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -443,7 +443,7 @@ public class AdamLoginController {
     }
 
     private String ssoProcess(AdamUserInfoVo userInfoVo) {
-        Map<String, Object> claimsMap = new HashMap<>();
+        Map<String, Object> claimsMap = CollectionUtil.mapStringObject();
         claimsMap.put("sub", userInfoVo.getUid());
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -4,10 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.constant.LnsRegex;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.commons.lang.util.SensitizeUtil;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.*;
@@ -288,7 +285,7 @@ public class AdamUserController {
     public ResponseDto<Map<String, Object>> info() {
         String currentUid = CurrentUtil.getCurrentUid();
 
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtil.mapStringObject();
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
         userInfoVo.setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
         map.put("userInfo", userInfoVo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -197,8 +197,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
          * 2-使用会员码(购买的) 仅限从未购买过会员的用户使用，需要填写地址
          * 3-使用礼包码(赠送的) 仅限从未购买过会员的用户使用，不需要填写地址
          */
-        LinkedList<String> toMqSqls = new LinkedList<>();
-        LinkedList<Object[]> operationObjs = new LinkedList<>(), updateMemberOrderObjs = new LinkedList<>();
+        LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> operationObjs = CollectionUtil.linkedListObjectArr(),
+                updateMemberOrderObjs = CollectionUtil.linkedListObjectArr();
         LocalDateTime now = LocalDateTime.now();
         if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调
             AdamUserMemberVo existUserMemberVo = adamRdmService.getUserMemberVoByUid(handleMemberOrderVo.getUid());
@@ -347,9 +348,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
         initMemberOrderVo.setSource(CurrentUtil.getCliSource());
         initMemberOrderVo.setVersion(CurrentUtil.getCliVersion());
 
-        LinkedList<String> toMqSqls = new LinkedList<>();
-        LinkedList<Object[]> updateMemberCodeObjs = new LinkedList<>(),
-                initMemberOrderObjs = new LinkedList<>(), upsertUserMemberObjs = new LinkedList<>();
+        LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> updateMemberCodeObjs = CollectionUtil.linkedListObjectArr(),
+                initMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
+                upsertUserMemberObjs = CollectionUtil.linkedListObjectArr();
         AdamUserMemberVo upsertUserMemberVo = adamRdmService.getUserMemberVoByUid(initMemberOrderVo.getUid());
         if (null != upsertUserMemberVo) {
             upsertUserMemberVo.setState(1);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.core.JwtValidator;
 import com.liquidnet.commons.lang.util.BsonUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
-import com.liquidnet.service.adam.entity.AdamUserInfo;
-import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.base.SqlMapping;
@@ -27,7 +25,6 @@ import org.springframework.util.DigestUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
@@ -73,8 +70,9 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
         adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
-        LinkedList<String> toMqSqls = new LinkedList<>();
-        LinkedList<Object[]> updateUserObjs = new LinkedList<>(), updateUserInfoObjs = new LinkedList<>();
+        LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> updateUserObjs = CollectionUtil.linkedListObjectArr(),
+                updateUserInfoObjs = CollectionUtil.linkedListObjectArr();
 
         s = System.currentTimeMillis();
         toMqSqls.add(SqlMapping.get("adam_user.complete"));
@@ -134,7 +132,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
     }
 
     private String flushSsoProcess(AdamUserInfoVo userInfoVo) {
-        Map<String, Object> claimsMap = new HashMap<>();
+        Map<String, Object> claimsMap = CollectionUtil.mapStringObject();
         claimsMap.put("sub", userInfoVo.getUid());
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -37,9 +37,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
 import java.time.LocalDateTime;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.liquidnet.service.adam.constant.AdamRedisConst.LOCK_KEY_UREGISTER;
 
@@ -96,8 +94,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 adamRdmService.setUidByMobile(mobile, userInfoVo.getUid());
                 log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
-                LinkedList<String> toMqSqls = new LinkedList<>();
-                LinkedList<Object[]> initUserObjs = new LinkedList<>(), initUserInfoObjs = new LinkedList<>();
+                LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+                LinkedList<Object[]> initUserObjs = CollectionUtil.linkedListObjectArr(),
+                        initUserInfoObjs = CollectionUtil.linkedListObjectArr();
 
                 s = System.currentTimeMillis();
                 toMqSqls.add(SqlMapping.get("adam_user.add"));
@@ -129,8 +128,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 long s = System.currentTimeMillis();
                 uid = adamRdmService.getUidByMobile(param.getMobile());
                 log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
-                LinkedList<String> toMqSqls = new LinkedList<>();
-                LinkedList<Object[]> initUserObjs = new LinkedList<>(), initThirdPartObjs = new LinkedList<>();
+                LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+                LinkedList<Object[]> initUserObjs = CollectionUtil.linkedListObjectArr(),
+                        initThirdPartObjs = CollectionUtil.linkedListObjectArr();
                 if (StringUtils.isEmpty(uid)) {// 手机号未注册
                     userInfoVo = AdamUserInfoVo.getNew();
 
@@ -289,10 +289,10 @@ public class AdamUserServiceImpl implements IAdamUserService {
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void close(String uid) {
         LocalDateTime now = LocalDateTime.now();
-        LinkedList<String> toMqSqls = new LinkedList<>();
-        LinkedList<Object[]> objsUser = new LinkedList<>(),
-                objsThirdPart = new LinkedList<>(),
-                objsAddresses = new LinkedList<>();
+        LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> objsUser = CollectionUtil.linkedListObjectArr(),
+                objsThirdPart = CollectionUtil.linkedListObjectArr(),
+                objsAddresses = CollectionUtil.linkedListObjectArr();
 
         long s = System.currentTimeMillis();
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);