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

Expose mvcPatternParser bean in WebMvcConfigurationSupport

Browse Source 
See gh-26427
This commit is contained in:
Rossen Stoyanchev
2021-01-22 17:30:45 +00:00
parent 5c1cbb769c
commit 5a640bb635
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,6 +63,9 @@ public class PathMatchConfigurer {
@Nullable
private PathMatcher pathMatcher;
@Nullable
private PathPatternParser defaultPatternParser;
@Nullable
private UrlPathHelper defaultUrlPathHelper;
@@ -226,7 +229,7 @@ public class PathMatchConfigurer {
}
/**
* Return the configure UrlPathHelper instance or a default (shared) instance.
* Return the configure UrlPathHelper or a default, shared instance otherwise.
* @since 5.3
*/
protected UrlPathHelper getUrlPathHelperOrDefault() {
@@ -240,7 +243,7 @@ public class PathMatchConfigurer {
}
/**
* Return the configure PathMatcher instance or a default (shared) instance.
* Return the configure PathMatcher or a default, shared, instance otherwise.
* @since 5.3
*/
protected PathMatcher getPathMatcherOrDefault() {
@@ -253,4 +256,17 @@ public class PathMatchConfigurer {
return this.defaultPathMatcher;
}
/**
* Return the configured PathPatternParser or a default, shared, instance otherwise.
* @since 5.3.4
*/
public PathPatternParser getPatternParserOrDefault() {
if (this.patternParser != null) {
return this.patternParser;
}
if (this.defaultPatternParser == null) {
this.defaultPatternParser = new PathPatternParser();
}
return this.defaultPatternParser;
}
}

11
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
View File

@@ -395,6 +395,17 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
protected void configurePathMatch(PathMatchConfigurer configurer) {
}
/**
* Return a global {@link PathPatternParser} instance to use for parsing
* patterns to match to the {@link org.springframework.http.server.RequestPath}.
* The returned instance can be configured using
* {@link #configurePathMatch(PathMatchConfigurer)}.
* @since 5.3.4
*/
@Bean
public PathPatternParser mvcPatternParser() {
return getPathMatchConfigurer().getPatternParserOrDefault();
}
/**
* Return a global {@link UrlPathHelper} instance which is used to resolve