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

Add Builder to HttpServiceProxyFactory

Browse Source 
HttpServiceProxyFactory now support programmatic initialization through
a builder, while bean-style initialization is deprecated.

See gh-29296
This commit is contained in:
rstoyanchev
2022-10-17 12:23:42 +01:00
parent e03abc94ff
commit 5cb3af708c
14 changed files with 413 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/WebClientAdapter.java
View File

@@ -124,6 +124,15 @@ public final class WebClientAdapter implements HttpClientAdapter {
}
/**
* Create a {@link WebClientAdapter} for the given {@code WebClient} instance.
* @param webClient the client to use
* @return the created adapter instance
*/
public static WebClientAdapter forClient(WebClient webClient) {
return new WebClientAdapter(webClient);
}
/**
* Static method to create a {@link HttpServiceProxyFactory} configured to
* use the given {@link WebClient} instance. Effectively a shortcut for:
@@ -133,7 +142,11 @@ public final class WebClientAdapter implements HttpClientAdapter {
* </pre>
* @param webClient the client to use
* @return the created {@code HttpServiceProxyFactory} instance
* @deprecated in favor of using {@link #forClient(WebClient)} and
* {@link HttpServiceProxyFactory#builder(HttpClientAdapter)}
*/
@SuppressWarnings("removal")
@Deprecated(since = "6.0.0-RC1", forRemoval = true)
public static HttpServiceProxyFactory createHttpServiceProxyFactory(WebClient webClient) {
return new HttpServiceProxyFactory(new WebClientAdapter(webClient));
}
@@ -143,18 +156,12 @@ public final class WebClientAdapter implements HttpClientAdapter {
* a {@link WebClient.Builder} and uses it to create the client.
* @param webClientBuilder a builder to create the client to use with
* @return the created {@code HttpServiceProxyFactory} instance
* @deprecated in favor of using {@link #forClient(WebClient)} and
* {@link HttpServiceProxyFactory#builder(HttpClientAdapter)}
*/
@Deprecated(since = "6.0.0-RC1", forRemoval = true)
public static HttpServiceProxyFactory createHttpServiceProxyFactory(WebClient.Builder webClientBuilder) {
return createHttpServiceProxyFactory(webClientBuilder.build());
}
/**
* Create a {@link WebClientAdapter} for the given {@code WebClient} instance.
* @param webClient the client to use
* @return the created adapter instance
*/
public static WebClientAdapter forClient(WebClient webClient) {
return new WebClientAdapter(webClient);
}
}

9
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientHttpServiceProxyTests.java
View File

@@ -105,10 +105,11 @@ public class WebClientHttpServiceProxyTests {
return initHttpService(webClient);
}
private TestHttpService initHttpService(WebClient webClient) throws Exception {
HttpServiceProxyFactory factory = WebClientAdapter.createHttpServiceProxyFactory(webClient);
factory.afterPropertiesSet();
return factory.createClient(TestHttpService.class);
private TestHttpService initHttpService(WebClient webClient) {
return HttpServiceProxyFactory.builder()
.clientAdapter(WebClientAdapter.forClient(webClient))
.build()
.createClient(TestHttpService.class);
}
private void prepareResponse(Consumer<MockResponse> consumer) {