diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/Decoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/Decoder.java index f78397dba8..7b3325110a 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/Decoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/Decoder.java @@ -20,7 +20,7 @@ import java.nio.ByteBuffer; import java.util.List; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.util.MimeType; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/Encoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/Encoder.java index bee2f78ed6..761ceb9b4b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/Encoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/Encoder.java @@ -20,7 +20,7 @@ import java.nio.ByteBuffer; import java.util.List; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.util.MimeType; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractRawByteStreamDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractRawByteStreamDecoder.java index da49c6a983..21ec772cd4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractRawByteStreamDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractRawByteStreamDecoder.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.core.subscriber.SubscriberBarrier; import reactor.core.subscription.BackpressureUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java index e24b722fe4..42595a351c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java @@ -19,7 +19,7 @@ package org.springframework.core.codec.support; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.util.MimeType; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java index 71a2986581..7a76eb9232 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java @@ -19,7 +19,7 @@ package org.springframework.core.codec.support; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.util.MimeType; @@ -47,7 +47,7 @@ public class ByteBufferEncoder extends AbstractEncoder { MimeType mimeType, Object... hints) { //noinspection unchecked - return Flux.from((Publisher)inputStream); + return Flux.from(inputStream); } } \ No newline at end of file diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonDecoder.java index 5042480450..e60a59a6cf 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonDecoder.java @@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.core.codec.CodecException; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonEncoder.java index bd4426ce39..a42d655e95 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonEncoder.java @@ -22,8 +22,8 @@ import java.nio.charset.StandardCharsets; import com.fasterxml.jackson.databind.ObjectMapper; import org.reactivestreams.Publisher; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import org.springframework.core.ResolvableType; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Decoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Decoder.java index b17150ed9b..94fda4c8ca 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Decoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Decoder.java @@ -34,7 +34,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.core.codec.CodecException; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Encoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Encoder.java index d692c744ff..2482dd0fd0 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Encoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Encoder.java @@ -26,7 +26,7 @@ import javax.xml.bind.MarshalException; import javax.xml.bind.Marshaller; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.io.buffer.Buffer; import org.springframework.core.ResolvableType; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java index 07ec097cd7..127a4ba74b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java @@ -25,7 +25,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.fn.Function; import org.springframework.core.ResolvableType; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectEncoder.java index c39639f700..6fcb243024 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectEncoder.java @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.core.subscriber.SubscriberBarrier; import reactor.core.subscription.BackpressureUtils; import reactor.io.buffer.Buffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java index 332af997ea..9785ed5cbb 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java @@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.core.subscriber.SubscriberBarrier; import org.springframework.core.ResolvableType; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java index 415e8d9f9a..50ea51a26d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java @@ -21,7 +21,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.util.MimeType; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpInputMessage.java b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpInputMessage.java index 65778e219d..0cc0126ddd 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpInputMessage.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpInputMessage.java @@ -19,7 +19,7 @@ package org.springframework.http; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; /** * An "reactive" HTTP input message that exposes the input as {@link Publisher}. diff --git a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java index 1b76212bca..71fd66eec3 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java @@ -19,7 +19,7 @@ package org.springframework.http; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * A "reactive" HTTP output message that accepts output as a {@link Publisher}. diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java index f75f4be2ad..926c6c1692 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java @@ -18,8 +18,8 @@ package org.springframework.http.server.reactive; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.http.HttpHeaders; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java index e04512dceb..7ee64f161d 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java @@ -16,7 +16,7 @@ package org.springframework.http.server.reactive; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * Contract for handling HTTP requests in a non-blocking way. diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java index 72ddbba872..cd3b722df5 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java @@ -15,7 +15,7 @@ */ package org.springframework.http.server.reactive; -import reactor.Mono; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import reactor.io.net.ReactiveChannelHandler; import reactor.io.net.http.HttpChannel; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java index 2ea2c9fcf9..49805625b7 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.io.buffer.Buffer; import reactor.io.net.http.HttpChannel; import reactor.io.net.http.model.Cookie; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java index 4e93607c5f..59ce84236c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java @@ -18,8 +18,8 @@ package org.springframework.http.server.reactive; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import reactor.io.net.http.HttpChannel; import reactor.io.net.http.model.Cookie; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java index aa72c3f728..3cfa1a7175 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java @@ -26,7 +26,7 @@ import java.util.Map; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.http.cookie.Cookie; import io.reactivex.netty.protocol.http.server.HttpServerRequest; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.core.publisher.convert.RxJava1Converter; import rx.Observable; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java index 863d71f5ca..6fc60699ca 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java @@ -23,7 +23,7 @@ import io.netty.handler.codec.http.cookie.Cookie; import io.netty.handler.codec.http.cookie.DefaultCookie; import io.reactivex.netty.protocol.http.server.HttpServerResponse; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; import reactor.core.publisher.convert.RxJava1Converter; import rx.Observable; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java index 41b229c6bc..11a29896ce 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java @@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.HttpStatus; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java index 6dd59e9379..ae570046f9 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java @@ -28,7 +28,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.http.HttpCookie; import org.springframework.http.HttpHeaders; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java index 53f5dcc349..494031ce77 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java @@ -25,7 +25,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.HttpCookie; import org.springframework.http.HttpStatus; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java index 090caf179e..929c4a946b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java @@ -35,7 +35,7 @@ import org.reactivestreams.Subscription; import org.xnio.ChannelListener; import org.xnio.channels.StreamSinkChannel; import org.xnio.channels.StreamSourceChannel; -import reactor.Mono; +import reactor.core.publisher.Mono; import reactor.core.subscriber.BaseSubscriber; import reactor.core.subscription.BackpressureUtils; import reactor.core.support.Exceptions; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java index 6f8c35b7ff..9d04fcae69 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java @@ -27,7 +27,7 @@ import io.undertow.server.HttpServerExchange; import io.undertow.server.handlers.Cookie; import io.undertow.util.HeaderValues; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.http.HttpCookie; import org.springframework.http.HttpHeaders; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java index 3057396587..8d7a910de4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java @@ -26,7 +26,7 @@ import io.undertow.server.handlers.Cookie; import io.undertow.server.handlers.CookieImpl; import io.undertow.util.HttpString; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.HttpCookie; import org.springframework.http.HttpStatus; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java index 3c4484a5ba..cc143cbfcd 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java @@ -23,8 +23,8 @@ import java.util.function.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactoryUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java index ad96158264..a8056ee3d7 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java @@ -18,7 +18,7 @@ package org.springframework.web.reactive; import java.util.function.Function; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.web.server.WebServerExchange; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java index d3c6f9ab6e..bc7f1bc06f 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java @@ -16,7 +16,7 @@ package org.springframework.web.reactive; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.web.server.WebServerExchange; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java index 1e5660838a..9ffae86ba4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java @@ -18,7 +18,7 @@ package org.springframework.web.reactive; import java.util.function.Function; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java index d5a668a1ef..cbbfae5c76 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java @@ -16,7 +16,7 @@ package org.springframework.web.reactive; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.web.server.WebServerExchange; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java index 8c19629d6c..f60ebbd464 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java @@ -15,7 +15,7 @@ */ package org.springframework.web.reactive; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.web.ResponseStatusException; import org.springframework.web.server.WebExceptionHandler; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerHandlerAdapter.java index b4994deb70..51212539b1 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerHandlerAdapter.java @@ -17,7 +17,7 @@ package org.springframework.web.reactive.handler; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; import org.springframework.web.reactive.DispatcherHandler; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java index 7c7c4126cd..cfaa7066fa 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java @@ -17,7 +17,7 @@ package org.springframework.web.reactive.handler; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.core.Ordered; import org.springframework.core.ResolvableType; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java index 5ff03ffdaf..1bca0d78ff 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java @@ -19,8 +19,8 @@ package org.springframework.web.reactive.handler; import java.util.HashMap; import java.util.Map; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.web.reactive.HandlerMapping; import org.springframework.web.server.WebServerExchange; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java index c9fc9397c1..628d4380f1 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java @@ -16,7 +16,7 @@ package org.springframework.web.reactive.method; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; import org.springframework.web.server.WebServerExchange; 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 1b30d6da7e..3508c1565c 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 @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.GenericTypeResolver; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java index 2ad7e92b1e..eb58b72e3c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java @@ -20,8 +20,8 @@ import java.nio.ByteBuffer; import java.util.List; import org.reactivestreams.Publisher; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; import org.springframework.core.ResolvableType; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java index 51d6539d30..41cfeaac93 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.codec.Decoder; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java index dff2c391e7..3d5761f4b8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java @@ -27,8 +27,8 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java index 8c056f4c37..3b09b36330 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java @@ -16,7 +16,7 @@ package org.springframework.web.reactive.method.annotation; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; import org.springframework.web.bind.annotation.RequestParam; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java index 1ebc9c23a5..1d6a5dd201 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java @@ -16,7 +16,6 @@ package org.springframework.web.reactive.method.annotation; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -28,12 +27,11 @@ import java.util.Set; import java.util.stream.Collectors; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; import org.springframework.core.Ordered; import org.springframework.core.ResolvableType; -import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.codec.Encoder; import org.springframework.core.convert.ConversionService; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/ExceptionHandlingWebHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/ExceptionHandlingWebHandler.java index 1c6ba76a65..5c662f0411 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/ExceptionHandlingWebHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/ExceptionHandlingWebHandler.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.HttpStatus; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/FilteringWebHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/FilteringWebHandler.java index 128bbed47e..4228c8710a 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/FilteringWebHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/FilteringWebHandler.java @@ -19,7 +19,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * {@code WebHandler} that decorates another with a chain of {@link WebFilter}s. diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/WebExceptionHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/WebExceptionHandler.java index 84c12a65c5..438c9df82e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/WebExceptionHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/WebExceptionHandler.java @@ -15,7 +15,7 @@ */ package org.springframework.web.server; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * Contract for handling exceptions during web server exchange processing. diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilter.java b/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilter.java index 06c8b5e85c..2c003db3a6 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilter.java @@ -16,7 +16,7 @@ package org.springframework.web.server; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * Contract for interception-style, chained processing of Web requests that may diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilterChain.java b/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilterChain.java index b071f97e73..e7ea8668b6 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilterChain.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/WebFilterChain.java @@ -15,7 +15,7 @@ */ package org.springframework.web.server; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * Contract to allow a {@link WebFilter} to delegate to the next in the chain. diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandler.java index 58cb9286fb..e0566e51f0 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandler.java @@ -16,7 +16,7 @@ package org.springframework.web.server; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * Contract to handle a web server exchange. diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandlerDecorator.java b/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandlerDecorator.java index 42cc20e3ec..83cd7a8907 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandlerDecorator.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/WebHandlerDecorator.java @@ -15,7 +15,7 @@ */ package org.springframework.web.server; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/server/WebToHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/server/WebToHttpHandlerAdapter.java index ec8b418a40..34684b10d4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/server/WebToHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/WebToHttpHandlerAdapter.java @@ -17,7 +17,7 @@ package org.springframework.web.server; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.HttpHandler; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AsyncIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AsyncIntegrationTests.java index 6f18736c15..855840649c 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AsyncIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AsyncIntegrationTests.java @@ -24,10 +24,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import reactor.Mono; -import reactor.Processors; -import reactor.Timers; +import reactor.core.publisher.Mono; import reactor.core.publisher.ProcessorGroup; +import reactor.core.publisher.Processors; +import reactor.core.timer.Timers; import reactor.io.buffer.Buffer; import reactor.rx.Stream; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java index 78dc08bd13..38f714f85c 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.HttpCookie; import org.springframework.http.RequestEntity; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/EchoHandler.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/EchoHandler.java index c6f7a7b28a..b5bf612848 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/EchoHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/EchoHandler.java @@ -16,7 +16,7 @@ package org.springframework.http.server.reactive; -import reactor.Mono; +import reactor.core.publisher.Mono; /** * @author Arjen Poutsma diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpRequest.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpRequest.java index db4412c6f5..183bddaede 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpRequest.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpRequest.java @@ -19,7 +19,7 @@ import java.net.URI; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java index 0aab9caaf3..9b0db98752 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java @@ -18,8 +18,8 @@ package org.springframework.http.server.reactive; import java.nio.ByteBuffer; import org.reactivestreams.Publisher; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/RandomHandler.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/RandomHandler.java index 477114c892..e72e213b32 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/RandomHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/RandomHandler.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import reactor.Mono; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import static org.junit.Assert.assertEquals; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java index c4b8d22385..fd594b6823 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.core.subscriber.SubscriberBarrier; import reactor.rx.Stream; import reactor.rx.stream.Signal; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandler.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandler.java index 90c8a75998..74396d3c2f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandler.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandler.java @@ -22,8 +22,8 @@ import javax.xml.bind.Unmarshaller; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/ByteBufferDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/ByteBufferDecoderTests.java index 1259a0019c..85106d1130 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/ByteBufferDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/ByteBufferDecoderTests.java @@ -20,17 +20,18 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.*; import org.junit.Test; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.io.buffer.Buffer; import org.springframework.core.ResolvableType; import org.springframework.core.codec.support.ByteBufferDecoder; import org.springframework.http.MediaType; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JacksonJsonDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JacksonJsonDecoderTests.java index e80bd0298d..8a0e476c43 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JacksonJsonDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JacksonJsonDecoderTests.java @@ -20,12 +20,8 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.io.buffer.Buffer; import org.springframework.core.ResolvableType; @@ -33,6 +29,9 @@ import org.springframework.core.codec.support.JacksonJsonDecoder; import org.springframework.http.MediaType; import org.springframework.reactive.codec.Pojo; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/Jaxb2DecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/Jaxb2DecoderTests.java index 69aaffdf8a..a50b061afc 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/Jaxb2DecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/Jaxb2DecoderTests.java @@ -20,12 +20,8 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.io.buffer.Buffer; import org.springframework.core.ResolvableType; @@ -33,6 +29,9 @@ import org.springframework.core.codec.support.Jaxb2Decoder; import org.springframework.http.MediaType; import org.springframework.reactive.codec.Pojo; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JsonObjectDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JsonObjectDecoderTests.java index 6f3a5e1e1c..c0b27df9f8 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JsonObjectDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JsonObjectDecoderTests.java @@ -21,14 +21,15 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; import org.junit.Test; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.io.buffer.Buffer; import org.springframework.core.codec.support.JsonObjectDecoder; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.assertEquals; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java index 0d693ec4af..d185f61af7 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java @@ -16,16 +16,13 @@ package org.springframework.reactive.codec.decoder; -import static java.util.stream.Collectors.*; -import static org.junit.Assert.*; - import java.nio.ByteBuffer; import java.util.List; import java.util.stream.StreamSupport; import org.junit.Test; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.core.publisher.convert.RxJava1SingleConverter; import reactor.io.buffer.Buffer; import rx.Single; @@ -34,6 +31,9 @@ import org.springframework.core.ResolvableType; import org.springframework.core.codec.support.StringDecoder; import org.springframework.http.MediaType; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze * @author Brian Clozel diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/ByteBufferEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/ByteBufferEncoderTests.java index c7612bb0aa..16eb7a5644 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/ByteBufferEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/ByteBufferEncoderTests.java @@ -20,17 +20,18 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.*; import org.junit.Test; import org.reactivestreams.Publisher; -import reactor.Flux; +import reactor.core.publisher.Flux; import reactor.io.buffer.Buffer; import org.springframework.core.ResolvableType; import org.springframework.core.codec.support.ByteBufferEncoder; import org.springframework.http.MediaType; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JacksonJsonEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JacksonJsonEncoderTests.java index 685c3d8e9f..18492f1d88 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JacksonJsonEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JacksonJsonEncoderTests.java @@ -16,22 +16,20 @@ package org.springframework.reactive.codec.encoder; -import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.codec.support.JacksonJsonEncoder; import org.springframework.http.MediaType; import org.springframework.reactive.codec.Pojo; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/Jaxb2EncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/Jaxb2EncoderTests.java index d2c4d62ca4..dbbb849d6c 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/Jaxb2EncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/Jaxb2EncoderTests.java @@ -20,17 +20,16 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.codec.support.Jaxb2Encoder; import org.springframework.http.MediaType; import org.springframework.reactive.codec.Pojo; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JsonObjectEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JsonObjectEncoderTests.java index 0d31bfda8a..ee6ac9f07f 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JsonObjectEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JsonObjectEncoderTests.java @@ -19,14 +19,15 @@ package org.springframework.reactive.codec.encoder; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import static org.junit.Assert.assertEquals; import org.junit.Test; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import org.springframework.core.codec.support.JsonObjectEncoder; +import static org.junit.Assert.assertEquals; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/StringEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/StringEncoderTests.java index 215c3d17ea..18a1c8993b 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/StringEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/StringEncoderTests.java @@ -16,22 +16,20 @@ package org.springframework.reactive.codec.encoder; -import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; -import reactor.Flux; +import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; import org.springframework.core.codec.support.StringEncoder; import org.springframework.http.MediaType; +import static java.util.stream.Collectors.toList; +import static org.junit.Assert.*; + /** * @author Sebastien Deleuze */ diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java index 216fb15c2e..443009da52 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.reactivestreams.Publisher; -import reactor.Mono; +import reactor.core.publisher.Mono; import reactor.rx.Stream; import reactor.rx.stream.Signal; @@ -57,10 +57,7 @@ import org.springframework.web.server.WebHandler; import org.springframework.web.server.WebServerExchange; import static org.hamcrest.CoreMatchers.startsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; /** * Test the effect of exceptions at different stages of request processing by diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java index c25ea1bb7e..8221d555a0 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import org.springframework.context.support.StaticApplicationContext; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java index fef38f5552..dc4ffd88fc 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java @@ -25,8 +25,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.reactivestreams.Publisher; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.rx.Stream; import reactor.rx.stream.Signal; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java index 1bc53dcdce..8ce0f57628 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java @@ -20,10 +20,10 @@ import java.net.URI; import java.util.List; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; import org.junit.Before; import org.junit.Test; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; import org.springframework.context.support.StaticApplicationContext; import org.springframework.http.HttpMethod; @@ -37,9 +37,9 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.server.DefaultWebServerExchange; import org.springframework.web.server.WebServerExchange; +import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import reactor.Flux; /** * @author Sebastien Deleuze diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java index a10c0f23f3..393792e3d3 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java @@ -26,8 +26,8 @@ import java.util.concurrent.CompletableFuture; import org.junit.Ignore; import org.junit.Test; import org.reactivestreams.Publisher; -import reactor.Flux; -import reactor.Mono; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import reactor.io.buffer.Buffer; import reactor.rx.Promise; import reactor.rx.Stream; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/server/ExceptionHandlingHttpHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/server/ExceptionHandlingHttpHandlerTests.java index 48cf44bdd0..0360c17ace 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/server/ExceptionHandlingHttpHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/server/ExceptionHandlingHttpHandlerTests.java @@ -20,7 +20,7 @@ import java.net.URI; import org.junit.Before; import org.junit.Test; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/server/FilteringWebHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/server/FilteringWebHandlerTests.java index e06a9104a2..7f56a39cce 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/server/FilteringWebHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/server/FilteringWebHandlerTests.java @@ -20,7 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; -import reactor.Mono; +import reactor.core.publisher.Mono; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.ServerHttpRequest;