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

Polishing (follow-up on acfeb7)

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-12-02 17:14:13 +00:00
parent 35b7f3bf34
commit fcbc437825
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java
View File

@@ -137,7 +137,6 @@ class DefaultWebTestClientBuilder implements WebTestClient.Builder {
} }
@Override @Override
@Deprecated
public WebTestClient.Builder exchangeStrategies(ExchangeStrategies strategies) { public WebTestClient.Builder exchangeStrategies(ExchangeStrategies strategies) {
this.webClientBuilder.exchangeStrategies(strategies); this.webClientBuilder.exchangeStrategies(strategies);
return this; return this;

3
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
View File

@@ -207,9 +207,7 @@ final class DefaultWebClientBuilder implements WebClient.Builder {
} }
@Override @Override
@Deprecated
public WebClient.Builder exchangeStrategies(ExchangeStrategies strategies) { public WebClient.Builder exchangeStrategies(ExchangeStrategies strategies) {
Assert.notNull(strategies, "ExchangeStrategies must not be null");
this.strategies = strategies; this.strategies = strategies;
return this; return this;
} }
@@ -268,7 +266,6 @@ final class DefaultWebClientBuilder implements WebClient.Builder {
throw new IllegalStateException("No suitable default ClientHttpConnector found"); throw new IllegalStateException("No suitable default ClientHttpConnector found");
} }
@SuppressWarnings("deprecation")
private ExchangeStrategies initExchangeStrategies() { private ExchangeStrategies initExchangeStrategies() {
if (CollectionUtils.isEmpty(this.strategiesConfigurers)) { if (CollectionUtils.isEmpty(this.strategiesConfigurers)) {
return this.strategies != null ? this.strategies : ExchangeStrategies.withDefaults(); return this.strategies != null ? this.strategies : ExchangeStrategies.withDefaults();