Skip to content

Commit 22835e0

Browse files
committed
fix异常被吞没的问题
1 parent 672978d commit 22835e0

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private <T> T innerGet(DataProvideDefinition provider, Map<String, Object> invo
128128
return resultType.cast(interceptorChain.applyQueryAfter(context,provider,result));
129129
} catch (Exception e) {
130130
interceptorChain.applyExceptionHandle(context,provider,e);
131-
return null;
131+
throw e;
132132
}
133133
}
134134

@@ -169,7 +169,7 @@ public Object execute() throws Exception {
169169
for (Map.Entry<String,Future<?>> item : futureMap.entrySet()) {
170170
Future<?> future = item.getValue();
171171
Object value = null;
172-
DataConsumeDefinition consumeDefinition = consumeDefinitionMap.get(item.getKey());
172+
DataConsumeDefinition consumeDefinition = consumeDefinitionMap.get(item.getKey().substring(0,item.getKey().indexOf('_')));
173173
try {
174174
value = future.get();
175175
} catch (ExecutionException e) {

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,21 @@ public Object apply(
178178
System.out.println(specialUserCollection);
179179
}
180180

181+
@Test
182+
public void testParameterTypeException() throws Exception {
183+
try{
184+
dataBeanAggregateQueryFacade.get(Collections.singletonMap("userId", "1"),
185+
new Function2<User, List<Post>, User>() {
186+
@Override
187+
public User apply(@DataConsumer("user") User user,
188+
@DataConsumer("posts") List<Post> posts) {
189+
return user;
190+
}
191+
});
192+
throw new IllegalStateException("must throw IllegalArgumentException");
193+
} catch (Exception e) {
194+
log.error("eMsg:",e);
195+
Assert.isTrue(e instanceof IllegalArgumentException,"e must be typeof IllegalArgumentException");
196+
}
197+
}
181198
}

0 commit comments

Comments
 (0)