root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Update reactor converter package

This commit is contained in:
Rossen Stoyanchev 2016-01-19 21:34:28 -05:00
parent 198e316412
commit 2dd9c92267
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java
View File

@ -44,10 +44,10 @@ public class ReactiveStreamsToCompletableFutureConverter implements GenericConve
return null;
}
else if (CompletableFuture.class.isAssignableFrom(source.getClass())) {
return reactor.core.publisher.convert.CompletableFutureConverter.from((CompletableFuture) source);
return reactor.core.converter.CompletableFutureConverter.from((CompletableFuture) source);
}
else if (CompletableFuture.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) {
return reactor.core.publisher.convert.CompletableFutureConverter.fromSingle((Publisher) source);
return reactor.core.converter.CompletableFutureConverter.fromSingle((Publisher) source);
}
return null;
}

6
spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToRxJava1Converter.java
View File

@ -20,7 +20,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
import org.reactivestreams.Publisher;
import reactor.core.publisher.convert.RxJava1Converter;
import reactor.core.converter.RxJava1Converter;
import rx.Observable;
import rx.Single;
@ -56,10 +56,10 @@ public final class ReactiveStreamsToRxJava1Converter implements GenericConverter
return RxJava1Converter.from((Publisher) source);
}
else if (Single.class.isAssignableFrom(source.getClass())) {
return reactor.core.publisher.convert.RxJava1SingleConverter.from((Single) source);
return reactor.core.converter.RxJava1SingleConverter.from((Single) source);
}
else if (Single.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) {
return reactor.core.publisher.convert.RxJava1SingleConverter.from((Publisher) source);
return reactor.core.converter.RxJava1SingleConverter.from((Publisher) source);
}
return null;
}

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java
View File

@ -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.publisher.convert.RxJava1Converter;
import reactor.core.converter.RxJava1Converter;
import rx.Observable;
import org.springframework.util.Assert;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java
View File

@ -26,8 +26,8 @@ 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.publisher.Flux;
import reactor.core.publisher.convert.RxJava1Converter;
import rx.Observable;
import org.springframework.http.HttpCookie;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java
View File

@ -24,7 +24,7 @@ import io.netty.handler.codec.http.cookie.DefaultCookie;
import io.reactivex.netty.protocol.http.server.HttpServerResponse;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Mono;
import reactor.core.publisher.convert.RxJava1Converter;
import reactor.core.converter.RxJava1Converter;
import rx.Observable;
import org.springframework.http.HttpCookie;

2
spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java
View File

@ -23,7 +23,7 @@ import java.util.stream.StreamSupport;
import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.convert.RxJava1SingleConverter;
import reactor.core.converter.RxJava1SingleConverter;
import reactor.io.buffer.Buffer;
import rx.Single;