Skip to content

Commit f2ee0c0

Browse files
spencergibbspencergibb
committed
Use HttpHeaders#headerSet where appropriate
Fixes gh-3596
1 parent 353a503 commit f2ee0c0

File tree

13 files changed

+13
-13
lines changed

13 files changed

+13
-13
lines changed

‎spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/ForwardedRequestHeadersFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {
9393
HttpHeaders updated = new HttpHeaders();
9494

9595
// copy all headers except Forwarded
96-
for (Map.Entry<String, List<String>> entry : original.entrySet()) {
96+
for (Map.Entry<String, List<String>> entry : original.headerSet()) {
9797
if (!entry.getKey().equalsIgnoreCase(FORWARDED_HEADER)) {
9898
updated.addAll(entry.getKey(), entry.getValue());
9999
}

‎spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RemoveHopByHopRequestHeadersFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest serverRequest) {
5555
static HttpHeaders filter(HttpHeaders input, Set<String> headersToRemove) {
5656
HttpHeaders filtered = new HttpHeaders();
5757

58-
for (Map.Entry<String, List<String>> entry : input.entrySet()) {
58+
for (Map.Entry<String, List<String>> entry : input.headerSet()) {
5959
if (!headersToRemove.contains(entry.getKey().toLowerCase(Locale.ROOT))) {
6060
filtered.addAll(entry.getKey(), entry.getValue());
6161
}

‎spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/XForwardedRequestHeadersFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ public HttpHeaders apply(HttpHeaders input, ServerRequest request) {
374374
HttpHeaders original = input;
375375
HttpHeaders updated = new HttpHeaders();
376376

377-
for (Map.Entry<String, List<String>> entry : original.entrySet()) {
377+
for (Map.Entry<String, List<String>> entry : original.headerSet()) {
378378
updated.addAll(entry.getKey(), entry.getValue());
379379
}
380380

‎spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/test/client/ExchangeResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ private String formatStatus(HttpStatusCode statusCode) {
264264
}
265265

266266
private String formatHeaders(HttpHeaders headers, String delimiter) {
267-
return headers.entrySet()
267+
return headers.headerSet()
268268
.stream()
269269
.map(entry -> entry.getKey() + ": " + entry.getValue())
270270
.collect(Collectors.joining(delimiter));

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
143143

144144
headersFilters.add((headers, exchange) -> {
145145
HttpHeaders filtered = new HttpHeaders();
146-
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
146+
for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
147147
if (!entry.getKey().toLowerCase(Locale.ROOT).startsWith("sec-websocket")) {
148148
filtered.addAll(entry.getKey(), entry.getValue());
149149
}

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
6969
HttpHeaders headers = request.getHeaders();
7070
HashMap<String, Long> longHeaders = new HashMap<>();
7171

72-
for (Map.Entry<String, List<String>> headerEntry : headers.entrySet()) {
72+
for (Map.Entry<String, List<String>> headerEntry : headers.headerSet()) {
7373
long headerSizeInBytes = 0L;
7474
headerSizeInBytes += headerEntry.getKey().getBytes().length;
7575
List<String> values = headerEntry.getValue();

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
9696
HttpHeaders updated = new HttpHeaders();
9797

9898
// copy all headers except Forwarded
99-
for (Map.Entry<String, List<String>> entry : original.entrySet()) {
99+
for (Map.Entry<String, List<String>> entry : original.headerSet()) {
100100
if (!entry.getKey().equalsIgnoreCase(FORWARDED_HEADER)) {
101101
updated.addAll(entry.getKey(), entry.getValue());
102102
}

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/GRPCRequestHeadersFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class GRPCRequestHeadersFilter implements HttpHeadersFilter, Ordered {
3333
public HttpHeaders filter(HttpHeaders headers, ServerWebExchange exchange) {
3434
HttpHeaders updated = new HttpHeaders();
3535

36-
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
36+
for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
3737
updated.addAll(entry.getKey(), entry.getValue());
3838
}
3939

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/RemoveHopByHopHeadersFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public HttpHeaders filter(HttpHeaders originalHeaders, ServerWebExchange exchang
7474
Set<String> headersToRemove = new HashSet<>(headers);
7575
headersToRemove.addAll(connectionOptions);
7676

77-
for (Map.Entry<String, List<String>> entry : originalHeaders.entrySet()) {
77+
for (Map.Entry<String, List<String>> entry : originalHeaders.headerSet()) {
7878
if (!headersToRemove.contains(entry.getKey().toLowerCase(Locale.ROOT))) {
7979
filtered.addAll(entry.getKey(), entry.getValue());
8080
}

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
202202
HttpHeaders original = input;
203203
HttpHeaders updated = new HttpHeaders();
204204

205-
for (Map.Entry<String, List<String>> entry : original.entrySet()) {
205+
for (Map.Entry<String, List<String>> entry : original.headerSet()) {
206206
updated.addAll(entry.getKey(), entry.getValue());
207207
}
208208

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilterMixedTypeTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private HttpHeadersFilter filterRemovingHeaders(Type type, String... headerNames
5959
@Override
6060
public HttpHeaders filter(HttpHeaders headers, ServerWebExchange exchange) {
6161
HttpHeaders result = new HttpHeaders();
62-
headers.entrySet().forEach(entry -> {
62+
headers.headerSet().forEach(entry -> {
6363
if (!headerNamesSet.contains(entry.getKey())) {
6464
result.put(entry.getKey(), entry.getValue());
6565
}

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void httpHeadersFilterTests() {
5252
private HttpHeaders filter(HttpHeaders input, String keyToFilter) {
5353
HttpHeaders filtered = new HttpHeaders();
5454

55-
input.entrySet()
55+
input.headerSet()
5656
.stream()
5757
.filter(entry -> !entry.getKey().equals(keyToFilter))
5858
.forEach(entry -> filtered.addAll(entry.getKey(), entry.getValue()));

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/test/HttpBinCompatibleController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public ResponseEntity<String> status(@PathVariable int status) {
177177
public ResponseEntity<Map<String, Object>> responseHeaders(@PathVariable int status, ServerWebExchange exchange) {
178178
HttpHeaders httpHeaders = exchange.getRequest()
179179
.getHeaders()
180-
.entrySet()
180+
.headerSet()
181181
.stream()
182182
.filter(entry -> entry.getKey().startsWith("X-Test-"))
183183
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,

0 commit comments

Comments
 (0)