From a668580f77eb1482fb4f0dc5205b4a7440e8c110 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 2 Oct 2024 22:42:07 +0900 Subject: [PATCH] Use HttpMethod.GET for better readability See gh-33634 --- .../web/socket/server/support/WebSocketHandlerMapping.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java index 0d825e50d835..cda762c8cdd1 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java @@ -22,6 +22,7 @@ import org.springframework.context.Lifecycle; import org.springframework.context.SmartLifecycle; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; import org.springframework.lang.Nullable; import org.springframework.web.context.ServletContextAware; import org.springframework.web.servlet.HandlerExecutionChain; @@ -126,7 +127,7 @@ private boolean matchWebSocketUpgrade(@Nullable Object handler, HttpServletReque handler = (handler instanceof HandlerExecutionChain chain ? chain.getHandler() : handler); if (this.webSocketUpgradeMatch && handler instanceof WebSocketHttpRequestHandler) { String header = request.getHeader(HttpHeaders.UPGRADE); - return (request.getMethod().equals("GET") && + return (HttpMethod.GET.matches(request.getMethod()) && header != null && header.equalsIgnoreCase("websocket")); } return true;