From b26e74612036eddddf8603e1bf1e3ff1fb844c82 Mon Sep 17 00:00:00 2001 From: Stephane Maldini Date: Tue, 1 Dec 2015 10:43:41 +0000 Subject: [PATCH] Use Publishers.zip instead of Streams.zip --- .../web/reactive/method/InvocableHandlerMethod.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java index b996faf811..d7585a6619 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java @@ -26,7 +26,6 @@ import java.util.Optional; import org.reactivestreams.Publisher; import reactor.Publishers; import reactor.fn.tuple.Tuple; -import reactor.rx.Streams; import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.GenericTypeResolver; @@ -64,7 +63,7 @@ public class InvocableHandlerMethod extends HandlerMethod { List> argPublishers = getMethodArguments(request, providedArgs); Publisher argValues = (!argPublishers.isEmpty() ? - Streams.zip(argPublishers, this::unwrapOptionalArgValues) : + Publishers.zip(argPublishers, this::unwrapOptionalArgValues) : Publishers.just(new Object[0])); return Publishers.map(argValues, args -> {