From 97dc516119656118addc13fe41a61427dd62a426 Mon Sep 17 00:00:00 2001 From: Charumathi Covindane Date: Thu, 1 Oct 2020 13:57:31 -0700 Subject: [PATCH 1/4] Initial Commit --- .../cloud/client/DefaultServiceInstance.java | 24 +++++++++++++++---- .../simple/SimpleDiscoveryClient.java | 4 ++-- ...impleDiscoveryClientAutoConfiguration.java | 14 ++++------- .../simple/SimpleDiscoveryProperties.java | 19 ++++++++++----- ...ctiveDiscoveryClientAutoConfiguration.java | 9 +++---- .../SimpleReactiveDiscoveryProperties.java | 15 +++++++----- .../simple/SimpleDiscoveryClientTests.java | 12 +++++----- .../SimpleReactiveDiscoveryClientTests.java | 11 ++++----- ...adBalancerExchangeFilterFunctionTests.java | 8 ++++--- ...adBalancerExchangeFilterFunctionTests.java | 8 ++++--- 10 files changed, 72 insertions(+), 52 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java index 7f92c17e1..d069216bf 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java @@ -29,13 +29,13 @@ */ public class DefaultServiceInstance implements ServiceInstance { - private final String instanceId; + private String instanceId; - private final String serviceId; + private String serviceId; - private final String host; + private String host; - private final int port; + private int port; private final boolean secure; @@ -145,6 +145,22 @@ public boolean isSecure() { return this.secure; } + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } + + public void setServiceId(String serviceId) { + this.serviceId = serviceId; + } + + public void setHost(String host) { + this.host = host; + } + + public void setPort(int port) { + this.port = port; + } + @Override public String toString() { return "DefaultServiceInstance{" + "instanceId='" + this.instanceId + '\'' diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java index 41a17ce3e..d7b129304 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.List; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties.SimpleServiceInstance; /** * A {@link org.springframework.cloud.client.discovery.DiscoveryClient} that will use the @@ -46,7 +46,7 @@ public String description() { @Override public List getInstances(String serviceId) { List serviceInstances = new ArrayList<>(); - List serviceInstanceForService = this.simpleDiscoveryProperties + List serviceInstanceForService = this.simpleDiscoveryProperties .getInstances().get(serviceId); if (serviceInstanceForService != null) { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java index 2e4188c83..b07a9e166 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java @@ -16,8 +16,6 @@ package org.springframework.cloud.client.discovery.simple; -import java.net.URI; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -67,10 +65,9 @@ public void setInet(InetUtils inet) { public SimpleDiscoveryProperties simpleDiscoveryProperties( @Value("${spring.application.name:application}") String serviceId) { simple.getLocal().setServiceId(serviceId); - simple.getLocal() - .setUri(URI.create( - "http://" + this.inet.findFirstNonLoopbackHostInfo().getHostname() - + ":" + findPort())); + simple.getLocal().setHost(this.inet.findFirstNonLoopbackHostInfo().getHostname()); + simple.getLocal().setPort(findPort()); + return simple; } @@ -95,10 +92,7 @@ private int findPort() { public void onApplicationEvent(WebServerInitializedEvent webServerInitializedEvent) { this.port = webServerInitializedEvent.getWebServer().getPort(); if (this.port > 0) { - simple.getLocal() - .setUri(URI.create("http://" - + this.inet.findFirstNonLoopbackHostInfo().getHostname() + ":" - + this.port)); + simple.getLocal().setPort(this.port); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java index ae826d277..e5cbfd7c7 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java @@ -25,6 +25,7 @@ import javax.annotation.PostConstruct; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; @@ -43,26 +44,27 @@ @ConfigurationProperties(prefix = "spring.cloud.discovery.client.simple") public class SimpleDiscoveryProperties { - private Map> instances = new HashMap<>(); + private Map> instances = new HashMap<>(); /** * The properties of the local instance (if it exists). Users should set these * properties explicitly if they are exporting data (e.g. metrics) that need to be * identified by the service instance. */ - private SimpleServiceInstance local = new SimpleServiceInstance(); + private DefaultServiceInstance local = new DefaultServiceInstance(null, null, null, 0, + false); private int order = DiscoveryClient.DEFAULT_ORDER; - public Map> getInstances() { + public Map> getInstances() { return this.instances; } - public void setInstances(Map> instances) { + public void setInstances(Map> instances) { this.instances = instances; } - public SimpleServiceInstance getLocal() { + public DefaultServiceInstance getLocal() { return this.local; } @@ -77,15 +79,20 @@ public void setOrder(int order) { @PostConstruct public void init() { for (String key : this.instances.keySet()) { - for (SimpleServiceInstance instance : this.instances.get(key)) { + for (DefaultServiceInstance instance : this.instances.get(key)) { instance.setServiceId(key); } } } + public void setInstance(String serviceId, String host, int port) { + local = new DefaultServiceInstance(null, serviceId, host, port, false); + } + /** * Basic implementation of {@link ServiceInstance}. */ + @Deprecated public static class SimpleServiceInstance implements ServiceInstance { /** diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java index cbc8acd78..bcb1b1347 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java @@ -16,8 +16,6 @@ package org.springframework.cloud.client.discovery.simple.reactive; -import java.net.URI; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.actuate.health.ReactiveHealthIndicator; @@ -71,8 +69,8 @@ public class SimpleReactiveDiscoveryClientAutoConfiguration @Bean public SimpleReactiveDiscoveryProperties simpleReactiveDiscoveryProperties() { simple.getLocal().setServiceId(serviceId); - simple.getLocal().setUri(URI.create("http://" - + inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + findPort())); + simple.getLocal().setHost(inet.findFirstNonLoopbackHostInfo().getHostname()); + simple.getLocal().setPort(findPort()); return simple; } @@ -96,8 +94,7 @@ private int findPort() { public void onApplicationEvent(WebServerInitializedEvent webServerInitializedEvent) { port = webServerInitializedEvent.getWebServer().getPort(); if (port > 0) { - simple.getLocal().setUri(URI.create("http://" - + inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + port)); + simple.getLocal().setPort(port); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java index 7c6f7efc3..1aa0326d3 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java @@ -27,6 +27,7 @@ import reactor.core.publisher.Flux; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient; @@ -45,14 +46,15 @@ @ConfigurationProperties(prefix = "spring.cloud.discovery.client.simple") public class SimpleReactiveDiscoveryProperties { - private Map> instances = new HashMap<>(); + private Map> instances = new HashMap<>(); /** * The properties of the local instance (if it exists). Users should set these * properties explicitly if they are exporting data (e.g. metrics) that need to be * identified by the service instance. */ - private SimpleServiceInstance local = new SimpleServiceInstance(); + private DefaultServiceInstance local = new DefaultServiceInstance(null, null, null, 0, + false); private int order = DiscoveryClient.DEFAULT_ORDER; @@ -60,15 +62,15 @@ public Flux getInstances(String service) { return Flux.fromIterable(instances.getOrDefault(service, emptyList())); } - Map> getInstances() { + Map> getInstances() { return instances; } - public void setInstances(Map> instances) { + public void setInstances(Map> instances) { this.instances = instances; } - public SimpleServiceInstance getLocal() { + public DefaultServiceInstance getLocal() { return this.local; } @@ -83,7 +85,7 @@ public void setOrder(int order) { @PostConstruct public void init() { for (String key : this.instances.keySet()) { - for (SimpleServiceInstance instance : this.instances.get(key)) { + for (DefaultServiceInstance instance : this.instances.get(key)) { instance.setServiceId(key); } } @@ -92,6 +94,7 @@ public void init() { /** * Basic implementation of {@link ServiceInstance}. */ + @Deprecated public static class SimpleServiceInstance implements ServiceInstance { /** diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java index dae04dfdc..bc23d7c3b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java @@ -25,8 +25,8 @@ import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; -import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties.SimpleServiceInstance; import static org.assertj.core.api.BDDAssertions.then; @@ -41,11 +41,11 @@ public class SimpleDiscoveryClientTests { public void setUp() { SimpleDiscoveryProperties simpleDiscoveryProperties = new SimpleDiscoveryProperties(); - Map> map = new HashMap<>(); - SimpleServiceInstance service1Inst1 = new SimpleServiceInstance( - URI.create("http://host1:8080")); - SimpleServiceInstance service1Inst2 = new SimpleServiceInstance( - URI.create("https://host2:8443")); + Map> map = new HashMap<>(); + DefaultServiceInstance service1Inst1 = new DefaultServiceInstance(null, null, + "host1", 8080, false); + DefaultServiceInstance service1Inst2 = new DefaultServiceInstance(null, null, + "host2", 8443, true); map.put("service1", Arrays.asList(service1Inst1, service1Inst2)); simpleDiscoveryProperties.setInstances(map); simpleDiscoveryProperties.init(); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java index 0252e7e0a..971c8668f 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.client.discovery.simple.reactive; -import java.net.URI; import java.util.Arrays; import org.junit.jupiter.api.BeforeEach; @@ -24,9 +23,9 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient; -import org.springframework.cloud.client.discovery.simple.reactive.SimpleReactiveDiscoveryProperties.SimpleServiceInstance; import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; @@ -36,11 +35,11 @@ */ public class SimpleReactiveDiscoveryClientTests { - private final SimpleServiceInstance service1Inst1 = new SimpleServiceInstance( - URI.create("http://host1:8080")); + private final DefaultServiceInstance service1Inst1 = new DefaultServiceInstance(null, + null, "host1", 8080, false); - private final SimpleServiceInstance service1Inst2 = new SimpleServiceInstance( - URI.create("https://host2:8443")); + private final DefaultServiceInstance service1Inst2 = new DefaultServiceInstance(null, + null, "host2", 8443, true); private SimpleReactiveDiscoveryClient client; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java index 93dc4eec0..5a0a4efb0 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java @@ -31,11 +31,11 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties; -import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties.SimpleServiceInstance; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.client.loadbalancer.LoadBalancerRequest; import org.springframework.context.annotation.Bean; @@ -69,9 +69,11 @@ public class LoadBalancerExchangeFilterFunctionTests { @Before public void before() { - SimpleServiceInstance instance = new SimpleServiceInstance(); + DefaultServiceInstance instance = new DefaultServiceInstance(null, null, null, 0, + false); instance.setServiceId("testservice"); - instance.setUri(URI.create("http://localhost:" + this.port)); + instance.setHost("localhost"); + instance.setPort(this.port); this.properties.getInstances().put("testservice", Arrays.asList(instance)); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java index a4189f58e..2e8f6e1b1 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.client.loadbalancer.reactive; -import java.net.URI; import java.util.Collections; import java.util.List; import java.util.Random; @@ -32,6 +31,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -67,9 +67,11 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { @BeforeEach void setUp() { - SimpleDiscoveryProperties.SimpleServiceInstance instance = new SimpleDiscoveryProperties.SimpleServiceInstance(); + DefaultServiceInstance instance = new DefaultServiceInstance(null, null, null, 0, + false); instance.setServiceId("testservice"); - instance.setUri(URI.create("http://localhost:" + this.port)); + instance.setHost("localhost"); + instance.setPort(this.port); this.properties.getInstances().put("testservice", Collections.singletonList(instance)); } From fe33e5d36c2190e5a8ecf8574a218735392babb2 Mon Sep 17 00:00:00 2001 From: Charumathi Covindane Date: Thu, 1 Oct 2020 15:02:35 -0700 Subject: [PATCH 2/4] Added URI to DefaultServiceInstance --- .../cloud/client/DefaultServiceInstance.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java index d069216bf..a40d353a6 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java @@ -37,10 +37,12 @@ public class DefaultServiceInstance implements ServiceInstance { private int port; - private final boolean secure; + private boolean secure; private final Map metadata; + private URI uri; + /** * @param instanceId the id of the instance. * @param serviceId the id of the service. @@ -161,6 +163,16 @@ public void setPort(int port) { this.port = port; } + public void setUri(URI uri) { + this.uri = uri; + this.host = this.uri.getHost(); + this.port = this.uri.getPort(); + String scheme = this.uri.getScheme(); + if ("https".equals(scheme)) { + this.secure = true; + } + } + @Override public String toString() { return "DefaultServiceInstance{" + "instanceId='" + this.instanceId + '\'' From 151551b0864ecb1fc0202387607b53cd162e4079 Mon Sep 17 00:00:00 2001 From: Charumathi Covindane Date: Thu, 1 Oct 2020 16:41:13 -0700 Subject: [PATCH 3/4] Added default constructor --- .../cloud/client/DefaultServiceInstance.java | 7 +++++-- .../blocking/client/BlockingLoadBalancerClientTests.java | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java index a40d353a6..c2f995427 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java @@ -37,9 +37,9 @@ public class DefaultServiceInstance implements ServiceInstance { private int port; - private boolean secure; + private boolean secure = false; - private final Map metadata; + private Map metadata = new LinkedHashMap<>(); private URI uri; @@ -100,6 +100,9 @@ public DefaultServiceInstance(String serviceId, String host, int port, this(serviceId, host, port, secure, new LinkedHashMap<>()); } + public DefaultServiceInstance() { + } + /** * Creates a URI from the given ServiceInstance's host:port. * @param instance the ServiceInstance. diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java index c5c8dd5f2..0a3c8db01 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java @@ -17,7 +17,6 @@ package org.springframework.cloud.loadbalancer.blocking.client; import java.io.IOException; -import java.net.URI; import java.util.Collections; import java.util.List; import java.util.Random; @@ -31,6 +30,7 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties; @@ -66,10 +66,10 @@ class BlockingLoadBalancerClientTests { @BeforeEach void setUp() { + DefaultServiceInstance serviceInstance = new DefaultServiceInstance(null, null, + "test.example", 9999, true); properties.getInstances().put("myservice", - Collections.singletonList( - new SimpleDiscoveryProperties.SimpleServiceInstance( - URI.create("https://test.example:9999")))); + Collections.singletonList(serviceInstance)); } @Test From c872fd7ef76b01e8e9a1e32c1748fa6a855fdefa Mon Sep 17 00:00:00 2001 From: Charumathi Covindane Date: Tue, 6 Oct 2020 22:28:01 -0700 Subject: [PATCH 4/4] Fixed PR Comments --- .../springframework/cloud/client/DefaultServiceInstance.java | 3 ++- .../cloud/client/discovery/simple/SimpleDiscoveryClient.java | 1 + .../simple/SimpleDiscoveryClientAutoConfiguration.java | 1 + .../client/discovery/simple/SimpleDiscoveryProperties.java | 3 +++ .../SimpleReactiveDiscoveryClientAutoConfiguration.java | 1 + .../simple/reactive/SimpleReactiveDiscoveryProperties.java | 4 ++-- .../client/discovery/simple/SimpleDiscoveryClientTests.java | 1 + .../simple/reactive/SimpleReactiveDiscoveryClientTests.java | 1 + .../reactive/LoadBalancerExchangeFilterFunctionTests.java | 4 ++-- .../ReactorLoadBalancerExchangeFilterFunctionTests.java | 4 ++-- .../blocking/client/BlockingLoadBalancerClientTests.java | 1 + 11 files changed, 17 insertions(+), 7 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java index c2f995427..c9b4111d4 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java @@ -26,6 +26,7 @@ * * @author Spencer Gibb * @author Tim Ysewyn + * @author Charu Covindane */ public class DefaultServiceInstance implements ServiceInstance { @@ -37,7 +38,7 @@ public class DefaultServiceInstance implements ServiceInstance { private int port; - private boolean secure = false; + private boolean secure; private Map metadata = new LinkedHashMap<>(); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java index d7b129304..5cf767d37 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java @@ -29,6 +29,7 @@ * * @author Biju Kunjummen * @author Olga Maciaszek-Sharma + * @author Charu Covindane */ public class SimpleDiscoveryClient implements DiscoveryClient { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java index b07a9e166..c6a2b58c7 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java @@ -35,6 +35,7 @@ * Spring Boot auto-configuration for simple properties-based discovery client. * * @author Biju Kunjummen + * @author Charu Covindane */ @Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class, diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java index e5cbfd7c7..0e15e6623 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java @@ -39,6 +39,7 @@ * @author Biju Kunjummen * @author Olga Maciaszek-Sharma * @author Tim Ysewyn + * @author Charu Covindane */ @ConfigurationProperties(prefix = "spring.cloud.discovery.client.simple") @@ -91,6 +92,8 @@ public void setInstance(String serviceId, String host, int port) { /** * Basic implementation of {@link ServiceInstance}. + * + * @deprecated in favor of {@link DefaultServiceInstance} */ @Deprecated public static class SimpleServiceInstance implements ServiceInstance { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java index bcb1b1347..96d693dd4 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java @@ -42,6 +42,7 @@ * Spring Boot auto-configuration for simple properties-based reactive discovery client. * * @author Tim Ysewyn + * @author Charu Covindane * @since 2.2.0 */ @Configuration(proxyBeanMethods = false) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java index 1aa0326d3..72527e8fc 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryProperties.java @@ -41,6 +41,7 @@ * {@link org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClient}. * * @author Tim Ysewyn + * @author Charu Covindane * @since 2.2.0 */ @ConfigurationProperties(prefix = "spring.cloud.discovery.client.simple") @@ -53,8 +54,7 @@ public class SimpleReactiveDiscoveryProperties { * properties explicitly if they are exporting data (e.g. metrics) that need to be * identified by the service instance. */ - private DefaultServiceInstance local = new DefaultServiceInstance(null, null, null, 0, - false); + private DefaultServiceInstance local = new DefaultServiceInstance(); private int order = DiscoveryClient.DEFAULT_ORDER; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java index bc23d7c3b..3859443c6 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java @@ -32,6 +32,7 @@ /** * @author Biju Kunjummen + * @author Charu Covindane */ public class SimpleDiscoveryClientTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java index 971c8668f..a842a41ec 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java @@ -32,6 +32,7 @@ /** * @author Tim Ysewyn + * @author Charu Covindane */ public class SimpleReactiveDiscoveryClientTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java index 5a0a4efb0..f91efa64e 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java @@ -53,6 +53,7 @@ /** * @author Spencer Gibb * @author Ryan Baxter + * @author Charu Covindane */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = RANDOM_PORT) @@ -69,8 +70,7 @@ public class LoadBalancerExchangeFilterFunctionTests { @Before public void before() { - DefaultServiceInstance instance = new DefaultServiceInstance(null, null, null, 0, - false); + DefaultServiceInstance instance = new DefaultServiceInstance(); instance.setServiceId("testservice"); instance.setHost("localhost"); instance.setPort(this.port); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java index 2e8f6e1b1..6abc35518 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java @@ -51,6 +51,7 @@ * Tests for {@link ReactorLoadBalancerExchangeFilterFunction}. * * @author Olga Maciaszek-Sharma + * @author Charu Covindane */ @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = RANDOM_PORT) @@ -67,8 +68,7 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { @BeforeEach void setUp() { - DefaultServiceInstance instance = new DefaultServiceInstance(null, null, null, 0, - false); + DefaultServiceInstance instance = new DefaultServiceInstance(); instance.setServiceId("testservice"); instance.setHost("localhost"); instance.setPort(this.port); diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java index 0a3c8db01..0c9a1a280 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java @@ -53,6 +53,7 @@ * Tests for {@link BlockingLoadBalancerClient}. * * @author Olga Maciaszek-Sharma + * @author Charu Covindane */ @SpringBootTest @ExtendWith(SpringExtension.class)