From 8fb072505ba48ef656af8f18c1a99719e54a3fd3 Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 18 May 2018 16:44:52 +0200 Subject: [PATCH] Rename class. --- .../discovery/CloudFoundryDiscoveryClient.java | 8 ++++---- .../CloudFoundryDiscoveryClientConfiguration.java | 8 ++++---- ...ig.java => CloudFoundryDiscoveryClientProperties.java} | 2 +- .../discovery/CloudFoundryDiscoveryClientTest.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/{CloudFoundryDiscoveryClientConfig.java => CloudFoundryDiscoveryClientProperties.java} (91%) diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java index 9383780..8df95c5 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java @@ -42,16 +42,16 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient { private final CloudFoundryService cloudFoundryService; private final CloudFoundryOperations cloudFoundryOperations; - private final CloudFoundryDiscoveryClientConfig discoveryClientConfig; + private final CloudFoundryDiscoveryClientProperties discoveryClientProperties; private final String description = "Cloud Foundry " + DiscoveryClient.class.getName() + " implementation"; CloudFoundryDiscoveryClient(CloudFoundryOperations cloudFoundryOperations, CloudFoundryService svc, - CloudFoundryDiscoveryClientConfig discoveryClientConfig) { + CloudFoundryDiscoveryClientProperties discoveryClientProperties) { this.cloudFoundryService = svc; this.cloudFoundryOperations = cloudFoundryOperations; - this.discoveryClientConfig = discoveryClientConfig; + this.discoveryClientProperties = discoveryClientProperties; } @Override @@ -97,6 +97,6 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient { @Override public int getOrder() { - return this.discoveryClientConfig.getOrder(); + return this.discoveryClientProperties.getOrder(); } } \ No newline at end of file diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java index f5d4414..887b1c9 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java @@ -35,16 +35,16 @@ import org.springframework.context.annotation.Configuration; public class CloudFoundryDiscoveryClientConfiguration { @Bean - public CloudFoundryDiscoveryClientConfig cloudFoundryDiscoveryClientConfig() { - return new CloudFoundryDiscoveryClientConfig(); + public CloudFoundryDiscoveryClientProperties cloudFoundryDiscoveryClientProperties() { + return new CloudFoundryDiscoveryClientProperties(); } @Bean @ConditionalOnMissingBean(CloudFoundryDiscoveryClient.class) public CloudFoundryDiscoveryClient cloudFoundryDiscoveryClient( CloudFoundryOperations cf, CloudFoundryService svc, - CloudFoundryDiscoveryClientConfig discoveryClientConfig) { - return new CloudFoundryDiscoveryClient(cf, svc, discoveryClientConfig); + CloudFoundryDiscoveryClientProperties discoveryClientProperties) { + return new CloudFoundryDiscoveryClient(cf, svc, discoveryClientProperties); } @Bean diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfig.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java similarity index 91% rename from spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfig.java rename to spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java index fc17f13..d9808ef 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfig.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java @@ -10,7 +10,7 @@ import org.springframework.core.Ordered; * @author Olga Maciaszek-Sharma */ @ConfigurationProperties("spring.cloud.discovery.client.cloudfoundry") -public class CloudFoundryDiscoveryClientConfig { +public class CloudFoundryDiscoveryClientProperties { private int order = Ordered.LOWEST_PRECEDENCE; diff --git a/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java b/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java index c419982..b44f9bc 100644 --- a/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java +++ b/spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java @@ -55,7 +55,7 @@ public class CloudFoundryDiscoveryClientTest { this.ops = mock(CloudFoundryOperations.class); this.svc = mock(CloudFoundryService.class); this.cloudFoundryDiscoveryClient = new CloudFoundryDiscoveryClient(this.ops, this.svc, - new CloudFoundryDiscoveryClientConfig()); + new CloudFoundryDiscoveryClientProperties()); } @Test