diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRestClientIntegrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRestClientIntegrationTests.java index 20e528e44..e79988686 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRestClientIntegrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRestClientIntegrationTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.client.loadbalancer; -import java.io.IOException; import java.net.URI; import org.junit.jupiter.api.Test; @@ -70,13 +69,13 @@ RestClient.Builder restClientBuilder() { LoadBalancerClient testLoadBalancerClient() { return new LoadBalancerClient() { @Override - public T execute(String serviceId, LoadBalancerRequest request) throws IOException { + public T execute(String serviceId, LoadBalancerRequest request) { throw new UnsupportedOperationException("LoadBalancerInterceptor invoked."); } @Override - public T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest request) - throws IOException { + public T execute(String serviceId, ServiceInstance serviceInstance, + LoadBalancerRequest request) { throw new UnsupportedOperationException("LoadBalancerInterceptor invoked."); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRestTemplateBuilderIntegrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRestTemplateBuilderIntegrationTests.java new file mode 100644 index 000000000..239863700 --- /dev/null +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRestTemplateBuilderIntegrationTests.java @@ -0,0 +1,68 @@ +/* + * Copyright 2012-2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.client.loadbalancer; + +import org.junit.jupiter.api.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Integration tests for load-balanced {@link RestTemplateBuilder}. + * + * @author Olga Maciaszek-Sharma + */ +@SpringBootTest(classes = { LoadBalancedRestTemplateBuilderIntegrationTests.TestConfig.class, + LoadBalancerAutoConfiguration.class }, properties = "spring.cloud.loadbalancer.retry.enabled=false") +public class LoadBalancedRestTemplateBuilderIntegrationTests { + + private final RestTemplateBuilder restTemplateBuilder; + + @Autowired + ApplicationContext context; + + public LoadBalancedRestTemplateBuilderIntegrationTests(@Autowired RestTemplateBuilder restTemplateBuilder) { + this.restTemplateBuilder = restTemplateBuilder; + } + + @Test + void shouldBuildLoadBalancedRestTemplate() { + RestTemplate restTemplate = restTemplateBuilder.build(); + + assertThat(restTemplate.getInterceptors()).hasSize(1); + assertThat(restTemplate.getInterceptors().get(0)).isInstanceOf(BlockingLoadBalancerInterceptor.class); + } + + @SpringBootConfiguration + static class TestConfig { + + @LoadBalanced + @Bean + RestTemplateBuilder restTemplateBuilder() { + return new RestTemplateBuilder(); + } + + } + +}