support dynamic parameter!!!

Author: lvyahui8

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DataConsumeDefinition.java

@@ -2,13 +2,17 @@
 
 import lombok.Data;
 
+import java.util.Map;
+
 /**
  * @author lvyahui ([email protected],[email protected])
  * @since 2019/6/2 22:13
  */
 @Data
 public class DataConsumeDefinition {
-    private String id;
-    private Class<?> clazz;
-    private Boolean ignoreException;
+    private String             id;
+    private Class<?>           clazz;
+    private Boolean            ignoreException;
+    private Map<String,String> dynamicParameterKeyMap;
+    private String             originalParameterName;
 }

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/impl/DataBeanAggregateQueryServiceImpl.java

@@ -61,14 +61,14 @@ public <T> T get(DataProvideDefinition provider, Map<String, Object> invokeParam
         AggregationContext aggregationContext = initQueryContext(provider, queryCache);
         interceptorChain.applyQuerySubmitted(aggregationContext);
         try {
-            return innerGet(provider,invokeParams,resultType,aggregationContext);
+            return innerGet(provider,invokeParams,resultType,aggregationContext,null);
         } finally {
             interceptorChain.applyQueryFinished(aggregationContext);
         }
     }
 
     private  <T> T innerGet(DataProvideDefinition provider, Map<String, Object> invokeParams, Class<T> resultType,
-                     AggregationContext context)
+                     AggregationContext context, DataConsumeDefinition causedConsumer)
             throws InterruptedException, InvocationTargetException, IllegalAccessException{
         Map<String,Object> dependObjectMap = null;
         try {
@@ -82,12 +82,20 @@ private  <T> T innerGet(DataProvideDefinition provider, Map<String, Object> invo
             }
             /* 拼凑dependObjects和invokeParams */
             Object [] args = new Object[provider.getMethod().getParameterCount()];
+
             for (int i = 0 ; i < provider.getMethodArgs().size(); i ++) {
                 MethodArg methodArg = provider.getMethodArgs().get(i);
                 if (methodArg.getDependType().equals(DependType.OTHER_MODEL)) {
-                    args[i] = dependObjectMap.get(methodArg.getAnnotationKey());
+                    args[i] = dependObjectMap.get(methodArg.getAnnotationKey() + "_" + methodArg.getParameter().getName());
                 } else {
-                    args[i] = invokeParams.get(methodArg.getAnnotationKey());
+                    String paramKey ;
+                    if(causedConsumer != null && causedConsumer.getDynamicParameterKeyMap() != null
+                    && causedConsumer.getDynamicParameterKeyMap().containsKey(methodArg.getAnnotationKey())) {
+                        paramKey = causedConsumer.getDynamicParameterKeyMap().get(methodArg.getAnnotationKey());
+                    } else {
+                        paramKey = methodArg.getAnnotationKey();
+                    }
+                    args[i] = invokeParams.get(paramKey);
                 }
                 if (args[i] != null && ! methodArg.getParameter().getType().isAssignableFrom(args[i].getClass())) {
                     throw new IllegalArgumentException("param type not match, param:"
@@ -133,13 +141,13 @@ private Map<String, Object> getDependObjectMap(Map<String, Object> invokeParams,
             consumeDefinitionMap.put(depend.getId(),depend);
             Future<?> future = executorService.submit(() -> {
                 try {
-                    Object o = innerGet(repository.get(depend.getId()),invokeParams, depend.getClazz(),context);
+                    Object o = innerGet(repository.get(depend.getId()),invokeParams, depend.getClazz(),context,depend);
                     return depend.getClazz().cast(o);
                 } finally {
                     stopDownLatch.countDown();
                 }
             });
-            futureMap.put(depend.getId(),future);
+            futureMap.put(depend.getId() + "_" + depend.getOriginalParameterName(),future);
         }
         stopDownLatch.await(timeout, TimeUnit.MILLISECONDS);
         if(! futureMap.isEmpty()){

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/util/DefinitionUtils.java

@@ -2,6 +2,7 @@
 
 import io.github.lvyahui8.spring.aggregate.model.*;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
+import io.github.lvyahui8.spring.annotation.DynamicParameter;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
 import io.github.lvyahui8.spring.enums.ExceptionProcessingMethod;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -11,7 +12,9 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lvyahui ([email protected],[email protected])
@@ -57,6 +60,14 @@ private static void dealMethodParameter(DataProvideDefinition provideDefinition,
             DataConsumeDefinition dataConsumeDefinition = new DataConsumeDefinition();
             dataConsumeDefinition.setClazz(parameter.getType());
             dataConsumeDefinition.setId(dataId);
+            if(dataConsumer.dynamicParameters().length > 0) {
+                Map<String, String> parameterKeyMap = new HashMap<>(dataConsumer.dynamicParameters().length);
+                for (DynamicParameter dynamicParameter : dataConsumer.dynamicParameters()) {
+                    parameterKeyMap.put(dynamicParameter.targetKey(),dynamicParameter.replacementKey());
+                }
+                dataConsumeDefinition.setDynamicParameterKeyMap(parameterKeyMap);
+            }
+            dataConsumeDefinition.setOriginalParameterName(parameter.getName());
             if(! dataConsumer.exceptionProcessingMethod().equals(ExceptionProcessingMethod.BY_DEFAULT)) {
                 dataConsumeDefinition.setIgnoreException(
                         dataConsumer.exceptionProcessingMethod().equals(ExceptionProcessingMethod.IGNORE)

spring-boot-data-aggregator-example/src/test/java/io/github/lvyahui8/spring/example/DataBeanAggregateQueryFacadeTest.java

@@ -158,9 +158,9 @@ public Object apply(
     @Test
     public void testDynamicParameter() throws Exception {
         ImmutableMap<String, Object> params = ImmutableMap.<String, Object>builder()
-                .put("userA_Id", 1)
-                .put("userB_Id", 2)
-                .put("userC_Id", 3).build();
+                .put("userA_Id", 1L)
+                .put("userB_Id", 2L)
+                .put("userC_Id", 3L).build();
         Object specialUserCollection = dataBeanAggregateQueryFacade.get(params,
                 new Function3<User,User,User,Object>() {
                     @Override