From 706446a66018a2042bc1ba572f3f6b53dbfa253c Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 8 May 2020 14:30:10 +0100 Subject: [PATCH] Deprecate unused method --- .../web/socket/WebSocketHttpHeaders.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java index 5d61730cc45..e9854355698 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2020 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. @@ -26,6 +26,7 @@ import java.util.Set; import org.springframework.http.HttpHeaders; import org.springframework.lang.Nullable; import org.springframework.util.CollectionUtils; +import org.springframework.util.MultiValueMap; /** * An {@link org.springframework.http.HttpHeaders} variant that adds support for @@ -56,7 +57,7 @@ public class WebSocketHttpHeaders extends HttpHeaders { * Create a new instance. */ public WebSocketHttpHeaders() { - this(new HttpHeaders(), false); + this(new HttpHeaders()); } /** @@ -65,21 +66,16 @@ public class WebSocketHttpHeaders extends HttpHeaders { * @param headers the HTTP headers to wrap */ public WebSocketHttpHeaders(HttpHeaders headers) { - this(headers, false); - } - - /** - * Private constructor that can create read-only {@code WebSocketHttpHeader} instances. - */ - private WebSocketHttpHeaders(HttpHeaders headers, boolean readOnly) { - this.headers = readOnly ? HttpHeaders.readOnlyHttpHeaders(headers) : headers; + this.headers = headers; } /** * Returns {@code WebSocketHttpHeaders} object that can only be read, not written to. + * @deprecated as of 5.2.7 in favor of {@link HttpHeaders#readOnlyHttpHeaders(MultiValueMap)} */ + @Deprecated public static WebSocketHttpHeaders readOnlyWebSocketHttpHeaders(WebSocketHttpHeaders headers) { - return new WebSocketHttpHeaders(headers, true); + return new WebSocketHttpHeaders(HttpHeaders.readOnlyHttpHeaders(headers)); }