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

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42071
This commit is contained in:
Phillip Webb
2024-08-31 11:21:51 -07:00
parent a09af7ebcf cc2dc558f1
commit 3a458d8062
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java
View File

@@ -146,7 +146,7 @@ class PropertiesMigrationReporter {
private boolean hasSameName(ConfigurationProperty property, ConfigurationMetadataProperty replacement) {
return (property.getOrigin() instanceof PropertySourceOrigin propertySourceOrigin)
&& Objects.equals(propertySourceOrigin.getPropertyName(), replacement.getName());
&& Objects.equals(propertySourceOrigin.getPropertyName(), replacement.getId());
}
private ConfigurationMetadataProperty determineReplacementMetadata(ConfigurationMetadataProperty metadata) {

9
spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata.json
View File

@@ -1,4 +1,10 @@
{
"groups": [
{
"name": "relaxed",
"type": "com.example.SourceType"
}
],
"properties": [
{
"name": "test.two",
@@ -64,7 +70,8 @@
},
{
"name": "relaxed.this-that-the-other",
"type": "java.lang.String"
"type": "java.lang.String",
"sourceType": "com.example.SourceType"
}
]
}