Browse Source

Replace forEach with putAll

See gh-28646
pull/28862/head
Vikey Chen 2 years ago committed by rstoyanchev
parent
commit
2afe560e41
  1. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/BindingContext.java
  2. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
  3. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
  4. 6
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java

4
spring-webflux/src/main/java/org/springframework/web/reactive/BindingContext.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -136,7 +136,7 @@ public class BindingContext {
return Mono.zip(Mono.just(vars), Mono.just(queryParams), formData, multipartData) return Mono.zip(Mono.just(vars), Mono.just(queryParams), formData, multipartData)
.map(tuple -> { .map(tuple -> {
Map<String, Object> result = new TreeMap<>(); Map<String, Object> result = new TreeMap<>();
tuple.getT1().forEach(result::put); result.putAll(tuple.getT1());
tuple.getT2().forEach((key, values) -> addBindValue(result, key, values)); tuple.getT2().forEach((key, values) -> addBindValue(result, key, values));
tuple.getT3().forEach((key, values) -> addBindValue(result, key, values)); tuple.getT3().forEach((key, values) -> addBindValue(result, key, values));
tuple.getT4().forEach((key, values) -> addBindValue(result, key, values)); tuple.getT4().forEach((key, values) -> addBindValue(result, key, values));

4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -182,7 +182,7 @@ public class JettyWebSocketClient implements WebSocketClient, Lifecycle {
private HandshakeInfo createHandshakeInfo(URI url, Session jettySession) { private HandshakeInfo createHandshakeInfo(URI url, Session jettySession) {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
jettySession.getUpgradeResponse().getHeaders().forEach(headers::put); headers.putAll(jettySession.getUpgradeResponse().getHeaders());
String protocol = headers.getFirst("Sec-WebSocket-Protocol"); String protocol = headers.getFirst("Sec-WebSocket-Protocol");
return new HandshakeInfo(url, headers, Mono.empty(), protocol); return new HandshakeInfo(url, headers, Mono.empty(), protocol);
} }

4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -171,7 +171,7 @@ public class StandardWebSocketClient implements WebSocketClient {
@Override @Override
public void afterResponse(HandshakeResponse response) { public void afterResponse(HandshakeResponse response) {
response.getHeaders().forEach(this.responseHeaders::put); this.responseHeaders.putAll(response.getHeaders());
} }
} }

6
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -243,7 +243,7 @@ public class UndertowWebSocketClient implements WebSocketClient {
@Override @Override
public void beforeRequest(Map<String, List<String>> headers) { public void beforeRequest(Map<String, List<String>> headers) {
this.requestHeaders.forEach(headers::put); headers.putAll(this.requestHeaders);
if (this.delegate != null) { if (this.delegate != null) {
this.delegate.beforeRequest(headers); this.delegate.beforeRequest(headers);
} }
@ -251,7 +251,7 @@ public class UndertowWebSocketClient implements WebSocketClient {
@Override @Override
public void afterRequest(Map<String, List<String>> headers) { public void afterRequest(Map<String, List<String>> headers) {
headers.forEach(this.responseHeaders::put); this.responseHeaders.putAll(headers);
if (this.delegate != null) { if (this.delegate != null) {
this.delegate.afterRequest(headers); this.delegate.afterRequest(headers);
} }

Loading…
Cancel
Save