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

Merge branch '3.3.x'

Browse Source 
Closes gh-42736
This commit is contained in:
Moritz Halbritter
2024-10-17 13:38:45 +02:00
parent 12c1d70738 8efe6e02d9
commit c018c43886
37 changed files with 229 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/HttpExchange.java
View File

@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
@@ -434,7 +435,7 @@ public final class HttpExchange {
void excludeUnless(String header, Include exception) {
if (!this.includes.contains(exception)) {
this.filteredHeaderNames.add(header.toLowerCase());
this.filteredHeaderNames.add(header.toLowerCase(Locale.ROOT));
}
}
@@ -444,7 +445,7 @@ public final class HttpExchange {
}
Map<String, List<String>> filtered = new LinkedHashMap<>();
headers.forEach((name, value) -> {
if (!this.filteredHeaderNames.contains(name.toLowerCase())) {
if (!this.filteredHeaderNames.contains(name.toLowerCase(Locale.ROOT))) {
filtered.put(name, value);
}
});

3
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethodTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.endpoint.annotation;
import java.lang.reflect.Method;
import java.util.Locale;
import org.junit.jupiter.api.Test;
@@ -76,7 +77,7 @@ class DiscoveredOperationMethodTests {
@Override
public MimeType getProducedMimeType() {
return new MimeType(toString().toLowerCase());
return new MimeType(toString().toLowerCase(Locale.ROOT));
}
}

3
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactoryTests.java
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
@@ -254,7 +255,7 @@ class DiscoveredOperationsFactoryTests {
@Override
public MimeType getProducedMimeType() {
return new MimeType(toString().toLowerCase());
return new MimeType(toString().toLowerCase(Locale.ROOT));
}
}