spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 21:39:05 +00:00
Code Issues Projects Releases Wiki Activity

Do not send null HTTP header value in JdkClientHttpRequest

Browse Source 
Prior to this commit, the `JdkClientHttpRequest` would add all values
from `HttpHeaders` to the native request builder. This could cause
`NullPointerException` being thrown at runtime because the `HttpClient`
does not support that.

This commit replicates a fix that was applied to the
`SimpleClientHttpRequest`, turning null values into empty "".

Fixes gh-35996
This commit is contained in:
Brian Clozel
2025-12-11 09:45:30 +01:00
parent 0eefac21c9
commit d835fe311d
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java
+23
View File
@@ -1024,6 +1024,29 @@ class RestClientIntegrationTests {
expectRequest(request -> assertThat(request.getHeaders().get("foo")).isEqualTo("bar"));
}
@ParameterizedRestClientTest
void sendNullHeaderValue(ClientHttpRequestFactory requestFactory) throws IOException {
startServer(requestFactory);
prepareResponse(builder -> builder
.setHeader("Content-Type", "text/plain").body("Hello Spring!"));
String result = this.restClient.get()
.uri("/greeting")
.httpRequest(request -> request.getHeaders().add("X-Test-Header", null))
.retrieve()
.body(String.class);
assertThat(result).isEqualTo("Hello Spring!");
expectRequestCount(1);
expectRequest(request -> {
assertThat(request.getHeaders().get("X-Test-Header")).isNullOrEmpty();
assertThat(request.getTarget()).isEqualTo("/greeting");
});
}
@ParameterizedRestClientTest
void defaultRequest(ClientHttpRequestFactory requestFactory) throws IOException {
startServer(requestFactory);