Skip to content

Commit 69101f2

Browse files
snicollphilwebb
authored andcommitted
Migrate from missing JettyHttpHandlerAdapter
Migrate to `ServletHttpHandlerAdapter` from `JettyHttpHandlerAdapter` which has been removed in Spring Framework 7. See gh-45487
1 parent 3c9e4d6 commit 69101f2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.springframework.boot.web.server.WebServer;
4848
import org.springframework.http.client.reactive.JettyResourceFactory;
4949
import org.springframework.http.server.reactive.HttpHandler;
50-
import org.springframework.http.server.reactive.JettyHttpHandlerAdapter;
50+
import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
5151
import org.springframework.util.Assert;
5252
import org.springframework.util.StringUtils;
5353

@@ -110,7 +110,7 @@ public void setAcceptors(int acceptors) {
110110

111111
@Override
112112
public WebServer getWebServer(HttpHandler httpHandler) {
113-
JettyHttpHandlerAdapter servlet = new JettyHttpHandlerAdapter(httpHandler);
113+
ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter(httpHandler);
114114
Server server = createJettyServer(servlet);
115115
return new JettyWebServer(server, getPort() >= 0);
116116
}
@@ -176,7 +176,7 @@ protected JettyResourceFactory getResourceFactory() {
176176
return this.resourceFactory;
177177
}
178178

179-
protected Server createJettyServer(JettyHttpHandlerAdapter servlet) {
179+
protected Server createJettyServer(ServletHttpHandlerAdapter servlet) {
180180
int port = Math.max(getPort(), 0);
181181
InetSocketAddress address = new InetSocketAddress(getAddress(), port);
182182
Server server = new Server(getThreadPool());

0 commit comments

Comments
 (0)