Skip to content

Commit 764fb15

Browse files
committed
Bumping versions
1 parent 0e3a314 commit 764fb15

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,9 @@ public List<ServiceInstance> getInstances(String serviceId) {
150150
Map<String, String> metadata = new HashMap<>(svcMetadata);
151151
List<V1EndpointPort> endpointPorts = subset.getPorts();
152152
if (this.properties.getMetadata() != null && this.properties.getMetadata().isAddPorts()) {
153-
endpointPorts.forEach(p -> metadata.put(StringUtils.hasText(p.getName()) ? p.getName() : UNSET_PORT_NAME,
154-
Integer.toString(p.getPort())));
153+
endpointPorts.forEach(
154+
p -> metadata.put(StringUtils.hasText(p.getName()) ? p.getName() : UNSET_PORT_NAME,
155+
Integer.toString(p.getPort())));
155156
}
156157
List<V1EndpointAddress> addresses = subset.getAddresses();
157158
if (addresses == null) {

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ public class KubernetesInformerDiscoveryClientTests {
8080
.addSubsetsItem(new V1EndpointSubset().addAddressesItem(new V1EndpointAddress().ip("1.1.1.1")));
8181

8282
private static final V1Endpoints testEndpointWithUnsetPortName = new V1Endpoints()
83-
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
84-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(80))
85-
.addAddressesItem(new V1EndpointAddress().ip("1.1.1.1")));
83+
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
84+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(80))
85+
.addAddressesItem(new V1EndpointAddress().ip("1.1.1.1")));
8686

8787
private static final V1Endpoints testEndpointWithMultiplePorts = new V1Endpoints()
8888
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
@@ -116,12 +116,12 @@ public void testServiceWithUnsetPortNames() {
116116
when(kubernetesDiscoveryProperties.getMetadata()).thenReturn(new KubernetesDiscoveryProperties.Metadata());
117117

118118
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("",
119-
sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
119+
sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
120120

121121
Map<String, String> ports = new HashMap<>();
122122
ports.put("<unset>", "80");
123-
assertThat(discoveryClient.getInstances("test-svc-1").toArray()).containsOnly(new KubernetesServiceInstance("",
124-
"test-svc-1", "1.1.1.1", 80, ports, false, "namespace1", null));
123+
assertThat(discoveryClient.getInstances("test-svc-1").toArray()).containsOnly(
124+
new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 80, ports, false, "namespace1", null));
125125
}
126126

127127
@Test
@@ -303,7 +303,7 @@ public void instanceWithMultiplePortsAndPrimaryPortNameConfiguredWithLabelShould
303303
verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
304304
verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
305305
verify(kubernetesDiscoveryProperties, times(1)).isIncludeNotReadyAddresses();
306-
//Reset metadata
306+
// Reset metadata
307307
testService1.metadata(oldMetadata);
308308
}
309309

@@ -324,7 +324,7 @@ public void instanceWithMultiplePortsAndMisconfiguredPrimaryPortNameInLabelShoul
324324
"test-svc-1", "1.1.1.1", 80, new HashMap<>(), false, "namespace1", null));
325325
verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
326326
verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
327-
//Reset testService1 metadata
327+
// Reset testService1 metadata
328328
testService1.metadata(oldMetadata);
329329
}
330330

0 commit comments

Comments
 (0)