当返回值为数组时，使用Array.newInstance创建数组，magic模式下，生成缓存key个数为0时返回空的集合

qiujiayu · Jul 12, 2019 · c99cfb9 · c99cfb9
1 parent 52b74df
commit c99cfb9
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/src/main/java/com/jarvis/cache/MagicHandler.java b/src/main/java/com/jarvis/cache/MagicHandler.java
@@ -125,12 +125,24 @@ public static boolean isMagic(Cache cache, Method method) throws Exception {
     private Collection<Object> newCollection(Class<?> collectionType, int resSize) throws Exception {
         Collection<Object> res;
         if (LinkedList.class.isAssignableFrom(collectionType)) {
+            if (resSize == 0) {
+                return Collections.emptyList();
+            }
             res = new LinkedList<>();
         } else if (List.class.isAssignableFrom(collectionType)) {
+            if (resSize == 0) {
+                return Collections.emptyList();
+            }
             res = new ArrayList<>(resSize);
         } else if (LinkedHashSet.class.isAssignableFrom(collectionType)) {
+            if (resSize == 0) {
+                return Collections.emptySet();
+            }
             res = new LinkedHashSet<>(resSize);
         } else if (Set.class.isAssignableFrom(collectionType)) {
+            if (resSize == 0) {
+                return Collections.emptySet();
+            }
             res = new HashSet<>(resSize);
         } else {
             throw new Exception("Unsupported type:" + collectionType.getName());
@@ -154,6 +166,12 @@ public Object magic() throws Throwable {
             return newValue;
         }
         Map<CacheKeyTO, Object> keyArgMap = getCacheKeyForMagic();
+        if (null == keyArgMap || keyArgMap.isEmpty()) {
+            if (returnType.isArray()) {
+                return Array.newInstance(returnType.getComponentType(), 0);
+            }
+            return newCollection(returnType, 0);
+        }
         Type returnItemType = getRealReturnType();
         Map<CacheKeyTO, CacheWrapper<Object>> cacheValues = this.cacheHandler.mget(method, returnItemType, keyArgMap.keySet());
         // 如果所有key都已经命中
@@ -276,14 +294,14 @@ private Object convertToReturnObject(Map<CacheKeyTO, CacheWrapper<Object>> cache
                 Object[] newValues = (Object[]) newValue;
                 resSize = cacheValues.size() + (null == newValues ? 0 : newValues.length);
             }
-            Object[] res = new Object[resSize];
+            Object res = Array.newInstance(returnType.getComponentType(), resSize);
             int ind = 0;
             for (CacheKeyTO cacheKeyTO : cacheKeys) {
                 Object val = getValueFormCacheOrDatasource(cacheKeyTO, cacheValues, unmatchCache);
                 if (!magic.returnNullValue() && null == val) {
                     continue;
                 }
-                res[ind] = val;
+                Array.set(res, ind, val);
                 ind++;
             }
             return res;
@@ -363,9 +381,6 @@ private Map<CacheKeyTO, Object> getCacheKeyForMagic() {
                 cacheKeys[ind] = cacheKeyTO;
             }
         }
-        if (null == keyArgMap || keyArgMap.isEmpty()) {
-            throw new IllegalArgumentException("the 'keyArgMap' is empty");
-        }
         return keyArgMap;
     }