From 4e162122af36446d43f8196b0c8fbf663d3cc4d5 Mon Sep 17 00:00:00 2001 From: Stephane Maldini Date: Wed, 20 Jan 2016 20:50:28 +0000 Subject: [PATCH] sync update on reactor-core --- .../core/codec/support/AbstractRawByteStreamDecoder.java | 2 +- .../springframework/core/codec/support/JsonObjectEncoder.java | 2 +- .../http/server/reactive/UndertowHttpHandlerAdapter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 21ec772cd4..a77141afca 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 @@ -24,7 +24,7 @@ import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import reactor.core.publisher.Flux; import reactor.core.subscriber.SubscriberBarrier; -import reactor.core.subscription.BackpressureUtils; +import reactor.core.util.BackpressureUtils; import org.springframework.core.ResolvableType; import org.springframework.core.codec.Decoder; 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 6fcb243024..a2c5c5d34c 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 @@ -26,7 +26,7 @@ import org.reactivestreams.Subscriber; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.subscriber.SubscriberBarrier; -import reactor.core.subscription.BackpressureUtils; +import reactor.core.util.BackpressureUtils; import reactor.io.buffer.Buffer; import org.springframework.core.ResolvableType; 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 f25bd17a9e..8977890fed 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 @@ -37,7 +37,7 @@ import org.xnio.channels.StreamSinkChannel; import org.xnio.channels.StreamSourceChannel; import reactor.core.publisher.Mono; import reactor.core.subscriber.BaseSubscriber; -import reactor.core.subscription.BackpressureUtils; +import reactor.core.util.BackpressureUtils; import reactor.core.util.Exceptions; import org.springframework.util.Assert;