From 0245ba753e9c81ffdcf01048273f4e1bc8bbbf6d Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 18 May 2018 16:35:13 +0200 Subject: [PATCH] Rename class. --- .../netflix/eureka/EurekaClientAutoConfiguration.java | 8 ++++---- .../cloud/netflix/eureka/EurekaDiscoveryClient.java | 8 ++++---- ...ntConfig.java => EurekaDiscoveryClientProperties.java} | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/{EurekaDiscoveryClientConfig.java => EurekaDiscoveryClientProperties.java} (92%) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java index 7babcd437..f6b7bc1ea 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java @@ -197,14 +197,14 @@ public class EurekaClientAutoConfiguration { } @Bean - public EurekaDiscoveryClientConfig discoveryClientConfig() { - return new EurekaDiscoveryClientConfig(); + public EurekaDiscoveryClientProperties discoveryClientProperties() { + return new EurekaDiscoveryClientProperties(); } @Bean public DiscoveryClient discoveryClient(EurekaInstanceConfig config, EurekaClient client, - EurekaDiscoveryClientConfig discoveryClientConfig) { - return new EurekaDiscoveryClient(config, client, discoveryClientConfig); + EurekaDiscoveryClientProperties eurekaDiscoveryClientProperties) { + return new EurekaDiscoveryClient(config, client, eurekaDiscoveryClientProperties); } @Bean diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java index ef4797dfe..3db387b03 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java @@ -46,13 +46,13 @@ public class EurekaDiscoveryClient implements DiscoveryClient { private final EurekaClient eurekaClient; - private final EurekaDiscoveryClientConfig discoveryClientConfig; + private final EurekaDiscoveryClientProperties discoveryClientProperties; public EurekaDiscoveryClient(EurekaInstanceConfig config, EurekaClient eurekaClient, - EurekaDiscoveryClientConfig discoveryClientConfig) { + EurekaDiscoveryClientProperties discoveryClientProperties) { this.config = config; this.eurekaClient = eurekaClient; - this.discoveryClientConfig = discoveryClientConfig; + this.discoveryClientProperties = discoveryClientProperties; } @Override @@ -138,6 +138,6 @@ public class EurekaDiscoveryClient implements DiscoveryClient { @Override public int getOrder() { - return this.discoveryClientConfig.getOrder(); + return this.discoveryClientProperties.getOrder(); } } diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfig.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientProperties.java similarity index 92% rename from spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfig.java rename to spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientProperties.java index 246059c5e..4b2c0b9cf 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfig.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientProperties.java @@ -9,7 +9,7 @@ import org.springframework.core.Ordered; * @author Olga Maciaszek-Sharma */ @ConfigurationProperties(prefix = "spring.cloud.discovery.client.eureka") -public class EurekaDiscoveryClientConfig { +public class EurekaDiscoveryClientProperties { private int order = Ordered.LOWEST_PRECEDENCE;