diff --git a/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java b/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java index 10aa4c23d2..92165fac16 100644 --- a/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java +++ b/spring-web-reactive/src/main/java/org/springframework/util/ByteBufferPublisherInputStream.java @@ -23,7 +23,7 @@ import java.util.concurrent.BlockingQueue; import org.reactivestreams.Publisher; import org.reactivestreams.Subscription; -import reactor.rx.Streams; +import reactor.rx.Stream; /** * {@code InputStream} implementation based on a byte array {@link Publisher}. @@ -60,7 +60,7 @@ public class ByteBufferPublisherInputStream extends InputStream { public ByteBufferPublisherInputStream(Publisher publisher, int requestSize) { Assert.notNull(publisher, "'publisher' must not be null"); - this.queue = Streams.from(publisher).toBlockingQueue(requestSize); + this.queue = Stream.from(publisher).toBlockingQueue(requestSize); } 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 dd1a4278de..90c8a75998 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,9 +22,9 @@ 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.io.buffer.Buffer; -import reactor.rx.Streams; import org.springframework.http.MediaType; import org.springframework.util.BufferOutputStream; @@ -73,7 +73,7 @@ public class XmlHandler implements HttpHandler { bos.close(); buffer.flip(); - return response.setBody(Streams.just(buffer.byteBuffer())); + return response.setBody(Flux.just(buffer.byteBuffer())); } catch (Exception ex) { logger.error(ex, ex);