Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-35933
This commit is contained in:
Phillip Webb
2023-06-16 16:14:52 -07:00
parent 48e13af8c4 efa072204a
commit af846da69b
2 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporterTests.java
View File

@@ -162,7 +162,7 @@ class PropertiesMigrationReporterTests {
}
@Test
void mapPropertiesDeprecatedNoReplacement() throws IOException {
void mapPropertiesDeprecatedNoReplacement() {
this.environment.getPropertySources()
.addFirst(
new MapPropertySource("first", Collections.singletonMap("custom.map-no-replacement.key", "value")));
@@ -173,7 +173,7 @@ class PropertiesMigrationReporterTests {
}
@Test
void mapPropertiesDeprecatedWithReplacement() throws IOException {
void mapPropertiesDeprecatedWithReplacement() {
this.environment.getPropertySources()
.addFirst(new MapPropertySource("first",
Collections.singletonMap("custom.map-with-replacement.key", "value")));
@@ -205,6 +205,14 @@ class PropertiesMigrationReporterTests {
.contains("Replacement: custom.the-map-replacement.key");
}
@Test // gh-35919
void directCircularReference() {
this.environment.getPropertySources()
.addFirst(new MapPropertySource("backcompat", Collections.singletonMap("wrong.two", "${test.two}")));
createAnalyzer(loadRepository("metadata/sample-metadata.json")).getReport();
assertThat(this.environment.getProperty("test.two")).isNull();
}
private List<String> mapToNames(PropertySources sources) {
List<String> names = new ArrayList<>();
for (PropertySource<?> source : sources) {