Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-9620: Use Locale.ROOT for neutral, case insensitive comparisons

Browse Source 
Fixes: #9620
Issue link: https://github.com/spring-projects/spring-integration/issues/9620

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
This commit is contained in:
Artem Bilan
2024-10-31 10:59:05 -04:00
parent ff2b295be8
commit 0d2595ef7c
7 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
@@ -490,13 +491,13 @@ public abstract class AbstractHeaderMapper<T> implements RequestReplyHeaderMappe
Assert.notNull(patterns, "Patterns must no be null");
Assert.notEmpty(patterns, "At least one pattern must be specified");
for (String pattern : patterns) {
this.patterns.add(pattern.toLowerCase());
this.patterns.add(pattern.toLowerCase(Locale.ROOT));
}
}
@Override
public boolean matchHeader(String headerName) {
String header = headerName.toLowerCase();
String header = headerName.toLowerCase(Locale.ROOT);
for (String pattern : this.patterns) {
if (PatternMatchUtils.simpleMatch(pattern, header)) {
if (LOGGER.isDebugEnabled()) {
@@ -534,13 +535,13 @@ public abstract class AbstractHeaderMapper<T> implements RequestReplyHeaderMappe
public SinglePatternBasedHeaderMatcher(String pattern, boolean negate) {
Assert.notNull(pattern, "Pattern must no be null");
this.pattern = pattern.toLowerCase();
this.pattern = pattern.toLowerCase(Locale.ROOT);
this.negate = negate;
}
@Override
public boolean matchHeader(String headerName) {
String header = headerName.toLowerCase();
String header = headerName.toLowerCase(Locale.ROOT);
if (PatternMatchUtils.simpleMatch(this.pattern, header)) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(MessageFormat.format(

7
spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2022 the original author or authors.
* Copyright 2017-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.integration.support.utils;
import java.util.Arrays;
import java.util.Locale;
/**
* Utility methods for pattern matching.
@@ -48,9 +49,9 @@ public final class PatternMatchUtils {
*/
public static Boolean smartMatchIgnoreCase(String str, String... patterns) {
if (patterns != null) {
return smartMatch(str.toLowerCase(),
return smartMatch(str.toLowerCase(Locale.ROOT),
Arrays.stream(patterns)
.map(String::toLowerCase)
.map((pattern) -> pattern.toLowerCase(Locale.ROOT))
.toArray(String[]::new));
}