Browse Source

Polishing (follow-up on acfeb7)

pull/24117/head
Rossen Stoyanchev 6 years ago
parent
commit
fcbc437825
  1. 1
      spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java
  2. 3
      spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java

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

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

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

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

Loading…
Cancel
Save