Merge pull request #14 from lvyahui8/develop

Develop merge into master

Author: lvyahui8

pom.xml

@@ -20,7 +20,7 @@ limitations under the License.
 
     <groupId>io.github.lvyahui8</groupId>
     <artifactId>spring-boot-data-aggregator</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <modules>
         <module>spring-boot-data-aggregator-core</module>
         <module>spring-boot-data-aggregator-autoconfigure</module>

spring-boot-data-aggregator-autoconfigure/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-data-aggregator</artifactId>
         <groupId>io.github.lvyahui8</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateAutoConfiguration.java

@@ -128,8 +128,6 @@ public DataBeanAggregateQueryService dataBeanAggregateQueryService (
 
         DataBeanAggregateQueryServiceImpl service = new DataBeanAggregateQueryServiceImpl();
         RuntimeSettings runtimeSettings = new RuntimeSettings();
-        runtimeSettings.setEnableLogging(properties.getEnableLogging() != null
-                ? properties.getEnableLogging() : false);
         runtimeSettings.setIgnoreException(properties.isIgnoreException());
         runtimeSettings.setTimeout(properties.getDefaultTimeout());
         service.setRepository(dataProviderRepository);

spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateProperties.java

@@ -35,6 +35,7 @@ public class BeanAggregateProperties {
     /**
      * Allow output log
      */
+    @Deprecated
     private Boolean                                enableLogging    = true;
     /**
      * Ignore exception thrown by asynchronous execution, method returns null value

spring-boot-data-aggregator-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-data-aggregator</artifactId>
         <groupId>io.github.lvyahui8</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/config/RuntimeSettings.java

@@ -8,7 +8,6 @@
  */
 @Data
 public class RuntimeSettings {
-    private boolean enableLogging;
     private boolean ignoreException;
     private Long timeout;
 }

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

@@ -128,7 +128,7 @@ private  <T> T innerGet(DataProvideDefinition provider, Map<String, Object> invo
             return resultType.cast(interceptorChain.applyQueryAfter(context,provider,result));
         } catch (Exception e) {
             interceptorChain.applyExceptionHandle(context,provider,e);
-            return null;
+            throw e;
         }
     }
 
@@ -169,7 +169,7 @@ public Object execute() throws Exception {
             for (Map.Entry<String,Future<?>> item : futureMap.entrySet()) {
                 Future<?> future = item.getValue();
                 Object value = null;
-                DataConsumeDefinition consumeDefinition = consumeDefinitionMap.get(item.getKey());
+                DataConsumeDefinition consumeDefinition = consumeDefinitionMap.get(item.getKey().substring(0,item.getKey().indexOf('_')));
                 try {
                     value = future.get();
                 } catch (ExecutionException e) {

spring-boot-data-aggregator-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-data-aggregator</artifactId>
         <groupId>io.github.lvyahui8</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/interceptor/SampleAggregateQueryInterceptor.java

@@ -28,7 +28,8 @@ public void queryBefore(AggregationContext aggregationContext, DataProvideDefini
 
     @Override
     public Object queryAfter(AggregationContext aggregationContext, DataProvideDefinition provideDefinition, Object result) {
-        log.info("query after. provider:{},result:{}",provideDefinition.getMethod().getName(),result.toString());
+        log.info("query after. provider:{},result:{}",provideDefinition.getMethod().getName(),result != null ?
+                result.toString() : "null");
         return result;
     }
 

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

@@ -178,4 +178,21 @@ public Object apply(
         System.out.println(specialUserCollection);
     }
 
+    @Test
+    public void testParameterTypeException() throws Exception {
+        try{
+            dataBeanAggregateQueryFacade.get(Collections.singletonMap("userId", "1"),
+                    new Function2<User, List<Post>, User>() {
+                        @Override
+                        public User apply(@DataConsumer("user") User user,
+                                          @DataConsumer("posts") List<Post> posts) {
+                            return user;
+                        }
+                    });
+            throw new IllegalStateException("must throw IllegalArgumentException");
+        } catch (Exception e) {
+            log.error("eMsg:",e);
+            Assert.isTrue(e instanceof IllegalArgumentException,"e must be typeof IllegalArgumentException");
+        }
+    }
 }