Bug Fix - ConfigurationPropertyName#equals is not symmetric with trai…

…ling dashes in an element. See also: spring-projectsgh-30393
eydunn · Mar 28, 2023 · cf70171 · cf70171
1 parent be014ca
commit cf70171
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...in/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java b/...in/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
@@ -406,7 +406,7 @@ private boolean dashIgnoringElementEquals(Elements e1, Elements e2, int i) {
 		int i2 = 0;
 		while (i1 < l1) {
 			if (i2 >= l2) {
-				return false;
+				return remainderIsNotAlphanumeric(e1, i, i1);
 			}
 			char ch1 = e1.charAt(i, i1);
 			char ch2 = e2.charAt(i, i2);

diff --git a/...va/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java b/...va/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java
@@ -701,6 +701,14 @@ void equalsWhenAdaptedNameMatchesDueToRemovalOfTrailingCharacters() {
 		assertThat(name2).isEqualTo(name1);
 	}
 
+	@Test
+	void equalsSymmetricWhenNameMatchesDueToRemovalOfTrailingDashes() {
+		ConfigurationPropertyName n1 = ConfigurationPropertyName.of("foobar");
+		ConfigurationPropertyName n2 = ConfigurationPropertyName.of("foobar--");
+		assertThat(n1).isEqualTo(n2);
+		assertThat(n2).isEqualTo(n1);
+	}
+
 	@Test
 	void isValidWhenValidShouldReturnTrue() {
 		assertThat(ConfigurationPropertyName.isValid("")).isTrue();