From fcbc4378256ee50d17bf0312dccef60cfa4c77ba Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 2 Dec 2019 17:14:13 +0000 Subject: [PATCH] Polishing (follow-up on acfeb7) --- .../test/web/reactive/server/DefaultWebTestClientBuilder.java | 1 - .../web/reactive/function/client/DefaultWebClientBuilder.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java index 5ae951c1874..82006d37b25 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java @@ -137,7 +137,6 @@ class DefaultWebTestClientBuilder implements WebTestClient.Builder { } @Override - @Deprecated public WebTestClient.Builder exchangeStrategies(ExchangeStrategies strategies) { this.webClientBuilder.exchangeStrategies(strategies); return this; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java index f7e9517d27b..44c3164b701 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java @@ -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 { 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();