Merge branch '3.2.x' into 3.3.x

Closes gh-42071
spring-projects · Aug 31, 2024 · 3a458d8 · 3a458d8
2 parents a09af7e + cc2dc55
commit 3a458d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...ava/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java b/...ava/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java
@@ -146,7 +146,7 @@ private void addMigration(ConfigurationPropertySource propertySource,
 
 	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) {

diff --git a/...ot-tools/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata.json b/...ot-tools/spring-boot-properties-migrator/src/test/resources/metadata/sample-metadata.json
@@ -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"
     }
   ]
 }