Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable compilation on Eclipse 4.6

Browse Source
This commit is contained in:
Sam Brannen
2017-01-07 02:15:02 +01:00
parent 9ed66bf2eb
commit 08cc92176a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/RxNettyWebSocketClient.java
View File

@@ -31,6 +31,7 @@ import io.reactivex.netty.protocol.http.ws.client.WebSocketRequest;
import io.reactivex.netty.protocol.http.ws.client.WebSocketResponse;
import io.reactivex.netty.threads.RxEventLoopProvider;
import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2;
import reactor.util.function.Tuples;
import rx.Observable;
import rx.RxReactiveStreams;
@@ -121,12 +122,15 @@ public class RxNettyWebSocketClient extends WebSocketClientSupport implements We
return Mono.from(RxReactiveStreams.toPublisher(completion));
}
@SuppressWarnings("cast")
private Observable<Void> executeInternal(URI url, HttpHeaders headers, WebSocketHandler handler) {
String[] protocols = beforeHandshake(url, headers, handler);
return createRequest(url, headers, protocols)
.flatMap(response -> {
Observable<WebSocketConnection> conn = response.getWebSocketConnection();
return Observable.zip(Observable.just(response), conn, Tuples::of);
// following cast is necessary to enable compilation on Eclipse 4.6
return (Observable<Tuple2<WebSocketResponse<ByteBuf>, WebSocketConnection>>)
Observable.zip(Observable.just(response), conn, Tuples::of);
})
.flatMap(tuple -> {
WebSocketResponse<ByteBuf> response = tuple.getT1();