From b6fa57d6710c0fb6c09dead2f1fd7cf65546e578 Mon Sep 17 00:00:00 2001 From: banseok1216 Date: Tue, 25 Nov 2025 17:18:27 +0900 Subject: [PATCH 1/2] Fix typo in ContextPairs Changed 'delimeter' to 'delimiter' in the method parameter name and its usage. See gh-48282 Signed-off-by: banseok1216 --- .../boot/logging/structured/ContextPairs.java | 6 +++--- .../boot/logging/structured/ContextPairsTests.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java index bc2806e6809..89d33d28bfa 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java @@ -52,12 +52,12 @@ public class ContextPairs { /** * Add pairs using flat naming. * @param the item type - * @param delimeter the delimiter used if there is a prefix + * @param delimiter the delimiter used if there is a prefix * @param pairs callback to add all the pairs * @return a {@link BiConsumer} for use with the {@link JsonWriter} */ - public BiConsumer> flat(String delimeter, Consumer> pairs) { - return flat(joinWith(delimeter), pairs); + public BiConsumer> flat(String delimiter, Consumer> pairs) { + return flat(joinWith(delimiter), pairs); } /** diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/ContextPairsTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/ContextPairsTests.java index 0cb7d51d5d0..e0013d0a868 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/ContextPairsTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/ContextPairsTests.java @@ -58,7 +58,7 @@ class ContextPairsTests { } @Test - void flatWhenPrefixEndingWithDelimeterAppliesPrefix() { + void flatWhenPrefixEndingWithDelimiterAppliesPrefix() { ContextPairs contextPairs = new ContextPairs(true, "the_"); Map map = Map.of("spring", "boot"); Map actual = apply(contextPairs.flat("_", (pairs) -> pairs.addMapEntries((item) -> map))); @@ -66,7 +66,7 @@ class ContextPairsTests { } @Test - void flatWhenPrefixAndNameStartingWithDelimeterAppliesPrefix() { + void flatWhenPrefixAndNameStartingWithDelimiterAppliesPrefix() { ContextPairs contextPairs = new ContextPairs(true, "the"); Map map = Map.of("_spring", "boot"); Map actual = apply(contextPairs.flat("_", (pairs) -> pairs.addMapEntries((item) -> map))); From 0b6303abc82f567f40c2e55eb8a4b663e2ee8418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 25 Nov 2025 09:57:18 +0100 Subject: [PATCH 2/2] Polish "Fix typo in ContextPairs" See gh-48282 --- .../boot/logging/structured/ContextPairs.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java index 89d33d28bfa..d7c4c430ab6 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ContextPairs.java @@ -86,12 +86,12 @@ public class ContextPairs { }; } - private BinaryOperator joinWith(String delimeter) { + private BinaryOperator joinWith(String delimiter) { return (prefix, name) -> { - StringBuilder joined = new StringBuilder(prefix.length() + delimeter.length() + name.length()); + StringBuilder joined = new StringBuilder(prefix.length() + delimiter.length() + name.length()); joined.append(prefix); - if (!prefix.isEmpty() && !prefix.endsWith(delimeter) && !name.startsWith(delimeter)) { - joined.append(delimeter); + if (!prefix.isEmpty() && !prefix.endsWith(delimiter) && !name.startsWith(delimiter)) { + joined.append(delimiter); } joined.append(name); return joined.toString();