From 9d6a0cfd24b137ce18ad3f89be31f87eba2c6003 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 19 Oct 2021 18:43:53 +0100 Subject: [PATCH] Starting building against Spring Framework 5.3.12 snapshots This reverts commit 3969e63ced8e349474c9de5ca2907583c1516d95, reversing changes made to f01d086a8d1ac5bee92d04c21b3c6c9785006aa9. Closes gh-28385 See gh-28252 --- .../reactive/WebFluxAutoConfiguration.java | 35 +++++-------------- .../web/servlet/WebMvcAutoConfiguration.java | 13 ++----- .../WebFluxAutoConfigurationTests.java | 9 +++-- .../META-INF/resources/webjars/webjar | 0 .../spring-boot-dependencies/build.gradle | 2 +- 5 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/resources/webjars/webjar diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java index 0c97128292..d9ce69ead6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java @@ -17,8 +17,6 @@ package org.springframework.boot.autoconfigure.web.reactive; import java.time.Duration; -import java.util.ArrayList; -import java.util.List; import java.util.function.Supplier; import org.apache.commons.logging.Log; @@ -53,7 +51,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import org.springframework.core.io.ResourceLoader; import org.springframework.format.FormatterRegistry; import org.springframework.format.support.FormattingConversionService; import org.springframework.http.codec.ServerCodecConfigurer; @@ -156,13 +153,11 @@ public class WebFluxAutoConfiguration { private final ObjectProvider viewResolvers; - private final ResourceLoader resourceLoader; - public WebFluxConfig(WebProperties webProperties, WebFluxProperties webFluxProperties, ListableBeanFactory beanFactory, ObjectProvider resolvers, ObjectProvider codecCustomizers, ObjectProvider resourceHandlerRegistrationCustomizer, - ObjectProvider viewResolvers, ResourceLoader resourceLoader) { + ObjectProvider viewResolvers) { this.resourceProperties = webProperties.getResources(); this.webFluxProperties = webFluxProperties; this.beanFactory = beanFactory; @@ -170,7 +165,6 @@ public class WebFluxAutoConfiguration { this.codecCustomizers = codecCustomizers; this.resourceHandlerRegistrationCustomizer = resourceHandlerRegistrationCustomizer.getIfAvailable(); this.viewResolvers = viewResolvers; - this.resourceLoader = resourceLoader; } @Override @@ -190,28 +184,17 @@ public class WebFluxAutoConfiguration { return; } if (!registry.hasMappingForPattern("/webjars/**")) { - String webjarsLocation = "classpath:/META-INF/resources/webjars/"; - if (this.resourceLoader.getResource(webjarsLocation).exists()) { - ResourceHandlerRegistration registration = registry.addResourceHandler("/webjars/**") - .addResourceLocations(webjarsLocation); - configureResourceCaching(registration); - customizeResourceHandlerRegistration(registration); - } + ResourceHandlerRegistration registration = registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + configureResourceCaching(registration); + customizeResourceHandlerRegistration(registration); } String staticPathPattern = this.webFluxProperties.getStaticPathPattern(); if (!registry.hasMappingForPattern(staticPathPattern)) { - List foundLocations = new ArrayList<>(); - for (String staticLocation : this.resourceProperties.getStaticLocations()) { - if (this.resourceLoader.getResource(staticLocation).exists()) { - foundLocations.add(staticLocation); - } - } - if (!foundLocations.isEmpty()) { - ResourceHandlerRegistration registration = registry.addResourceHandler(staticPathPattern) - .addResourceLocations(foundLocations.toArray(new String[0])); - configureResourceCaching(registration); - customizeResourceHandlerRegistration(registration); - } + ResourceHandlerRegistration registration = registry.addResourceHandler(staticPathPattern) + .addResourceLocations(this.resourceProperties.getStaticLocations()); + configureResourceCaching(registration); + customizeResourceHandlerRegistration(registration); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index b62359757c..114204bf0c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -204,15 +204,13 @@ public class WebMvcAutoConfiguration { private final ResourceHandlerRegistrationCustomizer resourceHandlerRegistrationCustomizer; - private final ResourceLoader resourceLoader; - private ServletContext servletContext; public WebMvcAutoConfigurationAdapter(WebProperties webProperties, WebMvcProperties mvcProperties, ListableBeanFactory beanFactory, ObjectProvider messageConvertersProvider, ObjectProvider resourceHandlerRegistrationCustomizerProvider, ObjectProvider dispatcherServletPath, - ObjectProvider> servletRegistrations, ResourceLoader resourceLoader) { + ObjectProvider> servletRegistrations) { this.resourceProperties = webProperties.getResources(); this.mvcProperties = mvcProperties; this.beanFactory = beanFactory; @@ -220,7 +218,6 @@ public class WebMvcAutoConfiguration { this.resourceHandlerRegistrationCustomizer = resourceHandlerRegistrationCustomizerProvider.getIfAvailable(); this.dispatcherServletPath = dispatcherServletPath; this.servletRegistrations = servletRegistrations; - this.resourceLoader = resourceLoader; this.mvcProperties.checkConfiguration(); } @@ -337,11 +334,7 @@ public class WebMvcAutoConfiguration { logger.debug("Default resource handling disabled"); return; } - Resource webjarsLocationResource = this.resourceLoader - .getResource("classpath:/META-INF/resources/webjars/"); - if (webjarsLocationResource.exists()) { - addResourceHandler(registry, "/webjars/**", webjarsLocationResource); - } + addResourceHandler(registry, "/webjars/**", "classpath:/META-INF/resources/webjars/"); addResourceHandler(registry, this.mvcProperties.getStaticPathPattern(), (registration) -> { registration.addResourceLocations(this.resourceProperties.getStaticLocations()); if (this.servletContext != null) { @@ -351,7 +344,7 @@ public class WebMvcAutoConfiguration { }); } - private void addResourceHandler(ResourceHandlerRegistry registry, String pattern, Resource... locations) { + private void addResourceHandler(ResourceHandlerRegistry registry, String pattern, String... locations) { addResourceHandler(registry, pattern, (registration) -> registration.addResourceLocations(locations)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index 92fa92b656..59edb80ea7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -160,10 +160,9 @@ class WebFluxAutoConfigurationTests { SimpleUrlHandlerMapping hm = context.getBean("resourceHandlerMapping", SimpleUrlHandlerMapping.class); assertThat(hm.getUrlMap().get("/**")).isInstanceOf(ResourceWebHandler.class); ResourceWebHandler staticHandler = (ResourceWebHandler) hm.getUrlMap().get("/**"); - assertThat(staticHandler).extracting("locationValues").asList().hasSize(2); - assertThat(staticHandler.getLocations()).hasSize(2); - assertThat(staticHandler.getLocations().get(0)).hasToString("class path resource [META-INF/resources/]"); - assertThat(staticHandler.getLocations().get(1)).hasToString("class path resource [public/]"); + assertThat(staticHandler).extracting("locationValues").asList().hasSize(4); + assertThat(staticHandler.getLocations()).hasSize(1); + assertThat(staticHandler.getLocations().get(0)).hasToString("class path resource [public/]"); assertThat(hm.getUrlMap().get("/webjars/**")).isInstanceOf(ResourceWebHandler.class); ResourceWebHandler webjarsHandler = (ResourceWebHandler) hm.getUrlMap().get("/webjars/**"); assertThat(webjarsHandler).extracting("locationValues").asList() @@ -177,7 +176,7 @@ class WebFluxAutoConfigurationTests { SimpleUrlHandlerMapping hm = context.getBean("resourceHandlerMapping", SimpleUrlHandlerMapping.class); assertThat(hm.getUrlMap().get("/static/**")).isInstanceOf(ResourceWebHandler.class); ResourceWebHandler staticHandler = (ResourceWebHandler) hm.getUrlMap().get("/static/**"); - assertThat(staticHandler).extracting("locationValues").asList().hasSize(2); + assertThat(staticHandler).extracting("locationValues").asList().hasSize(4); }); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/resources/webjars/webjar b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/resources/webjars/webjar deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 417b705e41..9dfdc326d7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1642,7 +1642,7 @@ bom { ] } } - library("Spring Framework", "5.3.11") { + library("Spring Framework", "5.3.12-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom"