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

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2024-03-04 14:43:18 +01:00
parent 1c5bb732b9 7493ce86b6
commit 4ce2559980
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
View File

@@ -27,6 +27,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatusCode; import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@@ -118,12 +119,13 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
} }
}); });
// HttpServletResponse exposes some headers as properties: we should include those if not already present // HttpServletResponse exposes some headers as properties: we should include those if not already present
if (this.servletResponse.getContentType() == null && this.headers.getContentType() != null) { MediaType contentTypeHeader = this.headers.getContentType();
this.servletResponse.setContentType(this.headers.getContentType().toString()); if (this.servletResponse.getContentType() == null && contentTypeHeader != null) {
this.servletResponse.setContentType(contentTypeHeader.toString());
} }
if (this.servletResponse.getCharacterEncoding() == null && this.headers.getContentType() != null && if (this.servletResponse.getCharacterEncoding() == null && contentTypeHeader != null &&
this.headers.getContentType().getCharset() != null) { contentTypeHeader.getCharset() != null) {
this.servletResponse.setCharacterEncoding(this.headers.getContentType().getCharset().name()); this.servletResponse.setCharacterEncoding(contentTypeHeader.getCharset().name());
} }
long contentLength = getHeaders().getContentLength(); long contentLength = getHeaders().getContentLength();
if (contentLength != -1) { if (contentLength != -1) {
@@ -169,13 +171,15 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
} }
@Override @Override
@Nullable
public List<String> get(Object key) { public List<String> get(Object key) {
Assert.isInstanceOf(String.class, key, "Key must be a String-based header name"); Assert.isInstanceOf(String.class, key, "Key must be a String-based header name");
String headerName = (String) key; String headerName = (String) key;
if (headerName.equalsIgnoreCase(CONTENT_TYPE)) { if (headerName.equalsIgnoreCase(CONTENT_TYPE)) {
// Content-Type is written as an override so don't merge // Content-Type is written as an override so don't merge
return Collections.singletonList(getFirst(headerName)); String value = getFirst(headerName);
return (value != null ? Collections.singletonList(value) : null);
} }
Collection<String> values1 = servletResponse.getHeaders(headerName); Collection<String> values1 = servletResponse.getHeaders(headerName);

13
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
View File

@@ -75,6 +75,19 @@ class ServletServerHttpResponseTests {
assertThat(mockResponse.getCharacterEncoding()).as("Invalid Content-Type").isEqualTo("UTF-8"); assertThat(mockResponse.getCharacterEncoding()).as("Invalid Content-Type").isEqualTo("UTF-8");
} }
@Test
void getHeadersWithNoContentType() {
this.response = new ServletServerHttpResponse(this.mockResponse);
assertThat(this.response.getHeaders().get(HttpHeaders.CONTENT_TYPE)).isNull();
}
@Test
void getHeadersWithContentType() {
this.mockResponse.setContentType(MediaType.TEXT_PLAIN_VALUE);
this.response = new ServletServerHttpResponse(this.mockResponse);
assertThat(this.response.getHeaders().get(HttpHeaders.CONTENT_TYPE)).containsExactly(MediaType.TEXT_PLAIN_VALUE);
}
@Test @Test
void preExistingHeadersFromHttpServletResponse() { void preExistingHeadersFromHttpServletResponse() {
String headerName = "Access-Control-Allow-Origin"; String headerName = "Access-Control-Allow-Origin";