root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

no need to convert to array list with last zip signature

This commit is contained in:
Stephane Maldini 2016-01-27 14:59:19 +00:00
parent 10f4f64e6f
commit 641a57ec93
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java
View File

@ -112,7 +112,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
if (!ObjectUtils.isEmpty(providedArgs)) { if (!ObjectUtils.isEmpty(providedArgs)) {
for (Object providedArg : providedArgs) { for (Object providedArg : providedArgs) {
if (param.getParameterType().isInstance(providedArg)) { if (param.getParameterType().isInstance(providedArg)) {
return Mono.just(providedArg); return Mono.just(providedArg).log("reactor.resolved");
} }
} }
} }
@ -123,7 +123,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
try { try {
return resolver.resolveArgument(param, exchange) return resolver.resolveArgument(param, exchange)
.defaultIfEmpty(NO_VALUE) .defaultIfEmpty(NO_VALUE)
.otherwise(ex -> Mono.error(getArgError("Error resolving ", param, ex))); .otherwise(ex -> Mono.error(getArgError("Error resolving ", param, ex)))
.log("reactor.unresolved");
} }
catch (Exception ex) { catch (Exception ex) {
throw getArgError("Error resolving ", param, ex); throw getArgError("Error resolving ", param, ex);
@ -131,8 +132,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
return Mono.when(monos).map(args -> return Mono.when(monos).log("reactor.unresolved").map(args ->
Stream.of(args.toArray()).map(o -> o != NO_VALUE ? o : null).toArray()); Stream.of(args).map(o -> o != NO_VALUE ? o : null).toArray());
} }
catch (Throwable ex) { catch (Throwable ex) {
return Mono.error(ex); return Mono.error(ex);