Merge branch '2.6.x' into 2.7.x

Closes gh-33249
spring-projects · Nov 18, 2022 · 0a3c403 · 0a3c403
2 parents 36d1b05 + 7c65c3e
commit 0a3c403
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/...ava/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java b/...ava/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,8 +99,10 @@ private Map<String, List<PropertyMigration>> getMatchingProperties(
 		List<ConfigurationMetadataProperty> candidates = this.allProperties.values().stream().filter(filter)
 				.collect(Collectors.toList());
 		getPropertySourcesAsMap().forEach((name, source) -> candidates.forEach((metadata) -> {
-			ConfigurationProperty configurationProperty = source
-					.getConfigurationProperty(ConfigurationPropertyName.of(metadata.getId()));
+			ConfigurationPropertyName metadataName = ConfigurationPropertyName.isValid(metadata.getId())
+					? ConfigurationPropertyName.of(metadata.getId())
+					: ConfigurationPropertyName.adapt(metadata.getId(), '.');
+			ConfigurationProperty configurationProperty = source.getConfigurationProperty(metadataName);
 			if (configurationProperty != null) {
 				result.add(name,
 						new PropertyMigration(configurationProperty, metadata, determineReplacementMetadata(metadata)));

diff --git a/...rg/springframework/boot/context/properties/migrator/PropertiesMigrationReporterTests.java b/...rg/springframework/boot/context/properties/migrator/PropertiesMigrationReporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -144,6 +145,15 @@ void invalidReplacementHandled() throws IOException {
 		assertThat(report).doesNotContain("null");
 	}
 
+	@Test
+	void invalidNameHandledGracefully() {
+		this.environment.getPropertySources()
+				.addFirst(new MapPropertySource("first", Collections.singletonMap("invalid.property-name", "value")));
+		String report = createWarningReport(loadRepository("metadata/sample-metadata-invalid-name.json"));
+		assertThat(report).isNotNull();
+		assertThat(report).contains("Key: invalid.PropertyName").contains("Replacement: valid.property-name");
+	}
+
 	private List<String> mapToNames(PropertySources sources) {
 		List<String> names = new ArrayList<>();
 		for (PropertySource<?> source : sources) {

diff --git a/...ng-boot-properties-migrator/src/test/resources/metadata/sample-metadata-invalid-name.json b/...ng-boot-properties-migrator/src/test/resources/metadata/sample-metadata-invalid-name.json
@@ -0,0 +1,16 @@
+{
+  "properties": [
+    {
+      "name": "invalid.PropertyName",
+      "type": "java.lang.String",
+      "deprecation": {
+        "replacement": "valid.property-name",
+        "level": "error"
+      }
+    },
+    {
+      "name": "valid.property-name",
+      "type": "java.lang.String"
+    }
+  ]
+}