Merge pull request #4448 from eddumelendez/gh-4444

* pr/4448:
  Add `spring.mvc.static-path-pattern` property

Author: philwebb

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java

@@ -98,6 +98,7 @@
  * @author Dave Syer
  * @author Andy Wilkinson
  * @author Sébastien Deleuze
+ * @author Eddú Meléndez
  */
 @Configuration
 @ConditionalOnWebApplication
@@ -256,8 +257,9 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 						.addResourceLocations("classpath:/META-INF/resources/webjars/")
 						.setCachePeriod(cachePeriod));
 			}
-			if (!registry.hasMappingForPattern("/**")) {
-				registerResourceChain(registry.addResourceHandler("/**")
+			String staticPathPattern = this.mvcProperties.getStaticPathPattern();
+			if (!registry.hasMappingForPattern(staticPathPattern)) {
+				registerResourceChain(registry.addResourceHandler(staticPathPattern)
 						.addResourceLocations(
 								this.resourceProperties.getStaticLocations())
 						.setCachePeriod(cachePeriod));

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java

@@ -31,6 +31,7 @@
  * @author Phillip Webb
  * @author Sébastien Deleuze
  * @author Stephane Nicoll
+ * @author Eddú Meléndez
  * @since 1.1
  */
 @ConfigurationProperties("spring.mvc")
@@ -77,6 +78,11 @@ public class WebMvcProperties {
 	 */
 	private Map<String, MediaType> mediaTypes = new LinkedHashMap<String, MediaType>();
 
+	/**
+	 * Path that pattern used for static resources.
+	 */
+	private String staticPathPattern = "/**";
+
 	private final Async async = new Async();
 
 	private final View view = new View();
@@ -147,6 +153,14 @@ public void setDispatchTraceRequest(boolean dispatchTraceRequest) {
 		this.dispatchTraceRequest = dispatchTraceRequest;
 	}
 
+	public String getStaticPathPattern() {
+		return this.staticPathPattern;
+	}
+
+	public void setStaticPathPattern(String staticPathPattern) {
+		this.staticPathPattern = staticPathPattern;
+	}
+
 	public Async getAsync() {
 		return this.async;
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java

@@ -101,6 +101,7 @@
  * @author Andy Wilkinson
  * @author Stephane Nicoll
  * @author Brian Clozel
+ * @author Eddú Meléndez
  */
 public class WebMvcAutoConfigurationTests {
 
@@ -149,6 +150,14 @@ public void resourceHandlerMapping() throws Exception {
 		assertThat(getResourceTransformers("/**").size(), equalTo(0));
 	}
 
+	@Test
+	public void customResourceHandlerMapping() throws Exception {
+		load("spring.mvc.static-path-pattern:/static/**");
+		Map<String, List<Resource>> mappingLocations = getResourceMappingLocations();
+		assertThat(mappingLocations.get("/static/**").size(), equalTo(5));
+		assertThat(getResourceResolvers("/static/**").size(), equalTo(1));
+	}
+
 	@Test
 	public void resourceHandlerMappingOverrideWebjars() throws Exception {
 		load(WebJars.class);

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -310,6 +310,7 @@ content into your application; rather pick only the properties that you need.
 	spring.mvc.locale= # Locale to use.
 	spring.mvc.media-types.*= # Maps file extensions to media types for content negotiation.
 	spring.mvc.message-codes-resolver-format= # Formatting strategy for message codes. For instance `PREFIX_ERROR_CODE`.
+	spring.mvc.static-path-pattern=/** # Path that pattern used for static resources.
 	spring.mvc.throw-exception-if-no-handler-found=false # If a "NoHandlerFoundException" should be thrown if no Handler was found to process a request.
 	spring.mvc.view.prefix= # Spring MVC view prefix.
 	spring.mvc.view.suffix= # Spring MVC view suffix.