Cleanup

spring-cloud · May 5, 2024 · 142f1af · 142f1af
1 parent 783d4c1
commit 142f1af
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/...springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java b/...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<RestClient.Builder> builder) {
 			return new RestClientTransportClientFactories(builder::getIfAvailable);
 		}

diff --git a/...springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java b/...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<RestClient.Builder> builder, Environment env) {
 			return (RestClientEurekaHttpClient) new RestClientTransportClientFactory(builder::getIfAvailable)
 					.newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, env));

diff --git a/...ava/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java b/...ava/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/...lix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientIntegrationTests.java b/...lix/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<String> response = restClient.get().uri("http://localhost:" + port).retrieve()
 				.toEntity(String.class);

diff --git a/.../cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationRestClientTests.java b/.../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/...framework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java b/...framework/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/...t/java/org/springframework/cloud/netflix/eureka/http/RestClientEurekaHttpClientTests.java b/...t/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 {