From 764fb15831bff2d430e9dcf0d45ff6018ea13dc3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 14 Oct 2022 15:17:48 +0000 Subject: [PATCH] Bumping versions --- .../KubernetesInformerDiscoveryClient.java | 5 +++-- .../KubernetesInformerDiscoveryClientTests.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java index cbb762d6..9f14c458 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java @@ -150,8 +150,9 @@ public class KubernetesInformerDiscoveryClient implements DiscoveryClient, Initi Map metadata = new HashMap<>(svcMetadata); List endpointPorts = subset.getPorts(); if (this.properties.getMetadata() != null && this.properties.getMetadata().isAddPorts()) { - endpointPorts.forEach(p -> metadata.put(StringUtils.hasText(p.getName()) ? p.getName() : UNSET_PORT_NAME, - Integer.toString(p.getPort()))); + endpointPorts.forEach( + p -> metadata.put(StringUtils.hasText(p.getName()) ? p.getName() : UNSET_PORT_NAME, + Integer.toString(p.getPort()))); } List addresses = subset.getAddresses(); if (addresses == null) { diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java index d6f465c9..18a1e4ab 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java @@ -80,9 +80,9 @@ public class KubernetesInformerDiscoveryClientTests { .addSubsetsItem(new V1EndpointSubset().addAddressesItem(new V1EndpointAddress().ip("1.1.1.1"))); private static final V1Endpoints testEndpointWithUnsetPortName = new V1Endpoints() - .metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1")) - .addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(80)) - .addAddressesItem(new V1EndpointAddress().ip("1.1.1.1"))); + .metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1")) + .addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(80)) + .addAddressesItem(new V1EndpointAddress().ip("1.1.1.1"))); private static final V1Endpoints testEndpointWithMultiplePorts = new V1Endpoints() .metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1")) @@ -116,12 +116,12 @@ public class KubernetesInformerDiscoveryClientTests { when(kubernetesDiscoveryProperties.getMetadata()).thenReturn(new KubernetesDiscoveryProperties.Metadata()); KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("", - sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties); + sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties); Map ports = new HashMap<>(); ports.put("", "80"); - assertThat(discoveryClient.getInstances("test-svc-1").toArray()).containsOnly(new KubernetesServiceInstance("", - "test-svc-1", "1.1.1.1", 80, ports, false, "namespace1", null)); + assertThat(discoveryClient.getInstances("test-svc-1").toArray()).containsOnly( + new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 80, ports, false, "namespace1", null)); } @Test @@ -303,7 +303,7 @@ public class KubernetesInformerDiscoveryClientTests { verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces(); verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName(); verify(kubernetesDiscoveryProperties, times(1)).isIncludeNotReadyAddresses(); - //Reset metadata + // Reset metadata testService1.metadata(oldMetadata); } @@ -324,7 +324,7 @@ public class KubernetesInformerDiscoveryClientTests { "test-svc-1", "1.1.1.1", 80, new HashMap<>(), false, "namespace1", null)); verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces(); verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName(); - //Reset testService1 metadata + // Reset testService1 metadata testService1.metadata(oldMetadata); }