Skip to content

Commit ffa49ee

Browse files
artembilanspring-builds
authored andcommitted
GH-3608: Use Locale.ROOT for neutral, case insensitive comparisons
Fixes: #3608 Issue link: #3608 (cherry picked from commit 07cff76)
1 parent 9b3c843 commit ffa49ee

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.HashMap;
3131
import java.util.HashSet;
3232
import java.util.List;
33+
import java.util.Locale;
3334
import java.util.Map;
3435
import java.util.Properties;
3536
import java.util.Set;
@@ -1014,7 +1015,7 @@ else if (resolvedValue instanceof Integer intgr) {
10141015
private TopicPartitionOffset.SeekPosition resloveTopicPartitionOffsetSeekPosition(@Nullable Object seekPosition) {
10151016
TopicPartitionOffset.SeekPosition resloveTpoSp = null;
10161017
if (seekPosition instanceof String seekPositionName) {
1017-
String capitalLetterSeekPositionName = seekPositionName.trim().toUpperCase();
1018+
String capitalLetterSeekPositionName = seekPositionName.trim().toUpperCase(Locale.ROOT);
10181019
if (SeekPosition.BEGINNING.name().equals(capitalLetterSeekPositionName)) {
10191020
resloveTpoSp = SeekPosition.BEGINNING;
10201021
}

spring-kafka/src/main/java/org/springframework/kafka/support/AbstractKafkaHeaderMapper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Collections;
2525
import java.util.HashMap;
2626
import java.util.List;
27+
import java.util.Locale;
2728
import java.util.Map;
2829
import java.util.Set;
2930
import java.util.stream.Collectors;
@@ -351,13 +352,13 @@ protected SimplePatternBasedHeaderMatcher(String pattern) {
351352

352353
SimplePatternBasedHeaderMatcher(String pattern, boolean negate) {
353354
Assert.notNull(pattern, "Pattern must no be null");
354-
this.pattern = pattern.toLowerCase();
355+
this.pattern = pattern.toLowerCase(Locale.ROOT);
355356
this.negate = negate;
356357
}
357358

358359
@Override
359360
public boolean matchHeader(String headerName) {
360-
String header = headerName.toLowerCase();
361+
String header = headerName.toLowerCase(Locale.ROOT);
361362
if (PatternMatchUtils.simpleMatch(this.pattern, header)) {
362363
LOGGER.debug(() ->
363364
MessageFormat.format(

0 commit comments

Comments
 (0)