diff --git a/docs/modules/ROOT/pages/spring-cloud-circuitbreaker.adoc b/docs/modules/ROOT/pages/spring-cloud-circuitbreaker.adoc index 9903ae566..31766001e 100755 --- a/docs/modules/ROOT/pages/spring-cloud-circuitbreaker.adoc +++ b/docs/modules/ROOT/pages/spring-cloud-circuitbreaker.adoc @@ -104,15 +104,15 @@ Customizer.once(circuitBreaker -> { }, CircuitBreaker::getName) ---- -[[interface-clients]] -== Spring Interface Clients Support +[[service-clients]] +== Spring HTTP Service Clients Support -Spring Cloud provides support for Spring Interface Clients integration through the following configurers: +Spring Cloud provides support for Spring HTTP Service Clients integration through the following configurers: - `CircuitBreakerRestClientHttpServiceGroupConfigurer` - `CircuitBreakerWebClientHttpServiceGroupConfigurer` -These configurers enable CircuitBreaker support for https://docs.spring.io/spring-framework/reference/7.0-SNAPSHOT/integration/rest-clients.html#rest-http-interface-group-config[Spring Interface Client Groups]. +These configurers enable CircuitBreaker support for https://docs.spring.io/spring-framework/reference/7.0-SNAPSHOT/integration/rest-clients.html#rest-http-service-client-group-config[Spring HTTP Service Client Groups]. When fallback classes are configured using the `@HttpServiceFallbackAnnotation`, CircuitBreaker adapter decorators are added: diff --git a/docs/modules/ROOT/pages/spring-cloud-commons/loadbalancer.adoc b/docs/modules/ROOT/pages/spring-cloud-commons/loadbalancer.adoc index 2543bb06a..84dc9c515 100644 --- a/docs/modules/ROOT/pages/spring-cloud-commons/loadbalancer.adoc +++ b/docs/modules/ROOT/pages/spring-cloud-commons/loadbalancer.adoc @@ -592,17 +592,17 @@ NOTE: Starting with `4.1.0`, we have introduced the `callGetWithRequestOnDelegat Since `4.0.0`, Spring Cloud LoadBalancer supports Spring AOT transformations and native images. However, to use this feature, you need to explicitly define your `LoadBalancerClient` service IDs. You can do so by using the `value` or `name` attributes of the `@LoadBalancerClient` annotation or as values of the `spring.cloud.loadbalancer.eager-load.clients` property. -== LoadBalancer Integration for Spring Interface Clients AutoConfiguration +== LoadBalancer Integration for Spring HTTP Service Clients AutoConfiguration -Since `5.0.0`, Spring Cloud LoadBalancer supports https://docs.spring.io/spring-framework/reference/7.0-SNAPSHOT/integration/rest-clients.html#rest-http-interface[Spring Interface Clients] AutoConfiguration through the `LoadBalancerRestClientHttpServiceGroupConfigurer` and `LoadBalancerWebClientHttpServiceGroupConfigurer`. +Since `5.0.0`, Spring Cloud LoadBalancer supports https://docs.spring.io/spring-framework/reference/7.0-SNAPSHOT/integration/rest-clients.html#rest-http-service-client[Spring HTTP Service Clients] AutoConfiguration through the `LoadBalancerRestClientHttpServiceGroupConfigurer` and `LoadBalancerWebClientHttpServiceGroupConfigurer`. -For each Interface Client group, if the group `baseUrl` (defined under the -`spring.http.client.service.group.[groupName].base-url` property) is `null`, a `serviceId`-based URL for load-balancing is set up as the `baseUrl`, with `serviceId` resolved from the Interface Client `groupName`. +For each HTTP Service Client group, if the group `baseUrl` (defined under the +`spring.http.client.service.group.[groupName].base-url` property) is `null`, a `serviceId`-based URL for load-balancing is set up as the `baseUrl`, with `serviceId` resolved from the HTTP Service Client `groupName`. If the group `baseUrl` is `null` or its scheme is set to `lb`, a `DeferringLoadBalancerInterceptor` instance is picked from the application context for blocking scenarios, and a `DeferringLoadBalancerExchangeFilterFunction` instance for reactive scenarios, and is added to the group's `RestClient.Builder` or `WebClient.Builder` if available, allowing for the requests to be load-balanced. -For example, in an app with the following Interface Clients configuration: +For example, in an app with the following HTTP Service Clients configuration: [source,java,indent=0] ---- diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRestClientHttpServiceGroupConfigurer.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRestClientHttpServiceGroupConfigurer.java index 06d297f73..cdd4b4f35 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRestClientHttpServiceGroupConfigurer.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRestClientHttpServiceGroupConfigurer.java @@ -33,7 +33,7 @@ /** * Load-balancer-specific {@link RestClientHttpServiceGroupConfigurer} implementation. If * the group {@code baseUrl} is {@code null}, sets up a {@code baseUrl} with LoadBalancer - * {@code serviceId} -resolved from Interface Client {@code groupName} set as + * {@code serviceId} -resolved from HTTP Service Client {@code groupName} set as * {@code host}. If the group {@code baseUrl} is {@code null} or has {@code lb} set as its * scheme, a {@link DeferringLoadBalancerInterceptor} instance picked from application * context is added to the group's {@link RestClient.Builder} if available, allowing for diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientHttpServiceGroupConfigurer.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientHttpServiceGroupConfigurer.java index 99913e8d4..420cefead 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientHttpServiceGroupConfigurer.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientHttpServiceGroupConfigurer.java @@ -32,7 +32,7 @@ /** * Load-balancer-specific {@link WebClientHttpServiceGroupConfigurer} implementation. If * the group {@code baseUrl} is {@code null}, sets up a {@code baseUrl} with LoadBalancer - * {@code serviceId} -resolved from Interface Client {@code groupName} set as + * {@code serviceId} -resolved from HTTP Service Client {@code groupName} set as * {@code host}. If the group {@code baseUrl} is {@code null} or has {@code lb} set as its * scheme, a {@link DeferringLoadBalancerExchangeFilterFunction} instance picked from * application context is added to the group's {@link WebClient.Builder} if available,