From d39da1d06ddebca55caeee8d7439381eba8ba2ed Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 15 Mar 2017 16:57:40 -0400 Subject: [PATCH] Polish + minor HttpHandler refactoring CompositeHttpHandler is public and called ContextPathCompositeHandler. Also an overhaul of the Javadoc on HttpHandler, WebHttpHandlerAdapter, and ContextPathCompositeHandler. --- .../server/reactive/CompositeHttpHandler.java | 73 ----------------- .../reactive/ContextPathCompositeHandler.java | 82 +++++++++++++++++++ .../http/server/reactive/HttpHandler.java | 37 +++++---- .../reactive/ReactorHttpHandlerAdapter.java | 1 + .../reactive/RxNettyHttpHandlerAdapter.java | 2 +- .../reactive/ServletHttpHandlerAdapter.java | 16 ++-- .../reactive/UndertowHttpHandlerAdapter.java | 2 +- .../server/adapter/WebHttpHandlerBuilder.java | 26 +++--- ... => ContextPathCompositeHandlerTests.java} | 57 ++++--------- .../bootstrap/AbstractHttpServer.java | 6 ++ .../reactive/bootstrap/JettyHttpServer.java | 5 +- .../reactive/bootstrap/ReactorHttpServer.java | 4 +- .../reactive/bootstrap/RxNettyHttpServer.java | 4 +- .../reactive/bootstrap/TomcatHttpServer.java | 5 +- .../bootstrap/UndertowHttpServer.java | 4 +- .../web/reactive/package-info.java | 10 ++- 16 files changed, 169 insertions(+), 165 deletions(-) delete mode 100644 spring-web/src/main/java/org/springframework/http/server/reactive/CompositeHttpHandler.java create mode 100644 spring-web/src/main/java/org/springframework/http/server/reactive/ContextPathCompositeHandler.java rename spring-web/src/test/java/org/springframework/http/server/reactive/{HttpHandlerTests.java => ContextPathCompositeHandlerTests.java} (72%) diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/CompositeHttpHandler.java b/spring-web/src/main/java/org/springframework/http/server/reactive/CompositeHttpHandler.java deleted file mode 100644 index 377741e9e55..00000000000 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/CompositeHttpHandler.java +++ /dev/null @@ -1,73 +0,0 @@ - -package org.springframework.http.server.reactive; - -import java.util.LinkedHashMap; -import java.util.Map; - -import org.springframework.http.HttpStatus; -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; - -import reactor.core.publisher.Mono; - -/** - * Composite HttpHandler that selects the handler to use by context path. - * - * @author Rossen Stoyanchev - */ -class CompositeHttpHandler implements HttpHandler { - - private final Map handlerMap; - - public CompositeHttpHandler(Map handlerMap) { - Assert.notEmpty(handlerMap, "Handler map must not be empty"); - this.handlerMap = initHandlerMap(handlerMap); - } - - private static Map initHandlerMap( - Map inputMap) { - inputMap.keySet().stream().forEach(CompositeHttpHandler::validateContextPath); - return new LinkedHashMap<>(inputMap); - } - - private static void validateContextPath(String contextPath) { - Assert.hasText(contextPath, "Context path must not be empty"); - if (!contextPath.equals("/")) { - Assert.isTrue(contextPath.startsWith("/"), - "Context path must begin with '/'"); - Assert.isTrue(!contextPath.endsWith("/"), - "Context path must not end with '/'"); - } - } - - @Override - public Mono handle(ServerHttpRequest request, ServerHttpResponse response) { - String path = getPathToUse(request); - return this.handlerMap.entrySet().stream().filter( - entry -> path.startsWith(entry.getKey())).findFirst().map(entry -> { - // Preserve "native" contextPath from underlying request.. - String contextPath = request.getContextPath() + entry.getKey(); - ServerHttpRequest mutatedRequest = request.mutate().contextPath( - contextPath).build(); - HttpHandler handler = entry.getValue(); - return handler.handle(mutatedRequest, response); - }).orElseGet(() -> { - response.setStatusCode(HttpStatus.NOT_FOUND); - response.setComplete(); - return Mono.empty(); - }); - } - - /** - * Strip the context path from the native request, if any. - */ - private String getPathToUse(ServerHttpRequest request) { - String path = request.getURI().getRawPath(); - String contextPath = request.getContextPath(); - if (!StringUtils.hasText(contextPath)) { - return path; - } - int contextLength = contextPath.length(); - return (path.length() > contextLength ? path.substring(contextLength) : ""); - } -} diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ContextPathCompositeHandler.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ContextPathCompositeHandler.java new file mode 100644 index 00000000000..03e0e967869 --- /dev/null +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ContextPathCompositeHandler.java @@ -0,0 +1,82 @@ + +package org.springframework.http.server.reactive; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.springframework.http.HttpStatus; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; + +import reactor.core.publisher.Mono; + +/** + * {@code HttpHandler} delegating requests to one of several {@code HttpHandler}'s + * based on simple, prefix-based mappings. + * + *

This is intended as a coarse-grained mechanism for delegating requests to + * one of several applications -- each represented by an {@code HttpHandler}, with + * the application "context path" (the prefix-based mapping) exposed via + * {@link ServerHttpRequest#getContextPath()}. + * + * @author Rossen Stoyanchev + * @since 5.0 + */ +public class ContextPathCompositeHandler implements HttpHandler { + + private final Map handlerMap; + + + public ContextPathCompositeHandler(Map handlerMap) { + Assert.notEmpty(handlerMap, "Handler map must not be empty"); + this.handlerMap = initHandlers(handlerMap); + } + + private static Map initHandlers(Map map) { + map.keySet().forEach(ContextPathCompositeHandler::assertValidContextPath); + return new LinkedHashMap<>(map); + } + + private static void assertValidContextPath(String contextPath) { + Assert.hasText(contextPath, "Context path must not be empty"); + if (contextPath.equals("/")) { + return; + } + Assert.isTrue(contextPath.startsWith("/"), "Context path must begin with '/'"); + Assert.isTrue(!contextPath.endsWith("/"), "Context path must not end with '/'"); + } + + + @Override + public Mono handle(ServerHttpRequest request, ServerHttpResponse response) { + String path = getPathWithinApplication(request); + return this.handlerMap.entrySet().stream() + .filter(entry -> path.startsWith(entry.getKey())) + .findFirst() + .map(entry -> { + String contextPath = request.getContextPath() + entry.getKey(); + ServerHttpRequest newRequest = request.mutate().contextPath(contextPath).build(); + return entry.getValue().handle(newRequest, response); + }) + .orElseGet(() -> { + response.setStatusCode(HttpStatus.NOT_FOUND); + response.setComplete(); + return Mono.empty(); + }); + } + + /** + * Get the path within the "native" context path of the underlying server, + * for example when running on a Servlet container. + */ + private String getPathWithinApplication(ServerHttpRequest request) { + String path = request.getURI().getRawPath(); + String contextPath = request.getContextPath(); + if (!StringUtils.hasText(contextPath)) { + return path; + } + int length = contextPath.length(); + return (path.length() > length ? path.substring(length) : ""); + } + +} diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/HttpHandler.java b/spring-web/src/main/java/org/springframework/http/server/reactive/HttpHandler.java index df3b5aab05a..5683a7d630b 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/HttpHandler.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/HttpHandler.java @@ -16,35 +16,38 @@ package org.springframework.http.server.reactive; -import java.util.Map; - import reactor.core.publisher.Mono; /** - * Contract for handling HTTP requests in a non-blocking way. + * Lowest level contract for reactive HTTP request handling that serves as a + * common denominator across different runtimes. + * + *

Higher-level, but still generic, building blocks for applications such as + * {@code WebFilter}, {@code WebSession}, {@code ServerWebExchange}, and others + * are available in the {@link org.springframework.web.server} package. + * + *

Application level programming models such as annotated controllers and + * functional handlers are available in the {@code spring-webflux} module. + * + *

Typically an {@link HttpHandler} represents an entire application with + * higher-level programming models bridged via + * {@link org.springframework.web.server.adapter.WebHttpHandlerBuilder + * WebHttpHandlerBuilder}. Multiple applications at unique context paths can be + * plugged in with the help of the {@link ContextPathCompositeHandler}. * * @author Arjen Poutsma * @author Rossen Stoyanchev * @since 5.0 + * @see ContextPathCompositeHandler */ public interface HttpHandler { /** - * Handle the given request and generate a response. - * @param request current HTTP request - * @param response current HTTP response - * @return {@code Mono} to indicate when request handling is complete + * Handle the given request and write to the response. + * @param request current request + * @param response current response + * @return indicates completion of request handling */ Mono handle(ServerHttpRequest request, ServerHttpResponse response); - /** - * Return a composite {@link HttpHandler} that maps multiple - * {@link HttpHandler}s each mapped to a distinct context path. - * @param handlerMap the source handler map - * @return a composite {@link HttpHandler} - */ - static HttpHandler of(Map handlerMap) { - return new CompositeHttpHandler(handlerMap); - } - } diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java index 1f862def273..027a4351cfa 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java @@ -48,6 +48,7 @@ public class ReactorHttpHandlerAdapter this.httpHandler = httpHandler; } + @Override public Mono apply(HttpServerRequest request, HttpServerResponse response) { diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java index f0ca6b37994..72ccd41c52b 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java @@ -42,7 +42,7 @@ import rx.RxReactiveStreams; */ public class RxNettyHttpHandlerAdapter implements RequestHandler { - private static final Log logger = LogFactory.getLog(ReactorHttpHandlerAdapter.class); + private static final Log logger = LogFactory.getLog(RxNettyHttpHandlerAdapter.class); private final HttpHandler httpHandler; diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java index 15604955888..df777d849e5 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java @@ -48,7 +48,7 @@ import org.springframework.util.Assert; @SuppressWarnings("serial") public class ServletHttpHandlerAdapter implements Servlet { - private static final Log logger = LogFactory.getLog(ReactorHttpHandlerAdapter.class); + private static final Log logger = LogFactory.getLog(ServletHttpHandlerAdapter.class); private static final int DEFAULT_BUFFER_SIZE = 8192; @@ -110,12 +110,18 @@ public class ServletHttpHandlerAdapter implements Servlet { this.httpHandler.handle(httpRequest, httpResponse).subscribe(subscriber); } - protected ServerHttpRequest createRequest(HttpServletRequest request, AsyncContext context) throws IOException { - return new ServletServerHttpRequest(request, context, getDataBufferFactory(), getBufferSize()); + protected ServerHttpRequest createRequest(HttpServletRequest request, + AsyncContext context) throws IOException { + + return new ServletServerHttpRequest( + request, context, getDataBufferFactory(), getBufferSize()); } - protected ServerHttpResponse createResponse(HttpServletResponse response, AsyncContext context) throws IOException { - return new ServletServerHttpResponse(response, context, getDataBufferFactory(), getBufferSize()); + protected ServerHttpResponse createResponse(HttpServletResponse response, + AsyncContext context) throws IOException { + + return new ServletServerHttpResponse( + response, context, getDataBufferFactory(), getBufferSize()); } diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java index 4a959702f35..935e873b7cd 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java @@ -37,7 +37,7 @@ import org.springframework.util.Assert; */ public class UndertowHttpHandlerAdapter implements io.undertow.server.HttpHandler { - private static final Log logger = LogFactory.getLog(ReactorHttpHandlerAdapter.class); + private static final Log logger = LogFactory.getLog(UndertowHttpHandlerAdapter.class); private final HttpHandler httpHandler; diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java index ac070f6f71b..62b233e0928 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java @@ -35,24 +35,24 @@ import org.springframework.web.server.session.DefaultWebSessionManager; import org.springframework.web.server.session.WebSessionManager; /** - * Builder for an {@link HttpHandler} that adapts to a target {@link WebHandler} - * along with a chain of {@link WebFilter}s and a set of - * {@link WebExceptionHandler}s. + * This builder has two purposes. * - *

Example usage: - * 

- * WebFilter filter = ... ;
- * WebHandler webHandler = ... ;
- * WebExceptionHandler exceptionHandler = ...;
+ * 
One is to assemble a processing chain that consists of a target
+ * {@link WebHandler}, then decorated with a set of {@link WebFilter}'s, then
+ * further decorated with a set of {@link WebExceptionHandler}'s.
  *
- * HttpHandler httpHandler = WebHttpHandlerBuilder.webHandler(webHandler)
- *         .filters(filter)
- *         .exceptionHandlers(exceptionHandler)
- *         .build();
- *
+ *

The second purpose is to adapt the resulting processing chain to an + * {@link HttpHandler} -- the lowest level reactive HTTP handling abstraction, + * which can then be used with any of the supported runtimes. The adaptation + * is done with the help of {@link HttpWebHandlerAdapter}. + * + *

The processing chain can be assembled manually via builder methods, or + * detected from Spring configuration via + * {@link #applicationContext(ApplicationContext)}, or a mix of both. * * @author Rossen Stoyanchev * @since 5.0 + * @see HttpWebHandlerAdapter */ public class WebHttpHandlerBuilder { diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHandlerTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ContextPathCompositeHandlerTests.java similarity index 72% rename from spring-web/src/test/java/org/springframework/http/server/reactive/HttpHandlerTests.java rename to spring-web/src/test/java/org/springframework/http/server/reactive/ContextPathCompositeHandlerTests.java index 5a350cbd814..89b5e29265a 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ContextPathCompositeHandlerTests.java @@ -34,26 +34,27 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * Unit tests for {@link HttpHandler}. + * Unit tests for {@link ContextPathCompositeHandler}. * * @author Rossen Stoyanchev */ -public class HttpHandlerTests { +public class ContextPathCompositeHandlerTests { + @Test public void invalidContextPath() { - testInvalidContextPath(" ", "Context path must not be empty"); - testInvalidContextPath("path", "Context path must begin with '/'"); - testInvalidContextPath("/path/", "Context path must not end with '/'"); + testInvalid(" ", "Context path must not be empty"); + testInvalid("path", "Context path must begin with '/'"); + testInvalid("/path/", "Context path must not end with '/'"); } - private void testInvalidContextPath(String contextPath, String errorMessage) { + private void testInvalid(String contextPath, String expectedError) { try { - new TestHttpHandlerAdapter(Collections.singletonMap(contextPath, new TestHttpHandler())); + new ContextPathCompositeHandler(Collections.singletonMap(contextPath, new TestHttpHandler())); fail(); } catch (IllegalArgumentException ex) { - assertEquals(errorMessage, ex.getMessage()); + assertEquals(expectedError, ex.getMessage()); } } @@ -68,7 +69,7 @@ public class HttpHandlerTests { map.put("/another/path", handler2); map.put("/yet/another/path", handler3); - testPath("/another/path/and/more", map); + testHandle("/another/path/and/more", map); assertInvoked(handler2, "/another/path"); assertNotInvoked(handler1, handler3); @@ -85,7 +86,7 @@ public class HttpHandlerTests { map.put("/another/path", handler2); map.put("/yet/another/path", handler3); - testPath("/path", map); + testHandle("/path", map); assertInvoked(handler1, "/path"); assertNotInvoked(handler2, handler3); @@ -101,7 +102,7 @@ public class HttpHandlerTests { TestHttpHandler handler = new TestHttpHandler(); Map map = Collections.singletonMap("/another/path", handler); - new TestHttpHandlerAdapter(map).handle(request); + new ContextPathCompositeHandler(map).handle(request, new MockServerHttpResponse()); assertTrue(handler.wasInvoked()); assertEquals("/yet/another/path", handler.getRequest().getContextPath()); @@ -116,16 +117,18 @@ public class HttpHandlerTests { map.put("/path", handler1); map.put("/another/path", handler2); - ServerHttpResponse response = testPath("/yet/another/path", map); + ServerHttpResponse response = testHandle("/yet/another/path", map); assertNotInvoked(handler1, handler2); assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); } - private ServerHttpResponse testPath(String path, Map handlerMap) { - TestHttpHandlerAdapter adapter = new TestHttpHandlerAdapter(handlerMap); - return adapter.handle(path); + private ServerHttpResponse testHandle(String pathToHandle, Map handlerMap) { + ServerHttpRequest request = MockServerHttpRequest.get(pathToHandle).build(); + ServerHttpResponse response = new MockServerHttpResponse(); + new ContextPathCompositeHandler(handlerMap).handle(request, response); + return response; } private void assertInvoked(TestHttpHandler handler, String contextPath) { @@ -138,30 +141,6 @@ public class HttpHandlerTests { } - @SuppressWarnings("WeakerAccess") - private static class TestHttpHandlerAdapter { - - - private final HttpHandler httpHandler; - - - public TestHttpHandlerAdapter(Map handlerMap) { - this.httpHandler = HttpHandler.of(handlerMap); - } - - public ServerHttpResponse handle(String path) { - ServerHttpRequest request = MockServerHttpRequest.get(path).build(); - return handle(request); - } - - public ServerHttpResponse handle(ServerHttpRequest request) { - ServerHttpResponse response = new MockServerHttpResponse(); - this.httpHandler.handle(request, response); - return response; - } - } - - @SuppressWarnings("WeakerAccess") private static class TestHttpHandler implements HttpHandler { diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/AbstractHttpServer.java b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/AbstractHttpServer.java index 8ed8e319e43..bf7f24ede1c 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/AbstractHttpServer.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/AbstractHttpServer.java @@ -19,6 +19,7 @@ package org.springframework.http.server.reactive.bootstrap; import java.util.LinkedHashMap; import java.util.Map; +import org.springframework.http.server.reactive.ContextPathCompositeHandler; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.util.Assert; @@ -79,6 +80,11 @@ public abstract class AbstractHttpServer implements HttpServer { return this.handlerMap; } + protected HttpHandler resolveHttpHandler() { + return getHttpHandlerMap() != null ? + new ContextPathCompositeHandler(getHttpHandlerMap()) : getHttpHandler(); + } + // InitializingBean diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java index a7a5188cbd9..28507a04251 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java @@ -20,7 +20,7 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.springframework.http.server.reactive.HttpHandler; + import org.springframework.http.server.reactive.JettyHttpHandlerAdapter; import org.springframework.http.server.reactive.ServletHttpHandlerAdapter; @@ -53,8 +53,7 @@ public class JettyHttpServer extends AbstractHttpServer { } private ServletHttpHandlerAdapter createServletAdapter() { - return new JettyHttpHandlerAdapter(getHttpHandlerMap() != null - ? HttpHandler.of(getHttpHandlerMap()) : getHttpHandler()); + return new JettyHttpHandlerAdapter(resolveHttpHandler()); } @Override diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java index c04b2508b5a..30bde7a4b0c 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/ReactorHttpServer.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicReference; import reactor.core.Loopback; import reactor.ipc.netty.NettyContext; -import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter; /** @@ -43,8 +42,7 @@ public class ReactorHttpServer extends AbstractHttpServer implements Loopback { } private ReactorHttpHandlerAdapter createHttpHandlerAdapter() { - return new ReactorHttpHandlerAdapter(getHttpHandlerMap() != null - ? HttpHandler.of(getHttpHandlerMap()) : getHttpHandler()); + return new ReactorHttpHandlerAdapter(resolveHttpHandler()); } @Override diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java index 25d8638d491..fa73eaf1257 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/RxNettyHttpServer.java @@ -18,7 +18,6 @@ package org.springframework.http.server.reactive.bootstrap; import io.netty.buffer.ByteBuf; -import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.RxNettyHttpHandlerAdapter; /** @@ -38,8 +37,7 @@ public class RxNettyHttpServer extends AbstractHttpServer { } private RxNettyHttpHandlerAdapter createHttpHandlerAdapter() { - return new RxNettyHttpHandlerAdapter(getHttpHandlerMap() != null - ? HttpHandler.of(getHttpHandlerMap()) : getHttpHandler()); + return new RxNettyHttpHandlerAdapter(resolveHttpHandler()); } diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java index f6b609ea89d..7b9bcbd7dc3 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java @@ -21,7 +21,7 @@ import java.io.File; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.startup.Tomcat; -import org.springframework.http.server.reactive.HttpHandler; + import org.springframework.http.server.reactive.ServletHttpHandlerAdapter; import org.springframework.http.server.reactive.TomcatHttpHandlerAdapter; import org.springframework.util.Assert; @@ -68,8 +68,7 @@ public class TomcatHttpServer extends AbstractHttpServer { } private ServletHttpHandlerAdapter initServletAdapter() { - return new TomcatHttpHandlerAdapter(getHttpHandlerMap() != null - ? HttpHandler.of(getHttpHandlerMap()) : getHttpHandler()); + return new TomcatHttpHandlerAdapter(resolveHttpHandler()); } diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java index c00a5dd6c99..9448f302dad 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/UndertowHttpServer.java @@ -20,7 +20,6 @@ import java.net.InetSocketAddress; import io.undertow.Undertow; -import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.UndertowHttpHandlerAdapter; /** @@ -39,8 +38,7 @@ public class UndertowHttpServer extends AbstractHttpServer { } private UndertowHttpHandlerAdapter initHttpHandlerAdapter() { - return new UndertowHttpHandlerAdapter(getHttpHandlerMap() != null - ? HttpHandler.of(getHttpHandlerMap()) : getHttpHandler()); + return new UndertowHttpHandlerAdapter(resolveHttpHandler()); } @Override diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java index 92e44577797..51c980da9cd 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java @@ -1,4 +1,12 @@ /** - * Core interfaces and classes for Spring Web Reactive. + * Top-level package for the {@code spring-webflux} module that contains + * {@link org.springframework.web.reactive.DispatcherHandler}, the main entry + * point for WebFlux server endpoint processing including key contracts used to + * map requests to handlers, invoke them, and process the result. + * + *

The module provides two programming models for reactive server endpoints. + * One based on annotated {@code @Controller}'s and another based on functional + * routing and handling. The module also contains a functional, reactive + * {@code WebClient} as well as client and server, reactive WebSocket support. */ package org.springframework.web.reactive;