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

Merge branch '5.2.x'

This commit is contained in:
Rossen Stoyanchev 2020-05-12 09:01:36 +01:00
parent b883aad1f1 7c9ad6dd08
commit 14e249aee3
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
View File

@ -63,7 +63,8 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMappi
* {@link #setUseRegisteredSuffixPatternMatch(boolean) useRegisteredSuffixPatternMatch}
* were deprecated in order to discourage use of path extensions for request
* mapping and for content negotiation (with similar deprecations in
* {@link ContentNegotiationManager}). For further context, please read issue
* {@link org.springframework.web.accept.ContentNegotiationManagerFactoryBean
* ContentNegotiationManagerFactoryBean}). For further context, please read issue
* <a href="https://github.com/spring-projects/spring-framework/issues/24179">#24719</a>.
*
* @author Arjen Poutsma

16
spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
View File

@ -36,7 +36,14 @@
<xsd:documentation><![CDATA[
Whether to use suffix pattern match (".*") when matching patterns to requests. If enabled
a method mapped to "/users" also matches to "/users.*".
The default value is true.
In 5.2.4, suffix pattern matching was deprecated in order to discourage use of path
extensions for request mapping and for content negotiation (see deprecation notes on
org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping and on
org.springframework.web.accept.ContentNegotiationManagerFactoryBean and
also see https://github.com/spring-projects/spring-framework/issues/24179.
The default value is true but in 5.3 it changes to false.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@ -56,6 +63,13 @@
explicitly registered when you configure content negotiation.
This is generally recommended to reduce ambiguity and to
avoid issues such as when a "." appears in the path for other reasons.
In 5.2.4, suffix pattern matching was deprecated in order to discourage use of path
extensions for request mapping and for content negotiation (see deprecation notes on
org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping and on
org.springframework.web.accept.ContentNegotiationManagerFactoryBean and
also see https://github.com/spring-projects/spring-framework/issues/24179.
The default value is false.
]]></xsd:documentation>
</xsd:annotation>