Optimize ContextPairs nested name splitting

aalsanie · aalsanie · commit 752590cb44b8 · 2026-02-03T07:50:32.000+03:00
Signed-off-by: aalsanie &lt;ahmad.alsanie@hotmail.com&gt;
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java b/core/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java
@@ -193,24 +193,50 @@ void nested(T item, BiConsumer<String, Object> pairs) {
 			LinkedHashMap<String, Object> result = new LinkedHashMap<>();
 			this.addedPairs.forEach((addedPair) -> {
 				addedPair.accept(item, joining((name, value) -> {
-					List<String> nameParts = List.of(name.split("\\."));
 					Map<String, Object> destination = result;
-					for (int i = 0; i < nameParts.size() - 1; i++) {
-						Object existing = destination.computeIfAbsent(nameParts.get(i), (key) -> new LinkedHashMap<>());
+
+					int end = trimTrailingDelimiters(name);
+					if (end == 0) {
+						return;
+					}
+
+					int start = 0;
+					while (true) {
+						int dot = name.indexOf('.', start);
+						if (dot == -1 || dot >= end) {
+							break;
+						}
+
+						String part = name.substring(start, dot);
+
+						Object existing = destination.computeIfAbsent(part, (key) -> new LinkedHashMap<>());
 						if (!(existing instanceof Map)) {
-							String common = String.join(".", nameParts.subList(0, i + 1));
+							String common = name.substring(0, dot);
 							throw new IllegalStateException(
 									"Duplicate nested pairs added under '%s'".formatted(common));
 						}
+
 						destination = (Map<String, Object>) existing;
+						start = dot + 1;
 					}
-					Object previous = destination.put(nameParts.get(nameParts.size() - 1), value);
-					Assert.state(previous == null, () -> "Duplicate nested pairs added under '%s'".formatted(name));
+
+					String leaf = name.substring(start, end);
+					Object previous = destination.put(leaf, value);
+					Assert.state(previous == null,
+							() -> "Duplicate nested pairs added under '%s'".formatted(name));
 				}));
 			});
 			result.forEach(pairs);
 		}
 
+		private int trimTrailingDelimiters(String name) {
+			int end = name.length();
+			while (end > 0 && name.charAt(end - 1) == '.') {
+				end--;
+			}
+			return end;
+		}
+
 		private <V> BiConsumer<String, V> joining(BiConsumer<String, V> pairs) {
 			return (name, value) -> {
 				name = this.joiner.join(ContextPairs.this.prefix, (name != null) ? name : "");
diff --git a/core/spring-boot/src/test/java/org/springframework/boot/logging/structured/ContextPairsTests.java b/core/spring-boot/src/test/java/org/springframework/boot/logging/structured/ContextPairsTests.java
@@ -120,15 +120,28 @@ void nestedExpandsNames() {
 		assertThat(actual).isEqualTo(expected);
 	}
 
+	@Test
+	void nestedWhenNameEndsWithDelimiterDropsTrailingDelimiter() {
+		ContextPairs contextPairs = new ContextPairs(true, null);
+		Map<String, String> map = new LinkedHashMap<>();
+		map.put("a1.b1.", "A1B1");
+		Map<String, Object> actual = apply(contextPairs.nested((pairs) -> pairs.addMapEntries((item) -> map)));
+		Map<String, Object> expected = new LinkedHashMap<>();
+		Map<String, Object> a1 = new LinkedHashMap<>();
+		expected.put("a1", a1);
+		a1.put("b1", "A1B1");
+		assertThat(actual).isEqualTo(expected);
+	}
+
 	@Test
 	void nestedWhenDuplicateInParentThrowsException() {
 		ContextPairs contextPairs = new ContextPairs(true, null);
 		Map<String, String> map = new LinkedHashMap<>();
 		map.put("a1.b1.c1", "A1B1C1");
 		map.put("a1.b1", "A1B1");
 		assertThatIllegalStateException()
-			.isThrownBy(() -> apply(contextPairs.nested((pairs) -> pairs.addMapEntries((item) -> map))))
-			.withMessage("Duplicate nested pairs added under 'a1.b1'");
+				.isThrownBy(() -> apply(contextPairs.nested((pairs) -> pairs.addMapEntries((item) -> map))))
+				.withMessage("Duplicate nested pairs added under 'a1.b1'");
 	}
 
 	@Test
@@ -138,8 +151,8 @@ void nestedWhenDuplicateInLeafThrowsException() {
 		map.put("a1.b1", "A1B1");
 		map.put("a1.b1.c1", "A1B1C1");
 		assertThatIllegalStateException()
-			.isThrownBy(() -> apply(contextPairs.nested((pairs) -> pairs.addMapEntries((item) -> map))))
-			.withMessage("Duplicate nested pairs added under 'a1.b1'");
+				.isThrownBy(() -> apply(contextPairs.nested((pairs) -> pairs.addMapEntries((item) -> map))))
+				.withMessage("Duplicate nested pairs added under 'a1.b1'");
 	}
 
 	@Test
