root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
rstoyanchev 2025-02-28 14:41:47 +00:00
parent b610711235 7e9ac120ac
commit 6a9783bb1a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/ServletWebSocketHandlerRegistry.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,14 +26,12 @@ import org.jspecify.annotations.Nullable;
import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.PathMatcher;
import org.springframework.web.HttpRequestHandler; import org.springframework.web.HttpRequestHandler;
import org.springframework.web.servlet.handler.AbstractHandlerMapping; import org.springframework.web.servlet.handler.AbstractHandlerMapping;
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.server.support.WebSocketHandlerMapping; import org.springframework.web.socket.server.support.WebSocketHandlerMapping;
import org.springframework.web.util.UrlPathHelper; import org.springframework.web.util.UrlPathHelper;
import org.springframework.web.util.pattern.PathPatternParser;
/** /**
* {@link WebSocketHandlerRegistry} with Spring MVC handler mappings for the * {@link WebSocketHandlerRegistry} with Spring MVC handler mappings for the
@ -79,17 +77,21 @@ public class ServletWebSocketHandlerRegistry implements WebSocketHandlerRegistry
/** /**
* Set the UrlPathHelper to configure on the {@code SimpleUrlHandlerMapping} * Set the UrlPathHelper to configure on the {@code SimpleUrlHandlerMapping}
* used to map handshake requests. * used to map handshake requests.
* @deprecated use of {@link PathMatcher} and {@link UrlPathHelper} is deprecated * @deprecated without a replacement since effectively the UrlPathHelper is
* for use at runtime in web modules in favor of parsed patterns with * no longer used with {@code PathPatternParser} used by the default in
* {@link PathPatternParser}. * all extensions of {@code AbstractHandlerMapping}. To be removed in 7.0.
*/ */
@Deprecated(since = "7.0", forRemoval = true) @Deprecated(since = "6.2.4", forRemoval = true)
public void setUrlPathHelper(@Nullable UrlPathHelper urlPathHelper) { public void setUrlPathHelper(@Nullable UrlPathHelper urlPathHelper) {
this.urlPathHelper = urlPathHelper; this.urlPathHelper = urlPathHelper;
} }
@Deprecated(since = "7.0", forRemoval = true) /**
public @Nullable UrlPathHelper getUrlPathHelper() { * Return the configured {@code UrlPathHelper}.
* @deprecated without a replacement; see notice on {@link #setUrlPathHelper}
*/
@Deprecated(since = "6.2.4", forRemoval = true)
public @Nullable UrlPathHelper getUrlPathHelper() {
return this.urlPathHelper; return this.urlPathHelper;
} }