Skip to content

Commit 5ebb157

Browse files
ryanjbaxterryanjbaxter
authored
Merge pull request #2128 from wind57/minor-cleanup-before-bug-fix
cleaner names and type
2 parents d73afab + a882ad4 commit 5ebb157

File tree

5 files changed

+28
-42
lines changed

5 files changed

+28
-42
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientDiscoveryClientUtils.endpointSubsetsPortData;
4949
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientDiscoveryClientUtils.postConstruct;
5050
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientDiscoveryClientUtils.serviceMetadata;
51-
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInstanceIdHostPodNameSupplier.externalName;
52-
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInstanceIdHostPodNameSupplier.nonExternalName;
53-
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientPodLabelsAndAnnotationsSupplier.nonExternalName;
51+
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInstanceIdHostPodNameSupplier.instanceIdHostPodNameSupplier;
52+
import static org.springframework.cloud.kubernetes.client.discovery.KubernetesClientPodLabelsAndAnnotationsSupplier.podLabelsAndAnnotationsSupplier;
5453
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.endpointsPort;
5554
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.externalNameServiceInstance;
5655
import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstance;
@@ -144,7 +143,8 @@ public List<ServiceInstance> getInstances(String serviceId) {
144143
Map<String, String> serviceInstanceMetadata = serviceInstanceMetadata(Map.of(), serviceMetadata,
145144
properties);
146145

147-
KubernetesClientInstanceIdHostPodNameSupplier supplierOne = externalName(service);
146+
KubernetesClientInstanceIdHostPodNameSupplier supplierOne = KubernetesClientInstanceIdHostPodNameSupplier
147+
.instanceIdHostPodNameSupplier(service);
148148
ServiceInstance externalNameServiceInstance = externalNameServiceInstance(serviceMetadata, supplierOne,
149149
serviceInstanceMetadata);
150150
serviceInstances.add(externalNameServiceInstance);
@@ -204,13 +204,14 @@ private List<ServiceInstance> serviceInstances(V1Service service) {
204204
List<V1EndpointAddress> addresses = addresses(endpointSubset, properties);
205205
for (V1EndpointAddress endpointAddress : addresses) {
206206

207-
KubernetesClientInstanceIdHostPodNameSupplier supplierOne = nonExternalName(endpointAddress,
208-
service);
209-
KubernetesClientPodLabelsAndAnnotationsSupplier supplierTwo = nonExternalName(coreV1Api,
210-
service.getMetadata().getNamespace());
207+
KubernetesClientInstanceIdHostPodNameSupplier instanceIdHostPodNameSupplier = instanceIdHostPodNameSupplier(
208+
endpointAddress, service);
209+
KubernetesClientPodLabelsAndAnnotationsSupplier podLabelsAndAnnotationsSupplier = podLabelsAndAnnotationsSupplier(
210+
coreV1Api, service.getMetadata().getNamespace());
211211

212212
ServiceInstance serviceInstance = serviceInstance(servicePortSecureResolver, k8sServiceMetadata,
213-
supplierOne, supplierTwo, portData, serviceInstanceMetadata, properties);
213+
instanceIdHostPodNameSupplier, podLabelsAndAnnotationsSupplier, portData,
214+
serviceInstanceMetadata, properties);
214215
instances.add(serviceInstance);
215216
}
216217
}

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,8 @@
2828
/**
2929
* @author wind57
3030
*/
31-
final class KubernetesClientInstanceIdHostPodNameSupplier implements Supplier<InstanceIdHostPodName> {
32-
33-
private final V1EndpointAddress endpointAddress;
34-
35-
private final V1Service service;
36-
37-
private KubernetesClientInstanceIdHostPodNameSupplier(V1EndpointAddress endpointAddress, V1Service service) {
38-
this.endpointAddress = endpointAddress;
39-
this.service = service;
40-
}
31+
record KubernetesClientInstanceIdHostPodNameSupplier(V1EndpointAddress endpointAddress,
32+
V1Service service) implements Supplier<InstanceIdHostPodName> {
4133

4234
@Override
4335
public InstanceIdHostPodName get() {
@@ -47,15 +39,15 @@ public InstanceIdHostPodName get() {
4739
/**
4840
* to be used when .spec.type of the Service is != 'ExternalName'.
4941
*/
50-
static KubernetesClientInstanceIdHostPodNameSupplier nonExternalName(V1EndpointAddress endpointAddress,
51-
V1Service service) {
42+
static KubernetesClientInstanceIdHostPodNameSupplier instanceIdHostPodNameSupplier(
43+
V1EndpointAddress endpointAddress, V1Service service) {
5244
return new KubernetesClientInstanceIdHostPodNameSupplier(endpointAddress, service);
5345
}
5446

5547
/**
5648
* to be used when .spec.type of the Service is == 'ExternalName'.
5749
*/
58-
static KubernetesClientInstanceIdHostPodNameSupplier externalName(V1Service service) {
50+
static KubernetesClientInstanceIdHostPodNameSupplier instanceIdHostPodNameSupplier(V1Service service) {
5951
return new KubernetesClientInstanceIdHostPodNameSupplier(null, service);
6052
}
6153

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,17 @@
3232
/**
3333
* @author wind57
3434
*/
35-
final class KubernetesClientPodLabelsAndAnnotationsSupplier implements Function<String, PodLabelsAndAnnotations> {
35+
record KubernetesClientPodLabelsAndAnnotationsSupplier(CoreV1Api coreV1Api,
36+
String namespace) implements Function<String, PodLabelsAndAnnotations> {
3637

3738
private static final LogAccessor LOG = new LogAccessor(
3839
LogFactory.getLog(KubernetesClientPodLabelsAndAnnotationsSupplier.class));
3940

40-
private final CoreV1Api coreV1Api;
41-
42-
private final String namespace;
43-
44-
private KubernetesClientPodLabelsAndAnnotationsSupplier(CoreV1Api coreV1Api, String namespace) {
45-
this.coreV1Api = coreV1Api;
46-
this.namespace = namespace;
47-
}
48-
4941
/**
5042
* to be used when .spec.type of the Service is != 'ExternalName'.
5143
*/
52-
static KubernetesClientPodLabelsAndAnnotationsSupplier nonExternalName(CoreV1Api coreV1Api, String namespace) {
44+
static KubernetesClientPodLabelsAndAnnotationsSupplier podLabelsAndAnnotationsSupplier(CoreV1Api coreV1Api,
45+
String namespace) {
5346
return new KubernetesClientPodLabelsAndAnnotationsSupplier(coreV1Api, namespace);
5447
}
5548

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void instanceIdNoEndpointAddress() {
4141
.build();
4242

4343
KubernetesClientInstanceIdHostPodNameSupplier supplier = KubernetesClientInstanceIdHostPodNameSupplier
44-
.externalName(service);
44+
.instanceIdHostPodNameSupplier(service);
4545
InstanceIdHostPodName result = supplier.get();
4646

4747
Assertions.assertThat(result).isNotNull();
@@ -58,7 +58,7 @@ void instanceIdWithEndpointAddress() {
5858
.build();
5959

6060
KubernetesClientInstanceIdHostPodNameSupplier supplier = KubernetesClientInstanceIdHostPodNameSupplier
61-
.nonExternalName(endpointAddress, service);
61+
.instanceIdHostPodNameSupplier(endpointAddress, service);
6262
InstanceIdHostPodName result = supplier.get();
6363

6464
Assertions.assertThat(result).isNotNull();
@@ -73,7 +73,7 @@ void hostNoEndpointAddress() {
7373
.build();
7474

7575
KubernetesClientInstanceIdHostPodNameSupplier supplier = KubernetesClientInstanceIdHostPodNameSupplier
76-
.externalName(service);
76+
.instanceIdHostPodNameSupplier(service);
7777
InstanceIdHostPodName result = supplier.get();
7878

7979
Assertions.assertThat(result).isNotNull();
@@ -89,7 +89,7 @@ void hostWithEndpointAddress() {
8989
.build();
9090

9191
KubernetesClientInstanceIdHostPodNameSupplier supplier = KubernetesClientInstanceIdHostPodNameSupplier
92-
.nonExternalName(endpointAddress, service);
92+
.instanceIdHostPodNameSupplier(endpointAddress, service);
9393
InstanceIdHostPodName result = supplier.get();
9494

9595
Assertions.assertThat(result).isNotNull();
@@ -102,7 +102,7 @@ void testPodNameIsNull() {
102102
.withSpec(new V1ServiceSpecBuilder().withExternalName("external-name").build())
103103
.build();
104104
KubernetesClientInstanceIdHostPodNameSupplier supplier = KubernetesClientInstanceIdHostPodNameSupplier
105-
.externalName(service);
105+
.instanceIdHostPodNameSupplier(service);
106106
InstanceIdHostPodName result = supplier.get();
107107

108108
Assertions.assertThat(result).isNotNull();
@@ -120,7 +120,7 @@ void podNameKindNotPod() {
120120
.build();
121121

122122
KubernetesClientInstanceIdHostPodNameSupplier supplier = KubernetesClientInstanceIdHostPodNameSupplier
123-
.nonExternalName(endpointAddress, service);
123+
.instanceIdHostPodNameSupplier(endpointAddress, service);
124124
InstanceIdHostPodName result = supplier.get();
125125

126126
Assertions.assertThat(result).isNotNull();
@@ -138,7 +138,7 @@ void podNameKindIsPod() {
138138
.build();
139139

140140
KubernetesClientInstanceIdHostPodNameSupplier supplier = KubernetesClientInstanceIdHostPodNameSupplier
141-
.nonExternalName(endpointAddress, service);
141+
.instanceIdHostPodNameSupplier(endpointAddress, service);
142142
InstanceIdHostPodName result = supplier.get();
143143

144144
Assertions.assertThat(result).isNotNull();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void noObjetMeta() throws Exception {
5555
when(coreV1Api.readNamespacedPod(POD_NAME, NAMESPACE)).thenReturn(request);
5656

5757
PodLabelsAndAnnotations result = KubernetesClientPodLabelsAndAnnotationsSupplier
58-
.nonExternalName(coreV1Api, NAMESPACE)
58+
.podLabelsAndAnnotationsSupplier(coreV1Api, NAMESPACE)
5959
.apply(POD_NAME);
6060
Assertions.assertThat(result).isNotNull();
6161
Assertions.assertThat(result.labels()).isEmpty();
@@ -75,7 +75,7 @@ void labelsAndAnnotationsPresent() throws Exception {
7575
when(coreV1Api.readNamespacedPod(POD_NAME, NAMESPACE)).thenReturn(request);
7676

7777
PodLabelsAndAnnotations result = KubernetesClientPodLabelsAndAnnotationsSupplier
78-
.nonExternalName(coreV1Api, NAMESPACE)
78+
.podLabelsAndAnnotationsSupplier(coreV1Api, NAMESPACE)
7979
.apply(POD_NAME);
8080
Assertions.assertThat(result).isNotNull();
8181
Assertions.assertThat(result.labels()).isEqualTo(Map.of("a", "b"));

0 commit comments

Comments
 (0)