From 142f1afeebec0b2e66574ba38a753e52db901ebe Mon Sep 17 00:00:00 2001 From: heowc Date: Sun, 5 May 2024 18:03:18 +0900 Subject: [PATCH] Cleanup --- .../config/DiscoveryClientOptionalArgsConfiguration.java | 2 +- .../config/EurekaConfigServerBootstrapConfiguration.java | 2 +- .../eureka/http/RestTemplateTransportClientFactory.java | 4 ++-- ...BootstrapConfigurationRestClientIntegrationTests.java | 9 ++++----- ...onfigServerBootstrapConfigurationRestClientTests.java | 2 +- .../EurekaHttpClientsOptionalArgsConfigurationTest.java | 4 ++-- .../eureka/http/RestClientEurekaHttpClientTests.java | 8 ++++---- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java index 31be70bd9..1670f2be0 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java @@ -179,7 +179,7 @@ public RestClientDiscoveryClientOptionalArgs restClientDiscoveryClientOptionalAr @Bean @ConditionalOnMissingBean(value = TransportClientFactories.class, search = SearchStrategy.CURRENT) - public RestClientTransportClientFactories webClientTransportClientFactories( + public RestClientTransportClientFactories restClientTransportClientFactories( ObjectProvider builder) { return new RestClientTransportClientFactories(builder::getIfAvailable); } diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java index c60d50cc0..a03951dd6 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java @@ -120,7 +120,7 @@ protected static class RestClientConfiguration { @Bean @ConditionalOnMissingBean(EurekaHttpClient.class) - public RestClientEurekaHttpClient configDiscoveryWebClientEurekaHttpClient(EurekaClientConfigBean config, + public RestClientEurekaHttpClient configDiscoveryRestClientEurekaHttpClient(EurekaClientConfigBean config, ObjectProvider builder, Environment env) { return (RestClientEurekaHttpClient) new RestClientTransportClientFactory(builder::getIfAvailable) .newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, env)); diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java index 050e3267f..fb7de1f3e 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java @@ -133,8 +133,8 @@ private RestTemplate restTemplate(String serviceUrl) { final EurekaHttpClientUtils.UserInfo userInfo = extractUserInfo(serviceUrl); if (userInfo != null) { - restTemplate.getInterceptors() - .add(new BasicAuthenticationInterceptor(userInfo.username(), userInfo.password())); + restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor( + userInfo.username(), userInfo.password())); } restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter()); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests.java index 1bb8c36f2..d3d9b05e7 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests.java @@ -40,10 +40,9 @@ /** * @author Wonchul Heo */ -@SpringBootTest( - properties = { "spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true", - "spring.config.use-legacy-processing=true", "eureka.client.restclient.enabled=true" }, - webEnvironment = RANDOM_PORT) +@SpringBootTest(properties = { "spring.cloud.config.discovery.enabled=true", + "eureka.client.enabled=true", "spring.config.use-legacy-processing=true", + "eureka.client.restclient.enabled=true" }, webEnvironment = RANDOM_PORT) class EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests { @LocalServerPort @@ -53,7 +52,7 @@ class EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests { private RestClientEurekaHttpClient eurekaHttpClient; @Test - void webClientRespectsCodecProperties() { + void restClientRespectsCodecProperties() { final RestClient restClient = eurekaHttpClient.getRestClient(); final ResponseEntity response = restClient.get().uri("http://localhost:" + port).retrieve() .toEntity(String.class); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientTests.java index e3185494f..1a0da214f 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientTests.java @@ -46,7 +46,7 @@ void properBeansCreatedWhenEnabled() { } @Test - void properBeansCreatedWhenEnabledWebClientDisabled() { + void properBeansCreatedWhenEnabledRestClientDisabled() { new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class)) .withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true") diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java index 488e43145..cf48b634d 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java @@ -41,7 +41,7 @@ public class EurekaHttpClientsOptionalArgsConfigurationTest { @Test - public void contextLoadsWithRestTemplateWhenWebClientIsDisabled() { + public void contextLoadsWithRestTemplateWhenWebClientDisabled() { new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class) .withPropertyValues("eureka.client.webclient.enabled=false").run(context -> { assertThat(context).hasSingleBean(RestTemplateDiscoveryClientOptionalArgs.class); @@ -51,7 +51,7 @@ public void contextLoadsWithRestTemplateWhenWebClientIsDisabled() { } @Test - public void contextLoadsWithRestTemplateWhenRestClientIsDisabled() { + public void contextLoadsWithRestTemplateWhenRestClientDisabled() { new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class) .withPropertyValues("eureka.client.restclient.enabled=false").run(context -> { assertThat(context).hasSingleBean(RestTemplateDiscoveryClientOptionalArgs.class); diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestClientEurekaHttpClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestClientEurekaHttpClientTests.java index 6e46b60ba..4dc3582a8 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestClientEurekaHttpClientTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestClientEurekaHttpClientTests.java @@ -32,10 +32,10 @@ /** * @author Wonchul Heo */ -@SpringBootTest(classes = EurekaServerMockApplication.class, - properties = { "debug=true", "security.basic.enabled=true", "eureka.client.fetch-registry=false", - "eureka.client.register-with-eureka=false", "logging.level.org.springframework=INFO" }, - webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = EurekaServerMockApplication.class, properties = { "debug=true", + "security.basic.enabled=true", "eureka.client.fetch-registry=false", + "eureka.client.register-with-eureka=false", + "logging.level.org.springframework=INFO" }, webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext class RestClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests {