Also provides implementations adapting to different runtimes - * including Servlet 3.1 containers, Netty + Reactor IO or RxNetty, and Undertow. + * including Servlet 3.1 containers, Netty + Reactor IO, and Undertow. */ package org.springframework.http.server.reactive; diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java b/spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java similarity index 98% rename from spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java rename to spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java index 091c220a1c..ac9eb4ffa9 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java @@ -36,6 +36,7 @@ import rx.RxReactiveStreams; /** * Adapt {@link HttpHandler} to the RxNetty {@link RequestHandler}. + * For internal use within the framework. * * @author Rossen Stoyanchev * @since 5.0 diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java b/spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java similarity index 98% rename from spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java rename to spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java index 28effa2f95..503c2653ad 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java @@ -39,6 +39,7 @@ import org.springframework.util.MultiValueMap; /** * Adapt {@link ServerHttpRequest} to the RxNetty {@link HttpServerRequest}. + * For internal use within the framework. * * @author Rossen Stoyanchev * @author Stephane Maldini diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java b/spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java similarity index 99% rename from spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java rename to spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java index 71c9f33442..f25f1df618 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java @@ -38,7 +38,8 @@ import org.springframework.util.Assert; /** * Adapt {@link ServerHttpResponse} to the RxNetty {@link HttpServerResponse}. - * + * For internal use within the framework. + * * @author Rossen Stoyanchev * @author Stephane Maldini * @author Sebastien Deleuze diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java index ea16fefc45..754125719b 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java @@ -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) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java index 60e15438e8..a09e8061f4 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java @@ -46,7 +46,7 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder; * *
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}, *
Note: 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 diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java similarity index 97% rename from spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java rename to spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java index f626446760..64323b1540 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java @@ -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 diff --git a/src/docs/asciidoc/web/web-flux-functional.adoc b/src/docs/asciidoc/web/web-flux-functional.adoc index 1fb7dca48d..3b1cb90d72 100644 --- a/src/docs/asciidoc/web/web-flux-functional.adoc +++ b/src/docs/asciidoc/web/web-flux-functional.adoc @@ -177,7 +177,7 @@ Now there is just one piece of the puzzle missing: running a router function in You can convert a router function into a `HttpHandler` by using `RouterFunctions.toHttpHandler(RouterFunction)`. The `HttpHandler` allows you to run on a wide variety of reactive runtimes: Reactor Netty, -RxNetty, Servlet 3.1+, and Undertow. +Servlet 3.1+, and Undertow. Here is how we run a router function in Reactor Netty, for instance: [source,java,indent=0] diff --git a/src/docs/asciidoc/web/web-flux.adoc b/src/docs/asciidoc/web/web-flux.adoc index 9c76786cf7..484d7d6118 100644 --- a/src/docs/asciidoc/web/web-flux.adoc +++ b/src/docs/asciidoc/web/web-flux.adoc @@ -223,7 +223,7 @@ default as following: WebFlux includes reactive WebSocket client and server support. Both client and server are supported on the Java WebSocket API -(JSR-356), Jetty, Undertow, Reactor Netty, and RxNetty. +(JSR-356), Jetty, Undertow, and Reactor Netty. On the server side, declare a `WebSocketHandlerAdapter` and then simply add mappings to `WebSocketHandler`-based endpoints: @@ -310,7 +310,6 @@ Lastly add the dependencies for one of the supported runtimes: * Tomcat -- `org.apache.tomcat.embed:tomcat-embed-core` * Jetty -- `org.eclipse.jetty:jetty-server` and `org.eclipse.jetty:jetty-servlet` * Reactor Netty -- `io.projectreactor.ipc:reactor-netty` -* RxNetty -- `io.reactivex:rxnetty-common` and `io.reactivex:rxnetty-http` * Undertow -- `io.undertow:undertow-core` For the **annotation-based programming model** bootstrap with: @@ -356,11 +355,6 @@ HttpServlet servlet = new ServletHttpHandlerAdapter(handler); ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler); HttpServer.create(host, port).newHandler(adapter).block(); -// RxNetty -RxNettyHttpHandlerAdapter adapter = new RxNettyHttpHandlerAdapter(handler); -HttpServer server = HttpServer.newServer(new InetSocketAddress(host, port)); -server.startAndAwait(adapter); - // Undertow UndertowHttpHandlerAdapter adapter = new UndertowHttpHandlerAdapter(handler); Undertow server = Undertow.builder().addHttpListener(port, host).setHandler(adapter).build();