diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webflux/MockReactiveWebServerFactory.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webflux/MockReactiveWebServerFactory.java index 6cbf51c3ceb..bb1e1b16458 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webflux/MockReactiveWebServerFactory.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webflux/MockReactiveWebServerFactory.java @@ -41,12 +41,6 @@ public class MockReactiveWebServerFactory extends AbstractReactiveWebServerFacto return this.webServer; } - @Override - public WebServer getWebServer(Map handlerMap) { - this.webServer = spy(new MockReactiveWebServer(handlerMap, getPort())); - return this.webServer; - } - public MockReactiveWebServer getWebServer() { return this.webServer; } diff --git a/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java b/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java index ca57e24289f..7fd68b86f05 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java @@ -17,7 +17,6 @@ package org.springframework.boot.web.embedded.jetty; import java.net.InetSocketAddress; -import java.util.Map; import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.ConnectionFactory; @@ -62,8 +61,8 @@ public class JettyReactiveWebServerFactory extends AbstractReactiveWebServerFact } /** - * Create a new {@link JettyServletWebServerFactory} that listens for requests - * using the specified port. + * Create a new {@link JettyServletWebServerFactory} that listens for requests using + * the specified port. * @param port the port to listen on */ public JettyReactiveWebServerFactory(int port) { @@ -77,13 +76,6 @@ public class JettyReactiveWebServerFactory extends AbstractReactiveWebServerFact return new JettyWebServer(server, getPort() >= 0); } - @Override - public WebServer getWebServer(Map handlerMap) { - JettyHttpHandlerAdapter servlet = new JettyHttpHandlerAdapter(handlerMap); - Server server = createJettyServer(servlet); - return new JettyWebServer(server, getPort() >= 0); - } - protected Server createJettyServer(JettyHttpHandlerAdapter servlet) { int port = (getPort() >= 0 ? getPort() : 0); InetSocketAddress address = new InetSocketAddress(getAddress(), port); diff --git a/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java b/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java index 4429a246ffa..b5b90970d2f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java @@ -16,8 +16,6 @@ package org.springframework.boot.web.embedded.netty; -import java.util.Map; - import reactor.ipc.netty.http.server.HttpServer; import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactory; @@ -49,14 +47,6 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact return new NettyWebServer(server, handlerAdapter); } - @Override - public WebServer getWebServer(Map handlerMap) { - HttpServer server = createHttpServer(); - ReactorHttpHandlerAdapter handlerAdapter = new ReactorHttpHandlerAdapter( - handlerMap); - return new NettyWebServer(server, handlerAdapter); - } - private HttpServer createHttpServer() { HttpServer server; if (getAddress() != null) { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java b/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java index 2609fc7f59f..62b5688e805 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java @@ -17,7 +17,6 @@ package org.springframework.boot.web.embedded.tomcat; import java.io.File; -import java.util.Map; import org.apache.catalina.Host; import org.apache.catalina.connector.Connector; @@ -73,14 +72,6 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac return new TomcatWebServer(tomcatServer, getPort() >= 0); } - @Override - public WebServer getWebServer(Map handlerMap) { - Tomcat tomcatServer = createTomcatServer(); - TomcatHttpHandlerAdapter servlet = new TomcatHttpHandlerAdapter(handlerMap); - prepareContext(tomcatServer.getHost(), servlet); - return new TomcatWebServer(tomcatServer, getPort() >= 0); - } - private Tomcat createTomcatServer() { Tomcat tomcat = new Tomcat(); File baseDir = createTempDir("tomcat"); diff --git a/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactory.java b/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactory.java index dda9e836a6d..3b9d41b5ff5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactory.java @@ -16,8 +16,6 @@ package org.springframework.boot.web.embedded.undertow; -import java.util.Map; - import io.undertow.Undertow; import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactory; @@ -65,14 +63,6 @@ public class UndertowReactiveWebServerFactory extends AbstractReactiveWebServerF return new UndertowWebServer(builder, getPort() >= 0); } - @Override - public WebServer getWebServer(Map handlerMap) { - Undertow.Builder builder = createBuilder(getPort()); - UndertowHttpHandlerAdapter handler = new UndertowHttpHandlerAdapter(handlerMap); - builder.setHandler(handler); - return new UndertowWebServer(builder, getPort() >= 0); - } - private Undertow.Builder createBuilder(int port) { Undertow.Builder builder = Undertow.builder(); if (this.bufferSize != null) { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java b/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java index d9f00e8e19b..65a62bffe06 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java @@ -16,8 +16,6 @@ package org.springframework.boot.web.reactive.server; -import java.util.Map; - import org.springframework.boot.web.server.WebServer; import org.springframework.http.server.reactive.HttpHandler; @@ -28,6 +26,7 @@ import org.springframework.http.server.reactive.HttpHandler; * @since 2.0.0 * @see WebServer */ +@FunctionalInterface public interface ReactiveWebServerFactory { /** @@ -41,12 +40,4 @@ public interface ReactiveWebServerFactory { */ WebServer getWebServer(HttpHandler httpHandler); - /** - * Register a map of {@link HttpHandler}s, each to a specific context path. - * @param handlerMap a map of context paths and the associated {@code HttpHandler} - * @return a fully configured and started {@link WebServer} - * @see WebServer#stop() - */ - WebServer getWebServer(Map handlerMap); - }