mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.5.x'
This commit is contained in:
commit
2034ad4827
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2021 the original author or authors.
|
||||
* Copyright 2021-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.
|
||||
|
@ -52,7 +52,6 @@ import org.springframework.context.i18n.LocaleContext;
|
||||
import org.springframework.core.Ordered;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.core.convert.ConversionService;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.format.Parser;
|
||||
import org.springframework.format.Printer;
|
||||
import org.springframework.format.support.FormattingConversionService;
|
||||
@ -161,12 +160,13 @@ class WebFluxAutoConfigurationTests {
|
||||
SimpleUrlHandlerMapping hm = context.getBean("resourceHandlerMapping", SimpleUrlHandlerMapping.class);
|
||||
assertThat(hm.getUrlMap().get("/**")).isInstanceOf(ResourceWebHandler.class);
|
||||
ResourceWebHandler staticHandler = (ResourceWebHandler) hm.getUrlMap().get("/**");
|
||||
assertThat(staticHandler.getLocations()).hasSize(4);
|
||||
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.getLocations()).hasSize(1);
|
||||
assertThat(webjarsHandler.getLocations().get(0))
|
||||
.isEqualTo(new ClassPathResource("/META-INF/resources/webjars/"));
|
||||
assertThat(webjarsHandler).extracting("locationValues").asList()
|
||||
.containsExactly("classpath:/META-INF/resources/webjars/");
|
||||
});
|
||||
}
|
||||
|
||||
@ -176,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.getLocations()).hasSize(4);
|
||||
assertThat(staticHandler).extracting("locationValues").asList().hasSize(4);
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -22,6 +22,7 @@ import java.time.ZoneId;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.time.format.FormatStyle;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashMap;
|
||||
@ -175,8 +176,10 @@ class WebMvcAutoConfigurationTests {
|
||||
void resourceHandlerMapping() {
|
||||
this.contextRunner.run((context) -> {
|
||||
Map<String, List<Resource>> locations = getResourceMappingLocations(context);
|
||||
assertThat(locations.get("/**")).hasSize(2);
|
||||
assertThat(locations.get("/webjars/**")).hasSize(0);
|
||||
assertThat(locations.get("/**")).hasSize(5);
|
||||
assertThat(locations.get("/webjars/**")).hasSize(1);
|
||||
assertThat(locations.get("/webjars/**").get(0))
|
||||
.isEqualTo(new ClassPathResource("/META-INF/resources/webjars/"));
|
||||
assertThat(getResourceResolvers(context, "/webjars/**")).hasSize(1);
|
||||
assertThat(getResourceTransformers(context, "/webjars/**")).hasSize(0);
|
||||
assertThat(getResourceResolvers(context, "/**")).hasSize(1);
|
||||
@ -188,17 +191,17 @@ class WebMvcAutoConfigurationTests {
|
||||
void customResourceHandlerMapping() {
|
||||
this.contextRunner.withPropertyValues("spring.mvc.static-path-pattern:/static/**").run((context) -> {
|
||||
Map<String, List<Resource>> locations = getResourceMappingLocations(context);
|
||||
assertThat(locations.get("/static/**")).hasSize(2);
|
||||
assertThat(locations.get("/static/**")).hasSize(5);
|
||||
assertThat(getResourceResolvers(context, "/static/**")).hasSize(1);
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
void resourceHandlerMappingOverrideWebjars() {
|
||||
this.contextRunner.withUserConfiguration(WebJarsResources.class).run((context) -> {
|
||||
this.contextRunner.withUserConfiguration(WebJars.class).run((context) -> {
|
||||
Map<String, List<Resource>> locations = getResourceMappingLocations(context);
|
||||
assertThat(locations.get("/webjars/**")).hasSize(1);
|
||||
assertThat(locations.get("/webjars/**").get(0).getFilename()).isEqualTo("test");
|
||||
assertThat(locations.get("/webjars/**").get(0)).isEqualTo(new ClassPathResource("/foo/"));
|
||||
});
|
||||
}
|
||||
|
||||
@ -207,7 +210,7 @@ class WebMvcAutoConfigurationTests {
|
||||
this.contextRunner.withUserConfiguration(AllResources.class).run((context) -> {
|
||||
Map<String, List<Resource>> locations = getResourceMappingLocations(context);
|
||||
assertThat(locations.get("/**")).hasSize(1);
|
||||
assertThat(locations.get("/**").get(0).getFilename()).isEqualTo("test");
|
||||
assertThat(locations.get("/**").get(0)).isEqualTo(new ClassPathResource("/foo/"));
|
||||
});
|
||||
}
|
||||
|
||||
@ -1024,7 +1027,7 @@ class WebMvcAutoConfigurationTests {
|
||||
protected Map<String, List<Resource>> getResourceMappingLocations(ApplicationContext context) {
|
||||
Object bean = context.getBean("resourceHandlerMapping");
|
||||
if (bean instanceof HandlerMapping) {
|
||||
return getMappingLocations((HandlerMapping) bean);
|
||||
return getMappingLocations(context, (HandlerMapping) bean);
|
||||
}
|
||||
assertThat(bean.toString()).isEqualTo("null");
|
||||
return Collections.emptyMap();
|
||||
@ -1043,11 +1046,18 @@ class WebMvcAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
protected Map<String, List<Resource>> getMappingLocations(HandlerMapping mapping) {
|
||||
private Map<String, List<Resource>> getMappingLocations(ApplicationContext context, HandlerMapping mapping) {
|
||||
Map<String, List<Resource>> mappingLocations = new LinkedHashMap<>();
|
||||
getHandlerMap(mapping).forEach((key, value) -> {
|
||||
Object locations = ReflectionTestUtils.getField(value, "locationsToUse");
|
||||
mappingLocations.put(key, (List<Resource>) locations);
|
||||
List<String> locationValues = (List<String>) ReflectionTestUtils.getField(value, "locationValues");
|
||||
List<Resource> locationResources = (List<Resource>) ReflectionTestUtils.getField(value,
|
||||
"locationResources");
|
||||
List<Resource> resources = new ArrayList<>();
|
||||
for (String locationValue : locationValues) {
|
||||
resources.add(context.getResource(locationValue));
|
||||
}
|
||||
resources.addAll(locationResources);
|
||||
mappingLocations.put(key, resources);
|
||||
});
|
||||
return mappingLocations;
|
||||
}
|
||||
@ -1078,11 +1088,11 @@ class WebMvcAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
static class WebJarsResources implements WebMvcConfigurer {
|
||||
static class WebJars implements WebMvcConfigurer {
|
||||
|
||||
@Override
|
||||
public void addResourceHandlers(ResourceHandlerRegistry registry) {
|
||||
registry.addResourceHandler("/webjars/**").addResourceLocations(new ClassPathResource("/test", getClass()));
|
||||
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/foo/");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1092,7 +1102,7 @@ class WebMvcAutoConfigurationTests {
|
||||
|
||||
@Override
|
||||
public void addResourceHandlers(ResourceHandlerRegistry registry) {
|
||||
registry.addResourceHandler("/**").addResourceLocations(new ClassPathResource("/test", getClass()));
|
||||
registry.addResourceHandler("/**").addResourceLocations("classpath:/foo/");
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-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.
|
||||
|
Loading…
Reference in New Issue
Block a user