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

Use Publishers.zip instead of Streams.zip

This commit is contained in:
Stephane Maldini 2015-12-01 10:43:41 +00:00
parent 91c2b7afad
commit b26e746120
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ import java.util.Optional;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import reactor.Publishers; import reactor.Publishers;
import reactor.fn.tuple.Tuple; import reactor.fn.tuple.Tuple;
import reactor.rx.Streams;
import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.GenericTypeResolver; import org.springframework.core.GenericTypeResolver;
@ -64,7 +63,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
List<Publisher<Object>> argPublishers = getMethodArguments(request, providedArgs); List<Publisher<Object>> argPublishers = getMethodArguments(request, providedArgs);
Publisher<Object[]> argValues = (!argPublishers.isEmpty() ? Publisher<Object[]> argValues = (!argPublishers.isEmpty() ?
Streams.zip(argPublishers, this::unwrapOptionalArgValues) : Publishers.zip(argPublishers, this::unwrapOptionalArgValues) :
Publishers.just(new Object[0])); Publishers.just(new Object[0]));
return Publishers.map(argValues, args -> { return Publishers.map(argValues, args -> {