Optimize SystemEnvironmentPropertyMapper

See gh-21523
spring-projects · Jun 5, 2020 · 0378de7 · 0378de7
1 parent f8d6d9a
commit 0378de7
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...a/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java b/...a/org/springframework/boot/context/properties/source/SystemEnvironmentPropertyMapper.java
@@ -116,15 +116,24 @@ private boolean isLegacyAncestorOf(ConfigurationPropertyName name, Configuration
 		if (!hasDashedEntries(name)) {
 			return false;
 		}
+		StringBuilder legacyCompatibleName = buildLegacyCompatibleName(name);
+		try {
+			return ConfigurationPropertyName.of(legacyCompatibleName).isAncestorOf(candidate);
+		}
+		catch (Exception ex) {
+			return false;
+		}
+	}
+
+	private StringBuilder buildLegacyCompatibleName(ConfigurationPropertyName name) {
 		StringBuilder legacyCompatibleName = new StringBuilder();
 		for (int i = 0; i < name.getNumberOfElements(); i++) {
 			if (i != 0) {
 				legacyCompatibleName.append('.');
 			}
 			legacyCompatibleName.append(name.getElement(i, Form.DASHED).replace('-', '.'));
 		}
-		return ConfigurationPropertyName.isValid(legacyCompatibleName)
-				&& ConfigurationPropertyName.of(legacyCompatibleName).isAncestorOf(candidate);
+		return legacyCompatibleName;
 	}
 
 	boolean hasDashedEntries(ConfigurationPropertyName name) {