From 69101f2ec60f50746ae38be248768a3f18a4c1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 8 May 2025 21:51:09 -0700 Subject: [PATCH] Migrate from missing JettyHttpHandlerAdapter Migrate to `ServletHttpHandlerAdapter` from `JettyHttpHandlerAdapter` which has been removed in Spring Framework 7. See gh-45487 --- .../web/embedded/jetty/JettyReactiveWebServerFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java index ae5ee2098b..7639bed7f1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java @@ -47,7 +47,7 @@ import org.springframework.boot.web.server.Ssl; import org.springframework.boot.web.server.WebServer; import org.springframework.http.client.reactive.JettyResourceFactory; import org.springframework.http.server.reactive.HttpHandler; -import org.springframework.http.server.reactive.JettyHttpHandlerAdapter; +import org.springframework.http.server.reactive.ServletHttpHandlerAdapter; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -110,7 +110,7 @@ public class JettyReactiveWebServerFactory extends AbstractReactiveWebServerFact @Override public WebServer getWebServer(HttpHandler httpHandler) { - JettyHttpHandlerAdapter servlet = new JettyHttpHandlerAdapter(httpHandler); + ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter(httpHandler); Server server = createJettyServer(servlet); return new JettyWebServer(server, getPort() >= 0); } @@ -176,7 +176,7 @@ public class JettyReactiveWebServerFactory extends AbstractReactiveWebServerFact return this.resourceFactory; } - protected Server createJettyServer(JettyHttpHandlerAdapter servlet) { + protected Server createJettyServer(ServletHttpHandlerAdapter servlet) { int port = Math.max(getPort(), 0); InetSocketAddress address = new InetSocketAddress(getAddress(), port); Server server = new Server(getThreadPool());