Drop server-specific TomcatRequestUpgradeStrategy for WebFlux

StandardWebSocketUpgradeStrategy is the common replacement on Tomcat.

See gh-33744

Author: jhoeller

spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -48,7 +48,6 @@
 import org.springframework.web.reactive.socket.server.upgrade.ReactorNetty2RequestUpgradeStrategy;
 import org.springframework.web.reactive.socket.server.upgrade.ReactorNettyRequestUpgradeStrategy;
 import org.springframework.web.reactive.socket.server.upgrade.StandardWebSocketUpgradeStrategy;
-import org.springframework.web.reactive.socket.server.upgrade.TomcatRequestUpgradeStrategy;
 import org.springframework.web.reactive.socket.server.upgrade.UndertowRequestUpgradeStrategy;
 import org.springframework.web.server.MethodNotAllowedException;
 import org.springframework.web.server.ServerWebExchange;
@@ -73,8 +72,6 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
 	private static final Mono<Map<String, Object>> EMPTY_ATTRIBUTES = Mono.just(Collections.emptyMap());
 
 
-	private static final boolean tomcatWsPresent;
-
 	private static final boolean jettyWsPresent;
 
 	private static final boolean jettyCoreWsPresent;
@@ -87,8 +84,6 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
 
 	static {
 		ClassLoader classLoader = HandshakeWebSocketService.class.getClassLoader();
-		tomcatWsPresent = ClassUtils.isPresent(
-				"org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader);
 		jettyWsPresent = ClassUtils.isPresent(
 				"org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader);
 		jettyCoreWsPresent = ClassUtils.isPresent(
@@ -277,10 +272,7 @@ private HandshakeInfo createHandshakeInfo(ServerWebExchange exchange, ServerHttp
 
 
 	static RequestUpgradeStrategy initUpgradeStrategy() {
-		if (tomcatWsPresent) {
-			return new TomcatRequestUpgradeStrategy();
-		}
-		else if (jettyWsPresent) {
+		if (jettyWsPresent) {
 			return new JettyRequestUpgradeStrategy();
 		}
 		else if (jettyCoreWsPresent) {

spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java

@@ -60,7 +60,7 @@
 import org.springframework.web.reactive.socket.server.upgrade.JettyRequestUpgradeStrategy;
 import org.springframework.web.reactive.socket.server.upgrade.ReactorNetty2RequestUpgradeStrategy;
 import org.springframework.web.reactive.socket.server.upgrade.ReactorNettyRequestUpgradeStrategy;
-import org.springframework.web.reactive.socket.server.upgrade.TomcatRequestUpgradeStrategy;
+import org.springframework.web.reactive.socket.server.upgrade.StandardWebSocketUpgradeStrategy;
 import org.springframework.web.reactive.socket.server.upgrade.UndertowRequestUpgradeStrategy;
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
@@ -205,58 +205,62 @@ public WebSocketService webSocketService() {
 
 
 	@Configuration
-	static class ReactorNettyConfig extends AbstractHandlerAdapterConfig {
+	static class TomcatConfig extends AbstractHandlerAdapterConfig {
 
 		@Override
 		protected RequestUpgradeStrategy getUpgradeStrategy() {
-			return new ReactorNettyRequestUpgradeStrategy();
+			return new StandardWebSocketUpgradeStrategy();
 		}
 	}
 
+
 	@Configuration
-	static class ReactorNetty2Config extends AbstractHandlerAdapterConfig {
+	static class JettyConfig extends AbstractHandlerAdapterConfig {
 
 		@Override
 		protected RequestUpgradeStrategy getUpgradeStrategy() {
-			return new ReactorNetty2RequestUpgradeStrategy();
+			return new JettyRequestUpgradeStrategy();
 		}
 	}
 
+
 	@Configuration
-	static class TomcatConfig extends AbstractHandlerAdapterConfig {
+	static class JettyCoreConfig extends AbstractHandlerAdapterConfig {
 
 		@Override
 		protected RequestUpgradeStrategy getUpgradeStrategy() {
-			return new TomcatRequestUpgradeStrategy();
+			return new JettyCoreRequestUpgradeStrategy();
 		}
 	}
 
 
 	@Configuration
-	static class UndertowConfig extends AbstractHandlerAdapterConfig {
+	static class ReactorNettyConfig extends AbstractHandlerAdapterConfig {
 
 		@Override
 		protected RequestUpgradeStrategy getUpgradeStrategy() {
-			return new UndertowRequestUpgradeStrategy();
+			return new ReactorNettyRequestUpgradeStrategy();
 		}
 	}
 
 
 	@Configuration
-	static class JettyConfig extends AbstractHandlerAdapterConfig {
+	static class ReactorNetty2Config extends AbstractHandlerAdapterConfig {
 
 		@Override
 		protected RequestUpgradeStrategy getUpgradeStrategy() {
-			return new JettyRequestUpgradeStrategy();
+			return new ReactorNetty2RequestUpgradeStrategy();
 		}
 	}
 
+
 	@Configuration
-	static class JettyCoreConfig extends AbstractHandlerAdapterConfig {
+	static class UndertowConfig extends AbstractHandlerAdapterConfig {
 
 		@Override
 		protected RequestUpgradeStrategy getUpgradeStrategy() {
-			return new JettyCoreRequestUpgradeStrategy();
+			return new UndertowRequestUpgradeStrategy();
 		}
 	}
+
 }