root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Adapt to Spring Framework API change

This commit is contained in:
Stephane Nicoll 2022-10-06 09:58:05 +02:00
parent d106fc266a
commit 4ffc421b3c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java
View File

@ -40,20 +40,20 @@ class WebResourcesRuntimeHintsTests {
void registerHintsWithAllLocations() { void registerHintsWithAllLocations() {
RuntimeHints hints = register( RuntimeHints hints = register(
new TestClassLoader(List.of("META-INF/resources/", "resources/", "static/", "public/"))); new TestClassLoader(List.of("META-INF/resources/", "resources/", "static/", "public/")));
assertThat(hints.resources().resourcePatterns()).singleElement() assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(include("META-INF/resources/*", "resources/*", "static/*", "public/*")); .satisfies(include("META-INF/resources/*", "resources/*", "static/*", "public/*"));
} }
@Test @Test
void registerHintsWithOnlyStaticLocations() { void registerHintsWithOnlyStaticLocations() {
RuntimeHints hints = register(new TestClassLoader(List.of("static/"))); RuntimeHints hints = register(new TestClassLoader(List.of("static/")));
assertThat(hints.resources().resourcePatterns()).singleElement().satisfies(include("static/*")); assertThat(hints.resources().resourcePatternHints()).singleElement().satisfies(include("static/*"));
} }
@Test @Test
void registerHintsWithNoLocation() { void registerHintsWithNoLocation() {
RuntimeHints hints = register(new TestClassLoader(List.of())); RuntimeHints hints = register(new TestClassLoader(List.of()));
assertThat(hints.resources().resourcePatterns()).isEmpty(); assertThat(hints.resources().resourcePatternHints()).isEmpty();
} }
private RuntimeHints register(ClassLoader classLoader) { private RuntimeHints register(ClassLoader classLoader) {

10
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java
View File

@ -44,7 +44,7 @@ class ConfigDataLocationRuntimeHintsTests {
void registerWithDefaultSettings() { void registerWithDefaultSettings() {
RuntimeHints hints = new RuntimeHints(); RuntimeHints hints = new RuntimeHints();
new TestConfigDataLocationRuntimeHints().registerHints(hints, null); new TestConfigDataLocationRuntimeHints().registerHints(hints, null);
assertThat(hints.resources().resourcePatterns()).singleElement() assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("application*.properties", "application*.xml", "application*.yaml", .satisfies(includes("application*.properties", "application*.xml", "application*.yaml",
"application*.yml", "config/application*.properties", "config/application*.xml", "application*.yml", "config/application*.properties", "config/application*.xml",
"config/application*.yaml", "config/application*.yml")); "config/application*.yaml", "config/application*.yml"));
@ -60,7 +60,7 @@ class ConfigDataLocationRuntimeHintsTests {
} }
}.registerHints(hints, null); }.registerHints(hints, null);
assertThat(hints.resources().resourcePatterns()).singleElement() assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("test*.properties", "test*.xml", "test*.yaml", "test*.yml", .satisfies(includes("test*.properties", "test*.xml", "test*.yaml", "test*.yml",
"config/test*.properties", "config/test*.xml", "config/test*.yaml", "config/test*.yml")); "config/test*.properties", "config/test*.xml", "config/test*.yaml", "config/test*.yml"));
} }
@ -74,7 +74,7 @@ class ConfigDataLocationRuntimeHintsTests {
return List.of("config/"); return List.of("config/");
} }
}.registerHints(hints, null); }.registerHints(hints, null);
assertThat(hints.resources().resourcePatterns()).singleElement() assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("config/application*.properties", "config/application*.xml", .satisfies(includes("config/application*.properties", "config/application*.xml",
"config/application*.yaml", "config/application*.yml")); "config/application*.yaml", "config/application*.yml"));
} }
@ -88,7 +88,7 @@ class ConfigDataLocationRuntimeHintsTests {
return List.of(".conf"); return List.of(".conf");
} }
}.registerHints(hints, null); }.registerHints(hints, null);
assertThat(hints.resources().resourcePatterns()).singleElement() assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("application*.conf", "config/application*.conf")); .satisfies(includes("application*.conf", "config/application*.conf"));
} }
@ -101,7 +101,7 @@ class ConfigDataLocationRuntimeHintsTests {
return List.of(UUID.randomUUID().toString()); return List.of(UUID.randomUUID().toString());
} }
}.registerHints(hints, null); }.registerHints(hints, null);
assertThat(hints.resources().resourcePatterns()).isEmpty(); assertThat(hints.resources().resourcePatternHints()).isEmpty();
} }
private Consumer<ResourcePatternHints> includes(String... patterns) { private Consumer<ResourcePatternHints> includes(String... patterns) {