Skip to content

Commit 75f700a

Browse files
chore: Update constructor references with backedBy method.
1 parent 142b970 commit 75f700a

13 files changed

+18
-16
lines changed

Diff for: spring-web/src/main/java/org/springframework/http/HttpHeaders.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public HttpHeaders() {
452452
* headers map structures, primarily for internal use within the framework.
453453
* @param headers the headers map (expected to operate with case-insensitive keys)
454454
* @since 5.1
455-
* @deprecated Will be made private in favor of {@link #backedBy(MultiValueMap)} in a future release.
455+
* @deprecated Will be made default visibility in favor of {@link #backedBy(MultiValueMap)} in a future release.
456456
*/
457457
@Deprecated
458458
public HttpHeaders(MultiValueMap<String, String> headers) {
@@ -501,6 +501,7 @@ public HttpHeaders(HttpHeaders httpHeaders) {
501501
* headers map structures, primarily for internal use within the framework.
502502
* @param headers the headers map (expected to operate with case-insensitive keys)
503503
*/
504+
@SuppressWarnings("deprecation") // @Deprecated wll be removed when visibility is changed.
504505
public static HttpHeaders backedBy(MultiValueMap<String, String> headers) {
505506
return new HttpHeaders(headers);
506507
}
@@ -513,8 +514,9 @@ public static HttpHeaders backedBy(MultiValueMap<String, String> headers) {
513514
* likely to be out of sync and should be discarded.
514515
* @param httpHeaders the headers to expose
515516
*/
517+
@SuppressWarnings("deprecation") // @Deprecated wll be removed when visibility is changed.
516518
public static HttpHeaders backedBy(HttpHeaders httpHeaders) {
517-
return backedBy(httpHeaders.headers);
519+
return new HttpHeaders(httpHeaders);
518520
}
519521

520522
/**

Diff for: spring-web/src/main/java/org/springframework/http/ReadOnlyHttpHeaders.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ReadOnlyHttpHeaders extends HttpHeaders {
5050
@SuppressWarnings("serial")
5151
private @Nullable List<MediaType> cachedAccept;
5252

53-
53+
@SuppressWarnings("deprecation") // @Deprecated wll be removed when visibility is changed.
5454
ReadOnlyHttpHeaders(MultiValueMap<String, String> headers) {
5555
super(headers);
5656
}

Diff for: spring-web/src/main/java/org/springframework/http/codec/multipart/PartHttpMessageWriter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public Mono<Void> write(Publisher<? extends Part> parts,
9191
}
9292

9393
private <T> Flux<DataBuffer> encodePart(byte[] boundary, Part part, DataBufferFactory bufferFactory) {
94-
HttpHeaders headers = new HttpHeaders(part.headers());
94+
HttpHeaders headers = HttpHeaders.backedBy(part.headers());
9595

9696
String name = part.name();
9797
if (!headers.containsHeader(HttpHeaders.CONTENT_DISPOSITION)) {

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public JettyCoreServerHttpRequest(Request request, JettyDataBufferFactory dataBu
5656
super(HttpMethod.valueOf(request.getMethod()),
5757
request.getHttpURI().toURI(),
5858
request.getContext().getContextPath(),
59-
new HttpHeaders(new JettyHeadersAdapter(request.getHeaders())));
59+
HttpHeaders.backedBy(new JettyHeadersAdapter(request.getHeaders())));
6060
this.dataBufferFactory = dataBufferFactory;
6161
this.request = request;
6262
}

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class JettyCoreServerHttpResponse extends AbstractServerHttpResponse implements
5656

5757

5858
public JettyCoreServerHttpResponse(Response response, JettyDataBufferFactory dataBufferFactory) {
59-
super(dataBufferFactory, new HttpHeaders(new JettyHeadersAdapter(response.getHeaders())));
59+
super(dataBufferFactory, HttpHeaders.backedBy(new JettyHeadersAdapter(response.getHeaders())));
6060
this.response = response;
6161

6262
// remove all existing cookies from the response and add them to the cookie map, to be added back later

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public ReactorNetty2ServerHttpRequest(HttpServerRequest request, Netty5DataBuffe
7171
throws URISyntaxException {
7272

7373
super(HttpMethod.valueOf(request.method().name()), initUri(request), "",
74-
new HttpHeaders(new Netty5HeadersAdapter(request.requestHeaders())));
74+
HttpHeaders.backedBy(new Netty5HeadersAdapter(request.requestHeaders())));
7575
Assert.notNull(bufferFactory, "DataBufferFactory must not be null");
7676
this.request = request;
7777
this.bufferFactory = bufferFactory;

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ReactorNetty2ServerHttpResponse extends AbstractServerHttpResponse impleme
5858

5959

6060
public ReactorNetty2ServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) {
61-
super(bufferFactory, new HttpHeaders(new Netty5HeadersAdapter(response.responseHeaders())));
61+
super(bufferFactory, HttpHeaders.backedBy(new Netty5HeadersAdapter(response.responseHeaders())));
6262
Assert.notNull(response, "HttpServerResponse must not be null");
6363
this.response = response;
6464
}

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public ReactorServerHttpRequest(HttpServerRequest request, NettyDataBufferFactor
6868

6969
super(HttpMethod.valueOf(request.method().name()),
7070
ReactorUriHelper.createUri(request), request.forwardedPrefix(),
71-
new HttpHeaders(new Netty4HeadersAdapter(request.requestHeaders())));
71+
HttpHeaders.backedBy(new Netty4HeadersAdapter(request.requestHeaders())));
7272
Assert.notNull(bufferFactory, "DataBufferFactory must not be null");
7373
this.request = request;
7474
this.bufferFactory = bufferFactory;

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ReactorServerHttpResponse extends AbstractServerHttpResponse implements Ze
5757

5858

5959
public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) {
60-
super(bufferFactory, new HttpHeaders(new Netty4HeadersAdapter(Objects.requireNonNull(response,
60+
super(bufferFactory, HttpHeaders.backedBy(new Netty4HeadersAdapter(Objects.requireNonNull(response,
6161
"HttpServerResponse must not be null").responseHeaders())));
6262
this.response = response;
6363
}

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ private static HttpHeaders initHeaders(HttpHeaders headerValues, HttpServletRequ
168168
String requestContentType = request.getContentType();
169169
if (StringUtils.hasLength(requestContentType)) {
170170
contentType = MediaType.parseMediaType(requestContentType);
171-
headers = new HttpHeaders(headerValues);
171+
headers = HttpHeaders.backedBy(headerValues);
172172
headers.setContentType(contentType);
173173
}
174174
}
@@ -184,7 +184,7 @@ private static HttpHeaders initHeaders(HttpHeaders headerValues, HttpServletRequ
184184
if (headerValues.getFirst(HttpHeaders.CONTENT_TYPE) == null) {
185185
int contentLength = request.getContentLength();
186186
if (contentLength != -1) {
187-
headers = (headers != null ? headers : new HttpHeaders(headerValues));
187+
headers = (headers != null ? headers : HttpHeaders.backedBy(headerValues));
188188
headers.setContentLength(contentLength);
189189
}
190190
}

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private static HttpHeaders createTomcatHttpHeaders(HttpServletRequest request) {
9696
ReflectionUtils.getField(COYOTE_REQUEST_FIELD, requestFacade);
9797
Assert.state(connectorRequest != null, "No Tomcat connector request");
9898
Request tomcatRequest = connectorRequest.getCoyoteRequest();
99-
return new HttpHeaders(new TomcatHeadersAdapter(tomcatRequest.getMimeHeaders()));
99+
return HttpHeaders.backedBy(new TomcatHeadersAdapter(tomcatRequest.getMimeHeaders()));
100100
}
101101

102102
private static RequestFacade getRequestFacade(HttpServletRequest request) {
@@ -140,7 +140,7 @@ private static HttpHeaders createTomcatHttpHeaders(HttpServletResponse response)
140140
Assert.state(connectorResponse != null, "No Tomcat connector response");
141141
Response tomcatResponse = connectorResponse.getCoyoteResponse();
142142
TomcatHeadersAdapter headers = new TomcatHeadersAdapter(tomcatResponse.getMimeHeaders());
143-
return new HttpHeaders(headers);
143+
return HttpHeaders.backedBy(headers);
144144
}
145145

146146
private static ResponseFacade getResponseFacade(HttpServletResponse response) {

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public UndertowServerHttpRequest(HttpServerExchange exchange, DataBufferFactory
6666
throws URISyntaxException {
6767

6868
super(HttpMethod.valueOf(exchange.getRequestMethod().toString()), initUri(exchange), "",
69-
new HttpHeaders(new UndertowHeadersAdapter(exchange.getRequestHeaders())));
69+
HttpHeaders.backedBy(new UndertowHeadersAdapter(exchange.getRequestHeaders())));
7070
this.exchange = exchange;
7171
this.body = new RequestBodyPublisher(exchange, bufferFactory);
7272
this.body.registerListeners(exchange);

Diff for: spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class UndertowServerHttpResponse extends AbstractListenerServerHttpResponse impl
7070
private static HttpHeaders createHeaders(HttpServerExchange exchange) {
7171
Assert.notNull(exchange, "HttpServerExchange must not be null");
7272
UndertowHeadersAdapter headersMap = new UndertowHeadersAdapter(exchange.getResponseHeaders());
73-
return new HttpHeaders(headersMap);
73+
return HttpHeaders.backedBy(headersMap);
7474
}
7575

7676

0 commit comments

Comments
 (0)