diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java index eb1e8f21b..c92ba95db 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java @@ -101,7 +101,6 @@ void multipleRestTemplates() { void multipleRestClientBuilders() { applicationContextRunner.withUserConfiguration(TwoRestTemplatesAndTwoRestClientBuilders.class).run(context -> { final Map restClientBuilders = context.getBeansOfType(RestClient.Builder.class); - final Map restTemplates = context.getBeansOfType(RestTemplate.class); assertThat(restClientBuilders).isNotNull(); assertThat(restClientBuilders.values()).hasSize(2); @@ -115,19 +114,6 @@ void multipleRestClientBuilders() { assertThat(two.nonLoadBalancedRestClientBuilder).isNotNull(); two.nonLoadBalancedRestClientBuilder .requestInterceptors(interceptors -> assertThat(interceptors).isEmpty()); - - assertThat(restTemplates).isNotNull(); - Collection templates = restTemplates.values(); - assertThat(templates).hasSize(2); - - TwoRestTemplatesAndTwoRestClientBuilders.Two twoRestTemplate = context - .getBean(TwoRestTemplatesAndTwoRestClientBuilders.Two.class); - - assertThat(twoRestTemplate.loadBalanced).isNotNull(); - assertLoadBalanced(twoRestTemplate.loadBalanced); - - assertThat(twoRestTemplate.nonLoadBalanced).isNotNull(); - assertThat(twoRestTemplate.nonLoadBalanced.getInterceptors()).isEmpty(); }); } @@ -138,6 +124,7 @@ void restTemplatesAndRestClientsFromUsersAutoConfiguration() { .run(context -> { final Map restClientBuilders = context .getBeansOfType(RestClient.Builder.class); + final Map restTemplates = context.getBeansOfType(RestTemplate.class); assertThat(restClientBuilders).isNotNull(); assertThat(restClientBuilders.values()).hasSize(2); @@ -151,6 +138,19 @@ void restTemplatesAndRestClientsFromUsersAutoConfiguration() { assertThat(two.nonLoadBalancedRestClientBuilder).isNotNull(); two.nonLoadBalancedRestClientBuilder .requestInterceptors(interceptors -> assertThat(interceptors).isEmpty()); + + assertThat(restTemplates).isNotNull(); + Collection templates = restTemplates.values(); + assertThat(templates).hasSize(2); + + TwoRestTemplatesAndTwoRestClientBuilders.Two twoRestTemplate = context + .getBean(TwoRestTemplatesAndTwoRestClientBuilders.Two.class); + + assertThat(twoRestTemplate.loadBalanced).isNotNull(); + assertLoadBalanced(twoRestTemplate.loadBalanced); + + assertThat(twoRestTemplate.nonLoadBalanced).isNotNull(); + assertThat(twoRestTemplate.nonLoadBalanced.getInterceptors()).isEmpty(); }); }