From 4572cfa38c3d3b91c2b23dd519fd4ee147cc6c47 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Wed, 20 Jan 2016 11:45:18 +0100 Subject: [PATCH] Fix RxJava1Converter -> RxJava1ObservableConverter --- .../support/ReactiveStreamsToRxJava1Converter.java | 11 ++++++----- .../server/reactive/RxNettyHttpHandlerAdapter.java | 4 ++-- .../server/reactive/RxNettyServerHttpRequest.java | 4 ++-- .../server/reactive/RxNettyServerHttpResponse.java | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToRxJava1Converter.java b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToRxJava1Converter.java index 97a1d3e3a50..a9f6c0557c1 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToRxJava1Converter.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToRxJava1Converter.java @@ -20,7 +20,8 @@ import java.util.LinkedHashSet; import java.util.Set; import org.reactivestreams.Publisher; -import reactor.core.converter.RxJava1Converter; +import reactor.core.converter.RxJava1ObservableConverter; +import reactor.core.converter.RxJava1SingleConverter; import rx.Observable; import rx.Single; @@ -50,16 +51,16 @@ public final class ReactiveStreamsToRxJava1Converter implements GenericConverter return null; } if (Observable.class.isAssignableFrom(source.getClass())) { - return RxJava1Converter.from((Observable) source); + return RxJava1ObservableConverter.from((Observable) source); } else if (Observable.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) { - return RxJava1Converter.from((Publisher) source); + return RxJava1ObservableConverter.from((Publisher) source); } else if (Single.class.isAssignableFrom(source.getClass())) { - return reactor.core.converter.RxJava1SingleConverter.from((Single) source); + return RxJava1SingleConverter.from((Single) source); } else if (Single.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) { - return reactor.core.converter.RxJava1SingleConverter.from((Publisher) source); + return RxJava1SingleConverter.from((Publisher) source); } return null; } diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java index 91ae66ebdce..7763281fe9e 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java @@ -21,7 +21,7 @@ import io.reactivex.netty.protocol.http.server.HttpServerRequest; import io.reactivex.netty.protocol.http.server.HttpServerResponse; import io.reactivex.netty.protocol.http.server.RequestHandler; import org.reactivestreams.Publisher; -import reactor.core.converter.RxJava1Converter; +import reactor.core.converter.RxJava1ObservableConverter; import rx.Observable; import org.springframework.util.Assert; @@ -44,7 +44,7 @@ public class RxNettyHttpHandlerAdapter implements RequestHandler result = this.httpHandler.handle(adaptedRequest, adaptedResponse); - return RxJava1Converter.from(result); + return RxJava1ObservableConverter.from(result); } } 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 ae1bc28ce52..26dbc8271d0 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.core.converter.RxJava1Converter; +import reactor.core.converter.RxJava1ObservableConverter; import reactor.core.publisher.Flux; import rx.Observable; @@ -91,7 +91,7 @@ public class RxNettyServerHttpRequest extends AbstractServerHttpRequest { public Flux getBody() { Observable content = this.request.getContent().map(ByteBuf::nioBuffer); content = content.concatWith(Observable.empty()); // See GH issue #58 - return RxJava1Converter.from(content); + return RxJava1ObservableConverter.from(content); } } 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 a38685d6759..7dc1aa285f4 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,8 +23,8 @@ 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.core.converter.RxJava1ObservableConverter; import reactor.core.publisher.Mono; -import reactor.core.converter.RxJava1Converter; import rx.Observable; import org.springframework.http.HttpCookie; @@ -59,9 +59,9 @@ public class RxNettyServerHttpResponse extends AbstractServerHttpResponse { @Override protected Mono setBodyInternal(Publisher publisher) { - Observable content = RxJava1Converter.from(publisher).map(this::toBytes); + Observable content = RxJava1ObservableConverter.from(publisher).map(this::toBytes); Observable completion = this.response.writeBytes(content); - return RxJava1Converter.from(completion).after(); + return RxJava1ObservableConverter.from(completion).after(); } private byte[] toBytes(ByteBuffer buffer) {