mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Adapt to removal of static resource location filtering
See gh-28506
This commit is contained in:
parent
85e06438e3
commit
f3b5e6bb3e
@ -50,6 +50,7 @@ import org.springframework.context.i18n.LocaleContext;
|
|||||||
import org.springframework.core.Ordered;
|
import org.springframework.core.Ordered;
|
||||||
import org.springframework.core.annotation.Order;
|
import org.springframework.core.annotation.Order;
|
||||||
import org.springframework.core.convert.ConversionService;
|
import org.springframework.core.convert.ConversionService;
|
||||||
|
import org.springframework.core.io.ClassPathResource;
|
||||||
import org.springframework.format.Parser;
|
import org.springframework.format.Parser;
|
||||||
import org.springframework.format.Printer;
|
import org.springframework.format.Printer;
|
||||||
import org.springframework.format.support.FormattingConversionService;
|
import org.springframework.format.support.FormattingConversionService;
|
||||||
@ -150,13 +151,12 @@ class WebFluxAutoConfigurationTests {
|
|||||||
SimpleUrlHandlerMapping hm = context.getBean("resourceHandlerMapping", SimpleUrlHandlerMapping.class);
|
SimpleUrlHandlerMapping hm = context.getBean("resourceHandlerMapping", SimpleUrlHandlerMapping.class);
|
||||||
assertThat(hm.getUrlMap().get("/**")).isInstanceOf(ResourceWebHandler.class);
|
assertThat(hm.getUrlMap().get("/**")).isInstanceOf(ResourceWebHandler.class);
|
||||||
ResourceWebHandler staticHandler = (ResourceWebHandler) hm.getUrlMap().get("/**");
|
ResourceWebHandler staticHandler = (ResourceWebHandler) hm.getUrlMap().get("/**");
|
||||||
assertThat(staticHandler).extracting("locationValues").asList().hasSize(4);
|
assertThat(staticHandler.getLocations()).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);
|
assertThat(hm.getUrlMap().get("/webjars/**")).isInstanceOf(ResourceWebHandler.class);
|
||||||
ResourceWebHandler webjarsHandler = (ResourceWebHandler) hm.getUrlMap().get("/webjars/**");
|
ResourceWebHandler webjarsHandler = (ResourceWebHandler) hm.getUrlMap().get("/webjars/**");
|
||||||
assertThat(webjarsHandler).extracting("locationValues").asList()
|
assertThat(webjarsHandler.getLocations()).hasSize(1);
|
||||||
.containsExactly("classpath:/META-INF/resources/webjars/");
|
assertThat(webjarsHandler.getLocations().get(0))
|
||||||
|
.isEqualTo(new ClassPathResource("/META-INF/resources/webjars/"));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user