Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33634 from junhyeongkim2

Browse Source 
* pr/33634:
  Use HttpMethod.GET for better readability

Closes gh-33634
This commit is contained in:
Stéphane Nicoll
2024-10-04 10:20:19 +02:00
parent b54420f8aa a668580f77
commit c41f8ea3c8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java
View File

@@ -22,6 +22,7 @@ import jakarta.servlet.http.HttpServletRequest;
import org.springframework.context.Lifecycle; import org.springframework.context.Lifecycle;
import org.springframework.context.SmartLifecycle; import org.springframework.context.SmartLifecycle;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.web.context.ServletContextAware; import org.springframework.web.context.ServletContextAware;
import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerExecutionChain;
@@ -126,7 +127,7 @@ public class WebSocketHandlerMapping extends SimpleUrlHandlerMapping implements
handler = (handler instanceof HandlerExecutionChain chain ? chain.getHandler() : handler); handler = (handler instanceof HandlerExecutionChain chain ? chain.getHandler() : handler);
if (this.webSocketUpgradeMatch && handler instanceof WebSocketHttpRequestHandler) { if (this.webSocketUpgradeMatch && handler instanceof WebSocketHttpRequestHandler) {
String header = request.getHeader(HttpHeaders.UPGRADE); String header = request.getHeader(HttpHeaders.UPGRADE);
return (request.getMethod().equals("GET") && return (HttpMethod.GET.matches(request.getMethod()) &&
header != null && header.equalsIgnoreCase("websocket")); header != null && header.equalsIgnoreCase("websocket"));
} }
return true; return true;