Move RxNetty support to test scope
The RxNetty runtime support is not meant to be officially supported and should be restricted to testing purposes only. Issue: SPR-15444
This commit is contained in:
@@ -183,7 +183,6 @@ public class DispatcherHandler implements WebHandler, ApplicationContextAware {
|
||||
* @see HttpWebHandlerAdapter
|
||||
* @see org.springframework.http.server.reactive.ServletHttpHandlerAdapter
|
||||
* @see org.springframework.http.server.reactive.ReactorHttpHandlerAdapter
|
||||
* @see org.springframework.http.server.reactive.RxNettyHttpHandlerAdapter
|
||||
* @see org.springframework.http.server.reactive.UndertowHttpHandlerAdapter
|
||||
*/
|
||||
public static HttpHandler toHttpHandler(ApplicationContext context) {
|
||||
|
||||
@@ -46,7 +46,7 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
|
||||
*
|
||||
* <p>Additionally, this class can {@linkplain #toHttpHandler(RouterFunction) transform} a
|
||||
* {@code RouterFunction} into an {@code HttpHandler}, which can be run in Servlet 3.1+,
|
||||
* Reactor, RxNetty, or Undertow.
|
||||
* Reactor, or Undertow.
|
||||
* And it can {@linkplain #toHandlerMapping(RouterFunction, HandlerStrategies) transform} a
|
||||
* {@code RouterFunction} into an {@code HandlerMapping}, which can be run in a
|
||||
* {@code DispatcherHandler}.
|
||||
@@ -188,8 +188,6 @@ public abstract class RouterFunctions {
|
||||
* {@link org.springframework.http.server.reactive.ServletHttpHandlerAdapter},</li>
|
||||
* <li>Reactor using the
|
||||
* {@link org.springframework.http.server.reactive.ReactorHttpHandlerAdapter},</li>
|
||||
* <li>RxNetty using the
|
||||
* {@link org.springframework.http.server.reactive.RxNettyHttpHandlerAdapter}, or </li>
|
||||
* <li>Undertow using the
|
||||
* {@link org.springframework.http.server.reactive.UndertowHttpHandlerAdapter}.</li>
|
||||
* </ul>
|
||||
@@ -212,8 +210,6 @@ public abstract class RouterFunctions {
|
||||
* {@link org.springframework.http.server.reactive.ServletHttpHandlerAdapter},</li>
|
||||
* <li>Reactor using the
|
||||
* {@link org.springframework.http.server.reactive.ReactorHttpHandlerAdapter},</li>
|
||||
* <li>RxNetty using the
|
||||
* {@link org.springframework.http.server.reactive.RxNettyHttpHandlerAdapter}, or </li>
|
||||
* <li>Undertow using the
|
||||
* {@link org.springframework.http.server.reactive.UndertowHttpHandlerAdapter}.</li>
|
||||
* </ul>
|
||||
|
||||
@@ -67,10 +67,6 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
|
||||
"reactor.ipc.netty.http.server.HttpServerResponse",
|
||||
HandshakeWebSocketService.class.getClassLoader());
|
||||
|
||||
private static final boolean rxNettyPresent = ClassUtils.isPresent(
|
||||
"io.reactivex.netty.protocol.http.server.HttpServerResponse",
|
||||
HandshakeWebSocketService.class.getClassLoader());
|
||||
|
||||
private static final boolean undertowPresent = ClassUtils.isPresent(
|
||||
"io.undertow.websockets.WebSocketProtocolHandshakeHandler",
|
||||
HandshakeWebSocketService.class.getClassLoader());
|
||||
@@ -112,9 +108,6 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
|
||||
else if (reactorNettyPresent) {
|
||||
className = "ReactorNettyRequestUpgradeStrategy";
|
||||
}
|
||||
else if (rxNettyPresent) {
|
||||
className = "RxNettyRequestUpgradeStrategy";
|
||||
}
|
||||
else if (undertowPresent) {
|
||||
className = "UndertowRequestUpgradeStrategy";
|
||||
}
|
||||
|
||||
@@ -39,7 +39,8 @@ import org.springframework.web.reactive.socket.WebSocketSession;
|
||||
/**
|
||||
* Spring {@link WebSocketSession} implementation that adapts to the RxNetty
|
||||
* {@link io.reactivex.netty.protocol.http.ws.WebSocketConnection}.
|
||||
*
|
||||
* For internal use within the framework.
|
||||
*
|
||||
* @author Rossen Stoyanchev
|
||||
* @since 5.0
|
||||
*/
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2016 the original author or authors.
|
||||
* Copyright 2002-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -47,7 +47,8 @@ import static io.reactivex.netty.protocol.http.HttpHandlerNames.WsClientDecoder;
|
||||
|
||||
/**
|
||||
* {@link WebSocketClient} implementation for use with RxNetty.
|
||||
*
|
||||
* For internal use within the framework.
|
||||
*
|
||||
* <p><strong>Note: </strong> RxNetty {@link HttpClient} instances require a host
|
||||
* and port in order to be created. Hence it is not possible to configure a
|
||||
* single {@code HttpClient} instance to use upfront. Instead the constructors
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2016 the original author or authors.
|
||||
* Copyright 2002-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -35,6 +35,7 @@ import org.springframework.web.server.ServerWebExchange;
|
||||
|
||||
/**
|
||||
* A {@link RequestUpgradeStrategy} for use with RxNetty.
|
||||
* For internal use within the framework.
|
||||
*
|
||||
* @author Rossen Stoyanchev
|
||||
* @since 5.0
|
||||
Reference in New Issue
Block a user