From 3534e1601351b9def52a942e0767a64a87d545ec Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 18 May 2018 15:44:44 +0200 Subject: [PATCH] Adjust changes to existing convention. --- .../discovery/simple/SimpleDiscoveryClient.java | 2 +- .../simple/SimpleDiscoveryProperties.java | 6 +++--- .../CompositeDiscoveryClientOrderTest.java | 4 ++-- .../CompositeDiscoveryClientTests.java | 17 ++++++++--------- 4 files changed, 14 insertions(+), 15 deletions(-) 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 c81b7317..636de6e0 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 @@ -46,6 +46,6 @@ public class SimpleDiscoveryClient implements DiscoveryClient { @Override public int getOrder() { - return simpleDiscoveryProperties.getOrder(); + return this.simpleDiscoveryProperties.getOrder(); } } 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 0abe74ea..19898fd7 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 @@ -38,7 +38,7 @@ public class SimpleDiscoveryProperties { private int order = Ordered.LOWEST_PRECEDENCE; public Map> getInstances() { - return instances; + return this.instances; } public void setInstances(Map> instances) { @@ -46,11 +46,11 @@ public class SimpleDiscoveryProperties { } public SimpleServiceInstance getLocal() { - return local; + return this.local; } public int getOrder() { - return order; + return this.order; } public void setOrder(int order) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java index d30fcd33..24148fa8 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java @@ -32,7 +32,7 @@ public class CompositeDiscoveryClientOrderTest { @Test public void shouldGetOrderedDiscoveryClients() { // when: - List discoveryClients = ((CompositeDiscoveryClient) discoveryClient) + List discoveryClients = ((CompositeDiscoveryClient) this.discoveryClient) .getDiscoveryClients(); // then: @@ -47,7 +47,7 @@ public class CompositeDiscoveryClientOrderTest { @Test public void shouldOnlyReturnServiceInstancesForTheHighestPrecedenceDiscoveryClient() { // when: - List serviceInstances = discoveryClient + List serviceInstances = this.discoveryClient .getInstances(CUSTOM_SERVICE_ID); // then: diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java index 8eae5829..0d6330a1 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java @@ -35,11 +35,11 @@ public class CompositeDiscoveryClientTests { @Test public void getInstancesByServiceIdShouldDelegateCall() { - assertThat(discoveryClient).isInstanceOf(CompositeDiscoveryClient.class); + assertThat(this.discoveryClient).isInstanceOf(CompositeDiscoveryClient.class); - assertThat(discoveryClient.getInstances("service1")).hasSize(2); + assertThat(this.discoveryClient.getInstances("service1")).hasSize(2); - ServiceInstance s1 = discoveryClient.getInstances("service1").get(0); + ServiceInstance s1 = this.discoveryClient.getInstances("service1").get(0); assertThat(s1.getHost()).isEqualTo("s1-1"); assertThat(s1.getPort()).isEqualTo(8080); assertThat(s1.getUri()).isEqualTo(URI.create("http://s1-1:8080")); @@ -48,23 +48,22 @@ public class CompositeDiscoveryClientTests { @Test public void getServicesShouldAggregateAllServiceNames() { - assertThat(discoveryClient.getServices()).containsOnlyOnce("service1", "service2", - CUSTOM_SERVICE_ID); + assertThat(this.discoveryClient.getServices()).containsOnlyOnce("service1", "service2", "custom"); } @Test public void getDescriptionShouldBeComposite() { - assertThat(discoveryClient.description()).isEqualTo("Composite Discovery Client"); + assertThat(this.discoveryClient.description()).isEqualTo("Composite Discovery Client"); } @Test public void getInstancesShouldRespectOrder() { - assertThat(discoveryClient.getInstances(CUSTOM_SERVICE_ID)).hasSize(1); - assertThat(discoveryClient.getInstances(CUSTOM_SERVICE_ID)).hasSize(1); + assertThat(this.discoveryClient.getInstances(CUSTOM_SERVICE_ID)).hasSize(1); + assertThat(this.discoveryClient.getInstances(CUSTOM_SERVICE_ID)).hasSize(1); } @Test public void getInstancesByUnknownServiceIdShouldReturnAnEmptyList() { - assertThat(discoveryClient.getInstances("unknown")).hasSize(0); + assertThat(this.discoveryClient.getInstances("unknown")).hasSize(0); } }