修改集合类型缓存资源字段支持.

Author: hengboy

api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/context/ApiBootResourceContext.java

@@ -21,9 +21,12 @@
 import org.minbox.framework.api.boot.plugin.resource.load.model.ResourcePushField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.ObjectUtils;
 
 import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -54,18 +57,20 @@ public class ApiBootResourceContext {
      * child map key -> resource field name
      * child map value -> resource field instance
      */
-    private static ConcurrentMap<String, ResourcePushField> RESOURCE_FIELDS = new ConcurrentHashMap();
+    private static ConcurrentMap<String, Map<String, ResourcePushField>> RESOURCE_FIELDS = new ConcurrentHashMap();
 
     /**
      * get push field from cache
      *
-     * @param method method instance
+     * @param method    method instance
+     * @param fieldName 字段名称
      * @return ResourceField list
      */
-    public static ResourcePushField getPushFieldFromCache(Method method) {
+    public static ResourcePushField getPushFieldFromCache(Method method, String fieldName) {
         String methodName = formatterMethodName(method);
         logger.debug("Cache method [{}] push field from memory", methodName);
-        return ApiBootResourceContext.RESOURCE_FIELDS.get(methodName);
+        Map<String, ResourcePushField> resourcePushFieldMap = ApiBootResourceContext.RESOURCE_FIELDS.get(methodName);
+        return ObjectUtils.isEmpty(resourcePushFieldMap) ? null : resourcePushFieldMap.get(fieldName);
     }
 
     /**
@@ -74,10 +79,23 @@ public static ResourcePushField getPushFieldFromCache(Method method) {
      * @param method            method instance
      * @param resourcePushField push fields
      */
-    public static void setPushFieldToCache(Method method, ResourcePushField resourcePushField) {
+    public static void setPushFieldToCache(Method method, String fieldName, ResourcePushField resourcePushField) {
         String methodName = formatterMethodName(method);
         logger.debug("Cache method [{}] push field to memory", methodName);
-        ApiBootResourceContext.RESOURCE_FIELDS.put(methodName, resourcePushField);
+        Map<String, ResourcePushField> resourcePushFieldMap = ApiBootResourceContext.RESOURCE_FIELDS.get(methodName);
+        // new map
+        if (ObjectUtils.isEmpty(resourcePushFieldMap)) {
+            resourcePushFieldMap = new HashMap(1) {
+                {
+                    put(fieldName, resourcePushField);
+                }
+            };
+        }
+        //already have map
+        else {
+            resourcePushFieldMap.put(fieldName, resourcePushField);
+        }
+        ApiBootResourceContext.RESOURCE_FIELDS.put(methodName, resourcePushFieldMap);
     }
 
     /**

api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/ResourcePusher.java

@@ -117,7 +117,7 @@ private static void push(Method method, List<ResourceField> resourceFields, Obje
         resourceFields.stream().forEach(resourceField -> {
             try {
                 // source
-                Field sourceField = getSourceField(method, objectClass, resourceField.source());
+                Field sourceField = getSourceField(method, objectClass, resourceField.source(), resourceField.name());
                 // target
                 Field resourceFieldInstance = getResourceField(method, objectClass, resourceField.name());
 
@@ -156,9 +156,9 @@ else if (resourceField.isList()) {
      * @return
      * @throws NoSuchFieldException
      */
-    private static Field getSourceField(Method method, Class objectClass, String sourceFieldName) throws NoSuchFieldException {
+    private static Field getSourceField(Method method, Class objectClass, String sourceFieldName,String resourceFieldName) throws NoSuchFieldException {
         // cache from memory
-        ResourcePushField resourcePushField = ApiBootResourceContext.getPushFieldFromCache(method);
+        ResourcePushField resourcePushField = ApiBootResourceContext.getPushFieldFromCache(method, resourceFieldName);
         // if don't have source field from cache
         if (ObjectUtils.isEmpty(resourcePushField) || ObjectUtils.isEmpty(resourcePushField.getSourceField())) {
             Field sourceField = objectClass.getDeclaredField(sourceFieldName);
@@ -172,7 +172,7 @@ private static Field getSourceField(Method method, Class objectClass, String sou
             }
 
             // cache to memory
-            ApiBootResourceContext.setPushFieldToCache(method, resourcePushField);
+            ApiBootResourceContext.setPushFieldToCache(method, resourceFieldName, resourcePushField);
         }
         return resourcePushField.getSourceField();
     }
@@ -186,7 +186,7 @@ private static Field getSourceField(Method method, Class objectClass, String sou
      */
     private static Field getResourceField(Method method, Class objectClass, String resourceFieldName) throws NoSuchFieldException {
         // cache from memory
-        ResourcePushField resourcePushField = ApiBootResourceContext.getPushFieldFromCache(method);
+        ResourcePushField resourcePushField = ApiBootResourceContext.getPushFieldFromCache(method, resourceFieldName);
         // if don't have source field from cache
         if (ObjectUtils.isEmpty(resourcePushField) || ObjectUtils.isEmpty(resourcePushField.getResourceField())) {
             Field resourceFieldInstance = objectClass.getDeclaredField(resourceFieldName);
@@ -199,7 +199,7 @@ private static Field getResourceField(Method method, Class objectClass, String r
                 resourcePushField.setResourceField(resourceFieldInstance);
             }
             // cache to memory
-            ApiBootResourceContext.setPushFieldToCache(method, resourcePushField);
+            ApiBootResourceContext.setPushFieldToCache(method, resourceFieldName, resourcePushField);
         }
 
         return resourcePushField.getResourceField();