SpringCloud/spring-cloud-cloudfoundry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename class.

Browse Source
This commit is contained in:
OlgaMaciaszek
2018-05-18 16:44:52 +02:00
parent ef5f62133e
commit 8fb072505b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClient.java
View File

@@ -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();
}
}

8
spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfiguration.java
View File

@@ -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

2
spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfig.java → spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java
View File

@@ -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;

2
spring-cloud-cloudfoundry-discovery/src/test/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientTest.java
View File

@@ -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