>> pathPrefixes;
- @Nullable
- private Boolean suffixPatternMatch;
-
- @Nullable
- private Boolean registeredSuffixPatternMatch;
-
@Nullable
private UrlPathHelper urlPathHelper;
@@ -84,8 +74,6 @@ public class PathMatchConfigurer {
* Note: This property is mutually exclusive with the
* following other, {@code AntPathMatcher} related properties:
*
- * - {@link #setUseSuffixPatternMatch(Boolean)}
- *
- {@link #setUseRegisteredSuffixPatternMatch(Boolean)}
*
- {@link #setUrlPathHelper(UrlPathHelper)}
*
- {@link #setPathMatcher(PathMatcher)}
*
@@ -103,20 +91,6 @@ public class PathMatchConfigurer {
return this;
}
- /**
- * Whether to match to URLs irrespective of the presence of a trailing slash.
- * If enabled a method mapped to "/users" also matches to "/users/".
- * The default was changed in 6.0 from {@code true} to {@code false} in
- * order to support the deprecation of the property.
- * @deprecated as of 6.0, see
- * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
- */
- @Deprecated(since = "6.0")
- public PathMatchConfigurer setUseTrailingSlashMatch(Boolean trailingSlashMatch) {
- this.trailingSlashMatch = trailingSlashMatch;
- return this;
- }
-
/**
* Configure a path prefix to apply to matching controller methods.
*
Prefixes are used to enrich the mappings of every {@code @RequestMapping}
@@ -136,49 +110,6 @@ public class PathMatchConfigurer {
return this;
}
- /**
- * Whether to use suffix pattern match (".*") when matching patterns to
- * requests. If enabled a method mapped to "/users" also matches to "/users.*".
- *
Note: This property is mutually exclusive with
- * {@link #setPatternParser(PathPatternParser)}. If set, it enables use of
- * String path matching, unless a {@code PathPatternParser} is also
- * explicitly set in which case this property is ignored.
- *
By default this is set to {@code false}.
- * @deprecated as of 5.2.4. See class-level note in
- * {@link RequestMappingHandlerMapping} on the deprecation of path extension
- * config options. As there is no replacement for this method, in 5.2.x it is
- * necessary to set it to {@code false}. In 5.3 the default changes to
- * {@code false} and use of this property becomes unnecessary.
- */
- @Deprecated
- public PathMatchConfigurer setUseSuffixPatternMatch(@Nullable Boolean suffixPatternMatch) {
- this.suffixPatternMatch = suffixPatternMatch;
- this.preferPathMatcher |= (suffixPatternMatch != null && suffixPatternMatch);
- return this;
- }
-
- /**
- * Whether suffix pattern matching should work only against path extensions
- * explicitly registered when you
- * {@link WebMvcConfigurer#configureContentNegotiation 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.
- *
Note: This property is mutually exclusive with
- * {@link #setPatternParser(PathPatternParser)}. If set, it enables use of
- * String path matching, unless a {@code PathPatternParser} is also
- * explicitly set in which case this property is ignored.
- *
By default this is set to "false".
- * @deprecated as of 5.2.4. See class-level note in
- * {@link RequestMappingHandlerMapping} on the deprecation of path extension
- * config options.
- */
- @Deprecated
- public PathMatchConfigurer setUseRegisteredSuffixPatternMatch(@Nullable Boolean registeredSuffixPatternMatch) {
- this.registeredSuffixPatternMatch = registeredSuffixPatternMatch;
- this.preferPathMatcher |= (registeredSuffixPatternMatch != null && registeredSuffixPatternMatch);
- return this;
- }
-
/**
* Set the UrlPathHelper to use to resolve the mapping path for the application.
*
Note: This property is mutually exclusive with
@@ -232,39 +163,11 @@ public class PathMatchConfigurer {
return this.patternParser;
}
- @Nullable
- @Deprecated
- public Boolean isUseTrailingSlashMatch() {
- return this.trailingSlashMatch;
- }
-
@Nullable
protected Map>> getPathPrefixes() {
return this.pathPrefixes;
}
- /**
- * Whether to use registered suffixes for pattern matching.
- * @deprecated as of 5.2.4, see deprecation note on
- * {@link #setUseRegisteredSuffixPatternMatch(Boolean)}.
- */
- @Nullable
- @Deprecated
- public Boolean isUseRegisteredSuffixPatternMatch() {
- return this.registeredSuffixPatternMatch;
- }
-
- /**
- * Whether to use registered suffixes for pattern matching.
- * @deprecated as of 5.2.4, see deprecation note on
- * {@link #setUseSuffixPatternMatch(Boolean)}.
- */
- @Nullable
- @Deprecated
- public Boolean isUseSuffixPatternMatch() {
- return this.suffixPatternMatch;
- }
-
@Nullable
public UrlPathHelper getUrlPathHelper() {
return this.urlPathHelper;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
index 88e78883e7..e4f232e2ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -321,22 +321,6 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
initHandlerMapping(mapping, conversionService, resourceUrlProvider);
PathMatchConfigurer pathConfig = getPathMatchConfigurer();
- if (pathConfig.preferPathMatcher()) {
- Boolean useSuffixPatternMatch = pathConfig.isUseSuffixPatternMatch();
- if (useSuffixPatternMatch != null) {
- mapping.setUseSuffixPatternMatch(useSuffixPatternMatch);
- }
- Boolean useRegisteredSuffixPatternMatch = pathConfig.isUseRegisteredSuffixPatternMatch();
- if (useRegisteredSuffixPatternMatch != null) {
- mapping.setUseRegisteredSuffixPatternMatch(useRegisteredSuffixPatternMatch);
- }
- }
-
- Boolean useTrailingSlashMatch = pathConfig.isUseTrailingSlashMatch();
- if (useTrailingSlashMatch != null) {
- mapping.setUseTrailingSlashMatch(useTrailingSlashMatch);
- }
-
if (pathConfig.getPathPrefixes() != null) {
mapping.setPathPrefixes(pathConfig.getPathPrefixes());
}
@@ -520,6 +504,8 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
else if (pathConfig.getPatternParser() != null) {
mapping.setPatternParser(pathConfig.getPatternParser());
}
+ // else: AbstractHandlerMapping defaults to PathPatternParser
+
mapping.setInterceptors(getInterceptors(conversionService, resourceUrlProvider));
mapping.setCorsConfigurations(getCorsConfigurations());
}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index d9df46d20b..7c7596fe52 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
@@ -60,12 +60,6 @@ public class PatternsRequestCondition extends AbstractRequestCondition fileExtensions = new ArrayList<>();
-
/**
* Constructor with URL patterns which are prepended with "/" if necessary.
@@ -73,85 +67,20 @@ public class PatternsRequestCondition extends AbstractRequestConditionAs of 5.3 the path is obtained through the static method
- * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
- * does not need to be passed in.
- * @since 5.2.4
- * @deprecated as of 5.3 in favor of
- * {@link #PatternsRequestCondition(String[], boolean, PathMatcher)}.
- */
- @Deprecated
- public PatternsRequestCondition(String[] patterns, @Nullable UrlPathHelper urlPathHelper,
- @Nullable PathMatcher pathMatcher, boolean useTrailingSlashMatch) {
-
- this(patterns, urlPathHelper, pathMatcher, false, useTrailingSlashMatch);
- }
-
- /**
- * Variant of {@link #PatternsRequestCondition(String...)} with a
- * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
- * with suffixes and trailing slashes.
- * As of 5.3 the path is obtained through the static method
- * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
- * does not need to be passed in.
- * @deprecated as of 5.2.4. See class-level note in
- * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping}
- * on the deprecation of path extension config options.
- */
- @Deprecated
- public PatternsRequestCondition(String[] patterns, @Nullable UrlPathHelper urlPathHelper,
- @Nullable PathMatcher pathMatcher, boolean useSuffixPatternMatch, boolean useTrailingSlashMatch) {
-
- this(patterns, urlPathHelper, pathMatcher, useSuffixPatternMatch, useTrailingSlashMatch, null);
- }
-
- /**
- * Variant of {@link #PatternsRequestCondition(String...)} with a
- * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
- * with suffixes and trailing slashes, along with specific extensions.
- *
As of 5.3 the path is obtained through the static method
- * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
- * does not need to be passed in.
- * @deprecated as of 5.2.4. See class-level note in
- * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping}
- * on the deprecation of path extension config options.
- */
- @Deprecated
- public PatternsRequestCondition(String[] patterns, @Nullable UrlPathHelper urlPathHelper,
- @Nullable PathMatcher pathMatcher, boolean useSuffixPatternMatch,
- boolean useTrailingSlashMatch, @Nullable List fileExtensions) {
+ public PatternsRequestCondition(
+ String[] patterns, @Nullable UrlPathHelper urlPathHelper, @Nullable PathMatcher pathMatcher) {
this.patterns = initPatterns(patterns);
- this.pathMatcher = pathMatcher != null ? pathMatcher : new AntPathMatcher();
- this.useSuffixPatternMatch = useSuffixPatternMatch;
- this.useTrailingSlashMatch = useTrailingSlashMatch;
-
- if (fileExtensions != null) {
- for (String fileExtension : fileExtensions) {
- if (fileExtension.charAt(0) != '.') {
- fileExtension = "." + fileExtension;
- }
- this.fileExtensions.add(fileExtension);
- }
- }
+ this.pathMatcher = (pathMatcher != null ? pathMatcher : new AntPathMatcher());
}
private static Set initPatterns(String[] patterns) {
@@ -183,9 +112,6 @@ public class PatternsRequestCondition extends AbstractRequestCondition patterns, PatternsRequestCondition other) {
this.patterns = patterns;
this.pathMatcher = other.pathMatcher;
- this.useSuffixPatternMatch = other.useSuffixPatternMatch;
- this.useTrailingSlashMatch = other.useTrailingSlashMatch;
- this.fileExtensions.addAll(other.fileExtensions);
}
@@ -314,29 +240,9 @@ public class PatternsRequestCondition extends AbstractRequestConditionNote: This property is mutually exclusive with
* {@link #setPathMatcher(PathMatcher)}.
- * By default this is not set, but {@link RequestMappingInfo.Builder}
+ *
By default, this is not set, but {@link RequestMappingInfo.Builder}
* defaults to using {@link PathPatternParser} unless
* {@link #setPathMatcher(PathMatcher)} is explicitly set.
* @since 5.3
@@ -944,7 +928,7 @@ public final class RequestMappingInfo implements RequestConditionBy default this is not set. You must set it explicitly if you want
+ * By default, this is not set. You must set it explicitly if you want
* {@link PathMatcher} to be used, or otherwise {@link RequestMappingInfo}
* defaults to using {@link PathPatternParser}.
*/
@@ -974,97 +958,9 @@ public final class RequestMappingInfo implements RequestConditionThe default was changed in 6.0 from {@code true} to {@code false} in
- * order to support the deprecation of the property.
- * @deprecated as of 6.0, see
- * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
- */
- @Deprecated(since = "6.0")
- public void setTrailingSlashMatch(boolean trailingSlashMatch) {
- this.trailingSlashMatch = trailingSlashMatch;
- }
-
- /**
- * Return whether to apply trailing slash matching in PatternsRequestCondition.
- * @deprecated as of 6.0 together with {@link #setTrailingSlashMatch(boolean)}
- */
- @Deprecated(since = "6.0")
- public boolean useTrailingSlashMatch() {
- return this.trailingSlashMatch;
- }
-
- /**
- * Set whether to apply suffix pattern matching in PatternsRequestCondition.
- * By default this is set to 'false'.
- * @see #setRegisteredSuffixPatternMatch(boolean)
- * @deprecated as of 5.2.4. See deprecation note on
- * {@link RequestMappingHandlerMapping#setUseSuffixPatternMatch(boolean)}.
- */
- @Deprecated
- public void setSuffixPatternMatch(boolean suffixPatternMatch) {
- this.suffixPatternMatch = suffixPatternMatch;
- }
-
- /**
- * Return whether to apply suffix pattern matching in PatternsRequestCondition.
- * @deprecated as of 5.2.4. See deprecation note on
- * {@link RequestMappingHandlerMapping#setUseSuffixPatternMatch(boolean)}.
- */
- @Deprecated
- public boolean useSuffixPatternMatch() {
- return this.suffixPatternMatch;
- }
-
- /**
- * Set whether suffix pattern matching should be restricted to registered
- * file extensions only. Setting this property also sets
- * {@code suffixPatternMatch=true} and requires that a
- * {@link #setContentNegotiationManager} is also configured in order to
- * obtain the registered file extensions.
- * @deprecated as of 5.2.4. See class-level note in
- * {@link RequestMappingHandlerMapping} on the deprecation of path
- * extension config options.
- */
- @Deprecated
- public void setRegisteredSuffixPatternMatch(boolean registeredSuffixPatternMatch) {
- this.registeredSuffixPatternMatch = registeredSuffixPatternMatch;
- this.suffixPatternMatch = (registeredSuffixPatternMatch || this.suffixPatternMatch);
- }
-
- /**
- * Return whether suffix pattern matching should be restricted to registered
- * file extensions only.
- * @deprecated as of 5.2.4. See class-level note in
- * {@link RequestMappingHandlerMapping} on the deprecation of path
- * extension config options.
- */
- @Deprecated
- public boolean useRegisteredSuffixPatternMatch() {
- return this.registeredSuffixPatternMatch;
- }
-
- /**
- * Return the file extensions to use for suffix pattern matching. If
- * {@code registeredSuffixPatternMatch=true}, the extensions are obtained
- * from the configured {@code contentNegotiationManager}.
- * @deprecated as of 5.2.4. See class-level note in
- * {@link RequestMappingHandlerMapping} on the deprecation of path
- * extension config options.
- */
- @Nullable
- @Deprecated
- public List getFileExtensions() {
- if (useRegisteredSuffixPatternMatch() && this.contentNegotiationManager != null) {
- return this.contentNegotiationManager.getAllFileExtensions();
- }
- return null;
- }
-
/**
* Set the ContentNegotiationManager to use for the ProducesRequestCondition.
- * By default this is not set.
+ *
By default, this is not set.
*/
public void setContentNegotiationManager(ContentNegotiationManager contentNegotiationManager) {
this.contentNegotiationManager = contentNegotiationManager;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
index cbaf12afdb..f2575527f5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -59,22 +59,12 @@ import org.springframework.web.servlet.mvc.condition.RequestCondition;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
import org.springframework.web.util.UrlPathHelper;
-import org.springframework.web.util.pattern.PathPatternParser;
/**
* Creates {@link RequestMappingInfo} instances from type-level and method-level
* {@link RequestMapping @RequestMapping} and {@link HttpExchange @HttpExchange}
* annotations in {@link Controller @Controller} classes.
*
- *
Deprecation Note:
In 5.2.4,
- * {@link #setUseSuffixPatternMatch(boolean) useSuffixPatternMatch} and
- * {@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 org.springframework.web.accept.ContentNegotiationManagerFactoryBean
- * ContentNegotiationManagerFactoryBean}). For further context, please read issue
- * #24179.
- *
* @author Arjen Poutsma
* @author Rossen Stoyanchev
* @author Sam Brannen
@@ -89,14 +79,6 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
private static final RequestMethod[] EMPTY_REQUEST_METHOD_ARRAY = new RequestMethod[0];
- private boolean defaultPatternParser = true;
-
- private boolean useSuffixPatternMatch = false;
-
- private boolean useRegisteredSuffixPatternMatch = false;
-
- private boolean useTrailingSlashMatch = false;
-
private Map>> pathPrefixes = Collections.emptyMap();
private ContentNegotiationManager contentNegotiationManager = new ContentNegotiationManager();
@@ -107,65 +89,6 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
private RequestMappingInfo.BuilderConfiguration config = new RequestMappingInfo.BuilderConfiguration();
- @Override
- public void setPatternParser(@Nullable PathPatternParser patternParser) {
- if (patternParser != null) {
- this.defaultPatternParser = false;
- }
- super.setPatternParser(patternParser);
- }
-
- /**
- * Whether to use suffix pattern match (".*") when matching patterns to
- * requests. If enabled a method mapped to "/users" also matches to "/users.*".
- * By default value this is set to {@code false}.
- *
Also see {@link #setUseRegisteredSuffixPatternMatch(boolean)} for
- * more fine-grained control over specific suffixes to allow.
- *
Note: This property is ignored when
- * {@link #setPatternParser(PathPatternParser)} is configured.
- * @deprecated as of 5.2.4. See class level note on the deprecation of
- * path extension config options. As there is no replacement for this method,
- * in 5.2.x it is necessary to set it to {@code false}. In 5.3 the default
- * changes to {@code false} and use of this property becomes unnecessary.
- */
- @Deprecated
- public void setUseSuffixPatternMatch(boolean useSuffixPatternMatch) {
- this.useSuffixPatternMatch = useSuffixPatternMatch;
- }
-
- /**
- * Whether suffix pattern matching should work only against path extensions
- * explicitly registered with the {@link ContentNegotiationManager}. This
- * is generally recommended to reduce ambiguity and to avoid issues such as
- * when a "." appears in the path for other reasons.
- *
By default this is set to "false".
- *
Note: This property is ignored when
- * {@link #setPatternParser(PathPatternParser)} is configured.
- * @deprecated as of 5.2.4. See class level note on the deprecation of
- * path extension config options.
- */
- @Deprecated
- public void setUseRegisteredSuffixPatternMatch(boolean useRegisteredSuffixPatternMatch) {
- this.useRegisteredSuffixPatternMatch = useRegisteredSuffixPatternMatch;
- this.useSuffixPatternMatch = (useRegisteredSuffixPatternMatch || this.useSuffixPatternMatch);
- }
-
- /**
- * Whether to match to URLs irrespective of the presence of a trailing slash.
- * If enabled a method mapped to "/users" also matches to "/users/".
- *
The default was changed in 6.0 from {@code true} to {@code false} in
- * order to support the deprecation of the property.
- * @deprecated as of 6.0, see
- * {@link PathPatternParser#setMatchOptionalTrailingSeparator(boolean)}
- */
- @Deprecated(since = "6.0")
- public void setUseTrailingSlashMatch(boolean useTrailingSlashMatch) {
- this.useTrailingSlashMatch = useTrailingSlashMatch;
- if (getPatternParser() != null) {
- getPatternParser().setMatchOptionalTrailingSeparator(useTrailingSlashMatch);
- }
- }
-
/**
* Configure path prefixes to apply to controller methods.
*
Prefixes are used to enrich the mappings of every {@code @RequestMapping}
@@ -216,23 +139,12 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
@SuppressWarnings("deprecation")
public void afterPropertiesSet() {
this.config = new RequestMappingInfo.BuilderConfiguration();
- this.config.setTrailingSlashMatch(useTrailingSlashMatch());
this.config.setContentNegotiationManager(getContentNegotiationManager());
- if (getPatternParser() != null && this.defaultPatternParser &&
- (this.useSuffixPatternMatch || this.useRegisteredSuffixPatternMatch)) {
-
- setPatternParser(null);
- }
-
if (getPatternParser() != null) {
this.config.setPatternParser(getPatternParser());
- Assert.isTrue(!this.useSuffixPatternMatch && !this.useRegisteredSuffixPatternMatch,
- "Suffix pattern matching not supported with PathPatternParser.");
}
else {
- this.config.setSuffixPatternMatch(useSuffixPatternMatch());
- this.config.setRegisteredSuffixPatternMatch(useRegisteredSuffixPatternMatch());
this.config.setPathMatcher(getPathMatcher());
}
@@ -240,45 +152,6 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
}
- /**
- * Whether to use registered suffixes for pattern matching.
- * @deprecated as of 5.2.4. See deprecation notice on
- * {@link #setUseSuffixPatternMatch(boolean)}.
- */
- @Deprecated
- public boolean useSuffixPatternMatch() {
- return this.useSuffixPatternMatch;
- }
-
- /**
- * Whether to use registered suffixes for pattern matching.
- * @deprecated as of 5.2.4. See deprecation notice on
- * {@link #setUseRegisteredSuffixPatternMatch(boolean)}.
- */
- @Deprecated
- public boolean useRegisteredSuffixPatternMatch() {
- return this.useRegisteredSuffixPatternMatch;
- }
-
- /**
- * Whether to match to URLs irrespective of the presence of a trailing slash.
- */
- public boolean useTrailingSlashMatch() {
- return this.useTrailingSlashMatch;
- }
-
- /**
- * Return the file extensions to use for suffix pattern matching.
- * @deprecated as of 5.2.4. See class-level note on the deprecation of path
- * extension config options.
- */
- @Nullable
- @Deprecated
- @SuppressWarnings("deprecation")
- public List getFileExtensions() {
- return this.config.getFileExtensions();
- }
-
/**
* Obtain a {@link RequestMappingInfo.BuilderConfiguration} that reflects
* the internal configuration of this {@code HandlerMapping} and can be used
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
index 4ee4713cde..b2fd841e0f 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
@@ -31,51 +31,6 @@
]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
fileExtensions = hm.getContentNegotiationManager().getAllFileExtensions();
- assertThat(fileExtensions).containsExactly("xml");
}
@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
index 1027d9e4c9..8c2a6841f7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
@@ -240,10 +240,7 @@ public class DelegatingWebMvcConfigurationTests {
@Override
@SuppressWarnings("deprecation")
public void configurePathMatch(PathMatchConfigurer configurer) {
- configurer.setUseRegisteredSuffixPatternMatch(true)
- .setUseTrailingSlashMatch(false)
- .setUrlPathHelper(pathHelper)
- .setPathMatcher(pathMatcher);
+ configurer.setUrlPathHelper(pathHelper).setPathMatcher(pathMatcher);
}
@Override
public void addViewControllers(ViewControllerRegistry registry) {
@@ -272,9 +269,6 @@ public class DelegatingWebMvcConfigurationTests {
webMvcConfig.mvcResourceUrlProvider());
assertThat(annotationsMapping).isNotNull();
- assertThat(annotationsMapping.useRegisteredSuffixPatternMatch()).isTrue();
- assertThat(annotationsMapping.useSuffixPatternMatch()).isTrue();
- assertThat(annotationsMapping.useTrailingSlashMatch()).isFalse();
configAssertion.accept(annotationsMapping.getUrlPathHelper(), annotationsMapping.getPathMatcher());
SimpleUrlHandlerMapping mapping = (SimpleUrlHandlerMapping) webMvcConfig.viewControllerHandlerMapping(
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
index 1b305d696e..9e3de4c38b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
@@ -16,8 +16,6 @@
package org.springframework.web.servlet.mvc.condition;
-import java.util.Collections;
-
import jakarta.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.Test;
@@ -111,88 +109,6 @@ class PatternsRequestConditionTests {
assertThat(match).isEqualTo(expected);
}
- @Test
- @SuppressWarnings("deprecation")
- void matchSuffixPattern() {
- MockHttpServletRequest request = initRequest("/foo.html");
-
- boolean useSuffixPatternMatch = true;
- PatternsRequestCondition condition =
- new PatternsRequestCondition(new String[] {"/{foo}"}, null, null, useSuffixPatternMatch, true);
- PatternsRequestCondition match = condition.getMatchingCondition(request);
-
- assertThat(match).isNotNull();
- assertThat(match.getPatterns()).containsExactly("/{foo}.*");
-
- useSuffixPatternMatch = false;
- condition = new PatternsRequestCondition(
- new String[] {"/{foo}"}, null, null, useSuffixPatternMatch, false);
- match = condition.getMatchingCondition(request);
-
- assertThat(match).isNotNull();
- assertThat(match.getPatterns()).containsExactly("/{foo}");
- }
-
- @Test // SPR-8410
- @SuppressWarnings("deprecation")
- void matchSuffixPatternUsingFileExtensions() {
- PatternsRequestCondition condition = new PatternsRequestCondition(
- new String[] {"/jobs/{jobName}"}, null, null, true, false, Collections.singletonList("json"));
-
- MockHttpServletRequest request = initRequest("/jobs/my.job");
- PatternsRequestCondition match = condition.getMatchingCondition(request);
-
- assertThat(match).isNotNull();
- assertThat(match.getPatterns()).containsExactly("/jobs/{jobName}");
-
- request = initRequest("/jobs/my.job.json");
- match = condition.getMatchingCondition(request);
-
- assertThat(match).isNotNull();
- assertThat(match.getPatterns()).containsExactly("/jobs/{jobName}.json");
- }
-
- @Test
- @SuppressWarnings("deprecation")
- void matchSuffixPatternUsingFileExtensions2() {
- PatternsRequestCondition condition1 = new PatternsRequestCondition(
- new String[] {"/prefix"}, null, null, true, false, Collections.singletonList("json"));
-
- PatternsRequestCondition condition2 = new PatternsRequestCondition(
- new String[] {"/suffix"}, null, null, true, false, null);
-
- PatternsRequestCondition combined = condition1.combine(condition2);
-
- MockHttpServletRequest request = initRequest("/prefix/suffix.json");
- PatternsRequestCondition match = combined.getMatchingCondition(request);
-
- assertThat(match).isNotNull();
- }
-
- @Test
- void matchTrailingSlash() {
- MockHttpServletRequest request = initRequest("/foo/");
-
- PatternsRequestCondition condition = new PatternsRequestCondition("/foo");
- PatternsRequestCondition match = condition.getMatchingCondition(request);
-
- assertThat(match).isNotNull();
- assertThat(match.getPatterns()).containsExactly("/foo/");
-
- condition = new PatternsRequestCondition(new String[] {"/foo"}, true, null);
- match = condition.getMatchingCondition(request);
-
- assertThat(match).isNotNull();
- assertThat(match.getPatterns()).first(STRING)
- .as("Trailing slash should be insensitive to useSuffixPatternMatch settings (SPR-6164, SPR-5636)")
- .isEqualTo("/foo/");
-
- condition = new PatternsRequestCondition(new String[] {"/foo"}, false, null);
- match = condition.getMatchingCondition(request);
-
- assertThat(match).isNull();
- }
-
@Test
void matchPatternContainsExtension() {
MockHttpServletRequest request = initRequest("/foo.html");
@@ -203,11 +119,7 @@ class PatternsRequestConditionTests {
@Test // gh-22543
void matchWithEmptyPatterns() {
- PatternsRequestCondition condition = new PatternsRequestCondition();
- assertThat(condition.getMatchingCondition(initRequest(""))).isNotNull();
- assertThat(condition.getMatchingCondition(initRequest("/anything"))).isNull();
-
- condition = condition.combine(new PatternsRequestCondition());
+ PatternsRequestCondition condition = new PatternsRequestCondition().combine(new PatternsRequestCondition());
assertThat(condition.getMatchingCondition(initRequest(""))).isNotNull();
assertThat(condition.getMatchingCondition(initRequest("/anything"))).isNull();
}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
index a121a1a948..3fbabae157 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
@@ -616,15 +616,12 @@ class RequestMappingInfoHandlerMappingTests {
}
}
- @SuppressWarnings("deprecation")
private RequestMappingInfo.BuilderConfiguration getBuilderConfig() {
RequestMappingInfo.BuilderConfiguration config = new RequestMappingInfo.BuilderConfiguration();
if (getPatternParser() != null) {
config.setPatternParser(getPatternParser());
}
else {
- config.setSuffixPatternMatch(true);
- config.setRegisteredSuffixPatternMatch(true);
config.setPathMatcher(getPathMatcher());
}
return config;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
index 946e6c29e3..28d070a852 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
@@ -23,8 +23,6 @@ import java.lang.annotation.Target;
import java.lang.reflect.Method;
import java.security.Principal;
import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
@@ -35,7 +33,6 @@ import org.springframework.core.annotation.AliasFor;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.util.ClassUtils;
-import org.springframework.web.accept.ContentNegotiationManager;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
@@ -102,74 +99,6 @@ class RequestMappingHandlerMappingTests {
assertThat(mapping.getBuilderConfiguration()).isNotNull().isNotSameAs(config);
}
- @Test
- @SuppressWarnings("deprecation")
- void useRegisteredSuffixPatternMatch() {
- RequestMappingHandlerMapping mapping = createMapping();
-
- Map fileExtensions = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
- org.springframework.web.accept.PathExtensionContentNegotiationStrategy strategy =
- new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(fileExtensions);
- ContentNegotiationManager manager = new ContentNegotiationManager(strategy);
-
- mapping.setContentNegotiationManager(manager);
- mapping.setUseRegisteredSuffixPatternMatch(true);
- mapping.afterPropertiesSet();
-
- assertThat(mapping.useSuffixPatternMatch()).isTrue();
- assertThat(mapping.useRegisteredSuffixPatternMatch()).isTrue();
- assertThat(mapping.getFileExtensions()).isEqualTo(Collections.singletonList("json"));
- }
-
- @Test
- @SuppressWarnings("deprecation")
- void useRegisteredSuffixPatternMatchInitialization() {
- Map fileExtensions = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
- org.springframework.web.accept.PathExtensionContentNegotiationStrategy strategy =
- new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(fileExtensions);
- ContentNegotiationManager manager = new ContentNegotiationManager(strategy);
-
- final Set extensions = new HashSet<>();
-
- RequestMappingHandlerMapping mapping = new RequestMappingHandlerMapping() {
- @Override
- protected RequestMappingInfo getMappingForMethod(Method method, Class handlerType) {
- extensions.addAll(getFileExtensions());
- return super.getMappingForMethod(method, handlerType);
- }
- };
-
- StaticWebApplicationContext wac = new StaticWebApplicationContext();
- wac.registerSingleton("testController", ComposedAnnotationController.class);
- wac.refresh();
-
- mapping.setContentNegotiationManager(manager);
- mapping.setUseRegisteredSuffixPatternMatch(true);
- mapping.setApplicationContext(wac);
- mapping.afterPropertiesSet();
-
- assertThat(extensions).containsOnly("json");
- }
-
- @Test
- @SuppressWarnings("deprecation")
- void suffixPatternMatchSettings() {
- RequestMappingHandlerMapping mapping = createMapping();
-
- assertThat(mapping.useSuffixPatternMatch()).isFalse();
- assertThat(mapping.useRegisteredSuffixPatternMatch()).isFalse();
-
- mapping.setUseRegisteredSuffixPatternMatch(false);
- assertThat(mapping.useSuffixPatternMatch())
- .as("'false' registeredSuffixPatternMatch shouldn't impact suffixPatternMatch")
- .isFalse();
-
- mapping.setUseRegisteredSuffixPatternMatch(true);
- assertThat(mapping.useSuffixPatternMatch())
- .as("'true' registeredSuffixPatternMatch should enable suffixPatternMatch")
- .isTrue();
- }
-
@PathPatternsParameterizedTest
void resolveEmbeddedValuesInPatterns(RequestMappingHandlerMapping mapping) {
mapping.setEmbeddedValueResolver(value -> "/${pattern}/bar".equals(value) ? "/foo/bar" : value);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
index eb82f4b6c1..6ef6867889 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
@@ -178,15 +178,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
@PathPatternsParameterizedTest
void emptyValueMapping(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(ControllerWithEmptyValueMapping.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- // UrlPathHelper returns "/" for "",
- // so either the mapping has to be "/" or trailingSlashMatch must be on
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useTrailingSlashMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
- });
+ initDispatcherServlet(ControllerWithEmptyValueMapping.class, usePathPatterns);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
request.setContextPath("/foo");
@@ -207,15 +199,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
@PathPatternsParameterizedTest
void errorThrownFromHandlerMethod(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(ControllerWithErrorThrown.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- // UrlPathHelper returns "/" for "",
- // so either the mapping has to be "/" or trailingSlashMatch must be on
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useTrailingSlashMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
- });
+ initDispatcherServlet(ControllerWithErrorThrown.class, usePathPatterns);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
request.setContextPath("/foo");
@@ -514,13 +498,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
@PathPatternsParameterizedTest
void adaptedHandleMethods(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(MyAdaptedController.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useSuffixPatternMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
- });
+ initDispatcherServlet(MyAdaptedController.class, usePathPatterns);
doTestAdaptedHandleMethods(usePathPatterns);
}
@@ -560,12 +538,6 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
response = new MockHttpServletResponse();
getServlet().service(request, response);
- if (!usePathPatterns) {
- // This depends on suffix pattern matching and has different outcomes otherwise,
- // for example, 404 vs another method matching, depending on the test case.
- assertThat(response.getContentAsString()).isEqualTo("test-name1-2");
- }
-
request = new MockHttpServletRequest("GET", "/myPath4.do");
request.addParameter("param1", "value1");
request.addParameter("param2", "2");
@@ -787,13 +759,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
@PathPatternsParameterizedTest
void relativePathDispatchingController(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(MyRelativePathDispatchingController.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useSuffixPatternMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
- });
+ initDispatcherServlet(MyRelativePathDispatchingController.class, usePathPatterns);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myApp/myHandle");
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -809,22 +775,11 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
response = new MockHttpServletResponse();
getServlet().service(request, response);
assertThat(response.getContentAsString()).isEqualTo("myLangView");
-
- request = new MockHttpServletRequest("GET", "/myApp/surprise.do");
- response = new MockHttpServletResponse();
- getServlet().service(request, response);
- assertThat(response.getContentAsString()).isEqualTo(!usePathPatterns ? "mySurpriseView" : "myView");
}
@PathPatternsParameterizedTest
void relativeMethodPathDispatchingController(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(MyRelativeMethodPathDispatchingController.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useSuffixPatternMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
- });
+ initDispatcherServlet(MyRelativeMethodPathDispatchingController.class, usePathPatterns);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myApp/myHandle");
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -845,15 +800,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
response = new MockHttpServletResponse();
getServlet().service(request, response);
- if (!usePathPatterns) {
- assertThat(response.getStatus()).isEqualTo(200);
- assertThat(response.getContentAsString()).isEqualTo("mySurpriseView");
- }
- else {
- assertThat(response.getStatus())
- .as("Suffixes pattern matching should not work with PathPattern's")
- .isEqualTo(404);
- }
+ assertThat(response.getStatus()).as("Suffixes pattern matching is not supported").isEqualTo(404);
}
@PathPatternsParameterizedTest
@@ -1776,108 +1723,6 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
assertThat(response.getContentLength()).as("Expected an empty content").isEqualTo(0);
}
- @PathPatternsParameterizedTest
- @SuppressWarnings("deprecation")
- void responseBodyAsHtml(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(TextRestController.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- // `useSuffixPatternMatch` is not allowed with PathPattern's
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useSuffixPatternMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
-
- ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
- factoryBean.setFavorPathExtension(true);
- factoryBean.afterPropertiesSet();
-
- RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
- adapterDef.getPropertyValues().add("contentNegotiationManager", factoryBean.getObject());
- wac.registerBeanDefinition("handlerAdapter", adapterDef);
- });
-
- byte[] content = "alert('boo')".getBytes(StandardCharsets.ISO_8859_1);
- MockHttpServletRequest request = new MockHttpServletRequest("GET", "/a1.html");
- request.setContent(content);
- MockHttpServletResponse response = new MockHttpServletResponse();
-
- getServlet().service(request, response);
-
- if (!usePathPatterns) {
- assertThat(response.getStatus()).isEqualTo(200);
- assertThat(response.getContentType()).isEqualTo("text/html;charset=ISO-8859-1");
- assertThat(response.getHeader("Content-Disposition")).isEqualTo("inline;filename=f.txt");
- assertThat(response.getContentAsByteArray()).isEqualTo(content);
- }
- else {
- assertThat(response.getStatus())
- .as("Suffixes pattern matching should not work with PathPattern's")
- .isEqualTo(404);
- }
- }
-
- @PathPatternsParameterizedTest
- @SuppressWarnings("deprecation")
- void responseBodyAsHtmlWithSuffixPresent(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(TextRestController.class, usePathPatterns, wac -> {
- ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
- factoryBean.setFavorPathExtension(true);
- factoryBean.afterPropertiesSet();
- RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
- adapterDef.getPropertyValues().add("contentNegotiationManager", factoryBean.getObject());
- wac.registerBeanDefinition("handlerAdapter", adapterDef);
- });
-
- byte[] content = "alert('boo')".getBytes(StandardCharsets.ISO_8859_1);
- MockHttpServletRequest request = new MockHttpServletRequest("GET", "/a2.html");
- request.setContent(content);
- MockHttpServletResponse response = new MockHttpServletResponse();
-
- getServlet().service(request, response);
-
- assertThat(response.getStatus()).isEqualTo(200);
- assertThat(response.getContentType()).isEqualTo("text/html;charset=ISO-8859-1");
- assertThat(response.getHeader("Content-Disposition")).isNull();
- assertThat(response.getContentAsByteArray()).isEqualTo(content);
- }
-
- @PathPatternsParameterizedTest
- void responseBodyAsHtmlWithProducesCondition(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(TextRestController.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useSuffixPatternMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
-
- ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
- factoryBean.afterPropertiesSet();
-
- RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
- adapterDef.getPropertyValues().add("contentNegotiationManager", factoryBean.getObject());
- wac.registerBeanDefinition("handlerAdapter", adapterDef);
- });
-
- byte[] content = "alert('boo')".getBytes(StandardCharsets.ISO_8859_1);
- MockHttpServletRequest request = new MockHttpServletRequest("GET", "/a3.html");
- request.setContent(content);
- MockHttpServletResponse response = new MockHttpServletResponse();
-
- getServlet().service(request, response);
-
- if (!usePathPatterns) {
- assertThat(response.getStatus()).isEqualTo(200);
- assertThat(response.getContentType()).isEqualTo("text/html;charset=ISO-8859-1");
- assertThat(response.getHeader("Content-Disposition")).isNull();
- assertThat(response.getContentAsByteArray()).isEqualTo(content);
- }
- else {
- assertThat(response.getStatus())
- .as("Suffixes pattern matching should not work with PathPattern's")
- .isEqualTo(404);
- }
- }
-
@PathPatternsParameterizedTest
void responseBodyAsTextWithCssExtension(boolean usePathPatterns) throws Exception {
initDispatcherServlet(TextRestController.class, usePathPatterns, wac -> {
@@ -3052,7 +2897,6 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
static class TestViewResolver implements ViewResolver {
- @SuppressWarnings("deprecation")
@Override
public View resolveViewName(final String viewName, Locale locale) throws Exception {
return (model, request, response) -> {
@@ -4021,16 +3865,6 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl
return body;
}
- @RequestMapping(path = "/a2.html", method = RequestMethod.GET)
- public String a2(@RequestBody String body) {
- return body;
- }
-
- @RequestMapping(path = "/a3", method = RequestMethod.GET, produces = "text/html")
- public String a3(@RequestBody String body) throws IOException {
- return body;
- }
-
@RequestMapping(path = "/a4", method = RequestMethod.GET)
public String a4(@RequestBody String body) {
return body;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
index 005c0edbc1..448749ee30 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
@@ -173,7 +173,6 @@ class UriTemplateServletAnnotationControllerHandlerMethodTests extends AbstractS
initDispatcherServlet(SimpleUriTemplateController.class, usePathPatterns, wac -> {
if (!usePathPatterns) {
RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useSuffixPatternMatch", true);
mappingDef.getPropertyValues().add("removeSemicolonContent", "false");
wac.registerBeanDefinition("handlerMapping", mappingDef);
}
@@ -182,8 +181,7 @@ class UriTemplateServletAnnotationControllerHandlerMethodTests extends AbstractS
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/42;jsessionid=c0o7fszeb1;q=24.xml");
MockHttpServletResponse response = new MockHttpServletResponse();
getServlet().service(request, response);
- assertThat(response.getContentAsString())
- .isEqualTo(!usePathPatterns ? "test-42-24" : "test-42-24.xml");
+ assertThat(response.getContentAsString()).isEqualTo("test-42-24.xml");
}
@PathPatternsParameterizedTest
@@ -320,18 +318,12 @@ class UriTemplateServletAnnotationControllerHandlerMethodTests extends AbstractS
@PathPatternsParameterizedTest // gh-13187
void variableNamesWithUrlExtension(boolean usePathPatterns) throws Exception {
- initDispatcherServlet(VariableNamesController.class, usePathPatterns, wac -> {
- if (!usePathPatterns) {
- RootBeanDefinition mappingDef = new RootBeanDefinition(RequestMappingHandlerMapping.class);
- mappingDef.getPropertyValues().add("useSuffixPatternMatch", true);
- wac.registerBeanDefinition("handlerMapping", mappingDef);
- }
- });
+ initDispatcherServlet(VariableNamesController.class, usePathPatterns);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test/foo.json");
MockHttpServletResponse response = new MockHttpServletResponse();
getServlet().service(request, response);
- assertThat(response.getContentAsString()).isEqualTo(!usePathPatterns ? "foo-foo" : "foo-foo.json");
+ assertThat(response.getContentAsString()).isEqualTo("foo-foo.json");
}
@PathPatternsParameterizedTest // gh-11643
@@ -683,13 +675,4 @@ class UriTemplateServletAnnotationControllerHandlerMethodTests extends AbstractS
}
}
-// @Disabled("ControllerClassNameHandlerMapping")
-// void controllerClassName() throws Exception {
-
-// @Disabled("useDefaultSuffixPattern property not supported")
-// void doubles() throws Exception {
-
-// @Disabled("useDefaultSuffixPattern property not supported")
-// void noDefaultSuffixPattern() throws Exception {
-
}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
index 6e203e300b..c4b1f4de5d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -149,10 +149,8 @@ class ResourceHttpRequestHandlerTests {
}
@Test // SPR-14577
- @SuppressWarnings("deprecation")
void getMediaTypeWithFavorPathExtensionOff() throws Exception {
ContentNegotiationManagerFactoryBean factory = new ContentNegotiationManagerFactoryBean();
- factory.setFavorPathExtension(false);
factory.afterPropertiesSet();
ContentNegotiationManager manager = factory.getObject();
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
index cebdbe6a7e..48c721bffc 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
@@ -6,12 +6,7 @@
http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
+