From dd007e233c397eb17c3a86c6f6a12db35d0a8a67 Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 18 May 2018 14:23:11 +0200 Subject: [PATCH 1/7] Adjust CloudFoundryDiscoveryClient to DiscoveryClient ordering functionality in spring-cloud-commons. --- .../CloudFoundryDiscoveryClient.java | 14 +++++++++-- .../CloudFoundryDiscoveryClientConfig.java | 23 +++++++++++++++++++ ...udFoundryDiscoveryClientConfiguration.java | 10 ++++++-- .../CloudFoundryDiscoveryClientTest.java | 3 ++- 4 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfig.java 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 ad9d3f7..4118727 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 @@ -30,23 +30,28 @@ import java.util.HashMap; import java.util.List; /** - * Cloud Foundry maintains a registry of running applications which we expose here as CloudFoundryService instances. + * Cloud Foundry maintains a registry of running applications which we expose here as + * CloudFoundryService instances. * * @author Josh Long * @author Spencer Gibb * @author Dave Syer + * @author Olga Maciaszek-Sharma */ public class CloudFoundryDiscoveryClient implements DiscoveryClient { private final CloudFoundryService cloudFoundryService; private final CloudFoundryOperations cloudFoundryOperations; + private final CloudFoundryDiscoveryClientConfig discoveryClientConfig; private final String description = "Cloud Foundry " + DiscoveryClient.class.getName() + " implementation"; CloudFoundryDiscoveryClient(CloudFoundryOperations cloudFoundryOperations, - CloudFoundryService svc) { + CloudFoundryService svc, + CloudFoundryDiscoveryClientConfig discoveryClientConfig) { this.cloudFoundryService = svc; this.cloudFoundryOperations = cloudFoundryOperations; + this.discoveryClientConfig = discoveryClientConfig; } @Override @@ -89,4 +94,9 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient { .blockOptional() .orElse(new ArrayList<>()); } + + @Override + public int getOrder() { + return discoveryClientConfig.getOrder(); + } } \ No newline at end of file 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/CloudFoundryDiscoveryClientConfig.java new file mode 100644 index 0000000..ff1f037 --- /dev/null +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientConfig.java @@ -0,0 +1,23 @@ +package org.springframework.cloud.cloudfoundry.discovery; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * Properties used for configuring the CloudFoundry implementation of + * {@link org.springframework.cloud.client.discovery.DiscoveryClient} + * + * @author Olga Maciaszek-Sharma + */ +@ConfigurationProperties("spring.cloud.discovery.client.cloudfoundry") +public class CloudFoundryDiscoveryClientConfig { + + private int order; + + public int getOrder() { + return order; + } + + public void setOrder(int order) { + this.order = order; + } +} 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 bf63744..f5d4414 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 @@ -34,11 +34,17 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(CloudFoundryDiscoveryProperties.class) public class CloudFoundryDiscoveryClientConfiguration { + @Bean + public CloudFoundryDiscoveryClientConfig cloudFoundryDiscoveryClientConfig() { + return new CloudFoundryDiscoveryClientConfig(); + } + @Bean @ConditionalOnMissingBean(CloudFoundryDiscoveryClient.class) public CloudFoundryDiscoveryClient cloudFoundryDiscoveryClient( - CloudFoundryOperations cf, CloudFoundryService svc) { - return new CloudFoundryDiscoveryClient(cf, svc); + CloudFoundryOperations cf, CloudFoundryService svc, + CloudFoundryDiscoveryClientConfig discoveryClientConfig) { + return new CloudFoundryDiscoveryClient(cf, svc, discoveryClientConfig); } @Bean 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 a4aa047..c419982 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 @@ -54,7 +54,8 @@ public class CloudFoundryDiscoveryClientTest { public void setUp() { this.ops = mock(CloudFoundryOperations.class); this.svc = mock(CloudFoundryService.class); - this.cloudFoundryDiscoveryClient = new CloudFoundryDiscoveryClient(this.ops, this.svc); + this.cloudFoundryDiscoveryClient = new CloudFoundryDiscoveryClient(this.ops, this.svc, + new CloudFoundryDiscoveryClientConfig()); } @Test From 52b1c75ffca1799032d1c1953aad910b4cfe6980 Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 18 May 2018 14:30:16 +0200 Subject: [PATCH 2/7] Add default order to CloudFoundryDiscoveryClientConfig. --- .../discovery/CloudFoundryDiscoveryClientConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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/CloudFoundryDiscoveryClientConfig.java index ff1f037..626a1b6 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/CloudFoundryDiscoveryClientConfig.java @@ -1,6 +1,7 @@ package org.springframework.cloud.cloudfoundry.discovery; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.core.Ordered; /** * Properties used for configuring the CloudFoundry implementation of @@ -11,7 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties("spring.cloud.discovery.client.cloudfoundry") public class CloudFoundryDiscoveryClientConfig { - private int order; + private int order = Ordered.LOWEST_PRECEDENCE; public int getOrder() { return order; From ef5f62133e872717e7efbdb758804d3d525874ee Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 18 May 2018 15:52:53 +0200 Subject: [PATCH 3/7] Adjust changes to existing convention. --- .../cloudfoundry/discovery/CloudFoundryDiscoveryClient.java | 2 +- .../discovery/CloudFoundryDiscoveryClientConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 4118727..9383780 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 @@ -97,6 +97,6 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient { @Override public int getOrder() { - return discoveryClientConfig.getOrder(); + return this.discoveryClientConfig.getOrder(); } } \ No newline at end of file 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/CloudFoundryDiscoveryClientConfig.java index 626a1b6..fc17f13 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/CloudFoundryDiscoveryClientConfig.java @@ -15,7 +15,7 @@ public class CloudFoundryDiscoveryClientConfig { private int order = Ordered.LOWEST_PRECEDENCE; public int getOrder() { - return order; + return this.order; } public void setOrder(int order) { From 8fb072505ba48ef656af8f18c1a99719e54a3fd3 Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 18 May 2018 16:44:52 +0200 Subject: [PATCH 4/7] 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 From 859d1a0a9e96f73f4884548d1ce1eaca4e694cf1 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 7 Sep 2018 15:50:48 +0200 Subject: [PATCH 5/7] Switch to taking order from `CloudFoundryDiscoveryProperties`. --- .../discovery/CloudFoundryDiscoveryClient.java | 8 ++++---- .../CloudFoundryDiscoveryClientConfiguration.java | 9 ++------- .../discovery/CloudFoundryDiscoveryProperties.java | 14 ++++++++++++++ .../discovery/CloudFoundryDiscoveryClientTest.java | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) 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 8df95c5..533bfbc 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 CloudFoundryDiscoveryClientProperties discoveryClientProperties; + private final CloudFoundryDiscoveryProperties cloudFoundryDiscoveryProperties; private final String description = "Cloud Foundry " + DiscoveryClient.class.getName() + " implementation"; CloudFoundryDiscoveryClient(CloudFoundryOperations cloudFoundryOperations, CloudFoundryService svc, - CloudFoundryDiscoveryClientProperties discoveryClientProperties) { + CloudFoundryDiscoveryProperties cloudFoundryDiscoveryProperties) { this.cloudFoundryService = svc; this.cloudFoundryOperations = cloudFoundryOperations; - this.discoveryClientProperties = discoveryClientProperties; + this.cloudFoundryDiscoveryProperties = cloudFoundryDiscoveryProperties; } @Override @@ -97,6 +97,6 @@ public class CloudFoundryDiscoveryClient implements DiscoveryClient { @Override public int getOrder() { - return this.discoveryClientProperties.getOrder(); + return this.cloudFoundryDiscoveryProperties.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 887b1c9..ec02c74 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 @@ -34,17 +34,12 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(CloudFoundryDiscoveryProperties.class) public class CloudFoundryDiscoveryClientConfiguration { - @Bean - public CloudFoundryDiscoveryClientProperties cloudFoundryDiscoveryClientProperties() { - return new CloudFoundryDiscoveryClientProperties(); - } - @Bean @ConditionalOnMissingBean(CloudFoundryDiscoveryClient.class) public CloudFoundryDiscoveryClient cloudFoundryDiscoveryClient( CloudFoundryOperations cf, CloudFoundryService svc, - CloudFoundryDiscoveryClientProperties discoveryClientProperties) { - return new CloudFoundryDiscoveryClient(cf, svc, discoveryClientProperties); + CloudFoundryDiscoveryProperties cloudFoundryDiscoveryProperties) { + return new CloudFoundryDiscoveryClient(cf, svc, cloudFoundryDiscoveryProperties); } @Bean diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryProperties.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryProperties.java index a2ff8d2..92552e9 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryProperties.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryProperties.java @@ -40,6 +40,11 @@ public class CloudFoundryDiscoveryProperties { */ private int defaultServerPort = 80; + /** + * Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. + */ + private int order = 0; + public boolean isEnabled() { return enabled; } @@ -64,12 +69,21 @@ public class CloudFoundryDiscoveryProperties { this.defaultServerPort = defaultServerPort; } + public int getOrder() { + return order; + } + + public void setOrder(int order) { + this.order = order; + } + @Override public String toString() { return "CloudFoundryDiscoveryProperties{" + "enabled=" + enabled + ", heartbeatFrequency=" + heartbeatFrequency + ", defaultServerPort=" + defaultServerPort + + ", order=" + order + '}'; } } 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 b44f9bc..2b3e853 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 CloudFoundryDiscoveryClientProperties()); + new CloudFoundryDiscoveryProperties()); } @Test From 04ff3bba1a9824ed0fcff20bf6e0550396cbbf64 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 10 Sep 2018 09:26:46 +0200 Subject: [PATCH 6/7] Add license notice and fix formatting. --- ...CloudFoundryDiscoveryClientConfiguration.java | 1 + .../CloudFoundryDiscoveryClientProperties.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) 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 ec02c74..97cc709 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 @@ -17,6 +17,7 @@ package org.springframework.cloud.cloudfoundry.discovery; import org.cloudfoundry.operations.CloudFoundryOperations; + import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java index d9808ef..5e6c07d 100644 --- a/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java +++ b/spring-cloud-cloudfoundry-discovery/src/main/java/org/springframework/cloud/cloudfoundry/discovery/CloudFoundryDiscoveryClientProperties.java @@ -1,3 +1,19 @@ +/* + * Copyright 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.cloud.cloudfoundry.discovery; import org.springframework.boot.context.properties.ConfigurationProperties; From 82aca0dafee5ab15b2f2b3014b3834917ebb9e74 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 10 Sep 2018 18:01:59 +0200 Subject: [PATCH 7/7] empty commit to retrigger build