From 74182cd3d63e743948c55bdb9e389ba3afc7acf1 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Wed, 13 Sep 2023 09:33:50 +0100 Subject: [PATCH] Ensure correct detection of Jetty WebSocket server --- .../socket/server/support/HandshakeWebSocketService.java | 2 +- .../web/socket/server/support/AbstractHandshakeHandler.java | 2 +- .../socket/server/support/HandshakeHandlerRuntimeHints.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java index be68ffe590..68b7f3ca75 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java @@ -89,7 +89,7 @@ public class HandshakeWebSocketService implements WebSocketService, ServletConte tomcatWsPresent = ClassUtils.isPresent( "org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader); jettyWsPresent = ClassUtils.isPresent( - "org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader); + "org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader); undertowWsPresent = ClassUtils.isPresent( "io.undertow.websockets.WebSocketProtocolHandshakeHandler", classLoader); reactorNettyPresent = ClassUtils.isPresent( diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java index 48cb47eeba..3818bc26a4 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java @@ -94,7 +94,7 @@ public abstract class AbstractHandshakeHandler implements HandshakeHandler, Life tomcatWsPresent = ClassUtils.isPresent( "org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader); jettyWsPresent = ClassUtils.isPresent( - "org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader); + "org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader); undertowWsPresent = ClassUtils.isPresent( "io.undertow.websockets.jsr.ServerWebSocketContainer", classLoader); glassfishWsPresent = ClassUtils.isPresent( diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java index fb00ca8f83..3bdc25ecb7 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. @@ -49,7 +49,7 @@ class HandshakeHandlerRuntimeHints implements RuntimeHintsRegistrar { tomcatWsPresent = ClassUtils.isPresent( "org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader); jettyWsPresent = ClassUtils.isPresent( - "org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader); + "org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader); undertowWsPresent = ClassUtils.isPresent( "io.undertow.websockets.jsr.ServerWebSocketContainer", classLoader); glassfishWsPresent = ClassUtils.isPresent(