From e4ab0f7b0dd2f972445b0d78b1390be24dc52ed7 Mon Sep 17 00:00:00 2001
From: Paolo <paolo@solidarchitectures.com>
Date: Mon, 27 Aug 2018 13:19:51 +0200
Subject: [PATCH] renaming kubernetes discovery properties parameter (#226)

---
 .../discovery/KubernetesDiscoveryClient.java  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java
index 671039b2..9bbe92ed 100644
--- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java
+++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java
@@ -47,7 +47,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
 	public KubernetesDiscoveryClient(KubernetesClient client,
 									 KubernetesDiscoveryProperties kubernetesDiscoveryProperties) {
 		this.client = client;
-		this.properties = properties;
+		this.properties = kubernetesDiscoveryProperties;
 	}
 
 	public KubernetesClient getClient() {
@@ -86,12 +86,12 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
 			List<EndpointSubset> subsets = endpoints.getSubsets();
 
 			if (subsets != null) {
-				for (EndpointSubset s : subsets) {
-					List<EndpointAddress> addresses = s.getAddresses();
-					for (EndpointAddress a : addresses) {
+				for (EndpointSubset subset : subsets) {
+					List<EndpointAddress> addresses = subset.getAddresses();
+					for (EndpointAddress address : addresses) {
 						return new KubernetesServiceInstance(serviceName,
-																	a,
-																	s.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
+																	address,
+																	subset.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
 																	labels,
 																	false);
 					}
@@ -120,12 +120,12 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
 		List<EndpointSubset> subsets = endpoints.get().getSubsets();
 		List<ServiceInstance> instances = new ArrayList<>();
 		if (subsets != null) {
-			for (EndpointSubset s : subsets) {
-				List<EndpointAddress> addresses = s.getAddresses();
-				for (EndpointAddress a : addresses) {
+			for (EndpointSubset subset : subsets) {
+				List<EndpointAddress> addresses = subset.getAddresses();
+				for (EndpointAddress address : addresses) {
 					instances.add(new KubernetesServiceInstance(serviceId,
-																a,
-																s.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
+																address,
+																subset.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
 																labels,
 																false));
 				}