Skip to content

Commit c069fa9

Browse files
wind57wind57
committed
fix
Signed-off-by: wind57 <[email protected]>
1 parent 0e2178c commit c069fa9

10 files changed

+87
-35
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
abstract class KubernetesClientBlockingAbstractInformerDiscoveryClient implements DiscoveryClient {
6161

6262
private static final LogAccessor LOG = new LogAccessor(
63-
LogFactory.getLog(KubernetesClientBlockingAbstractInformerDiscoveryClient.class));
63+
LogFactory.getLog(KubernetesClientBlockingAbstractInformerDiscoveryClient.class));
6464

6565
private final List<SharedInformerFactory> sharedInformerFactories;
6666

@@ -79,9 +79,9 @@ abstract class KubernetesClientBlockingAbstractInformerDiscoveryClient implement
7979
private final CoreV1Api coreV1Api;
8080

8181
KubernetesClientBlockingAbstractInformerDiscoveryClient(List<SharedInformerFactory> sharedInformerFactories,
82-
List<Lister<V1Service>> serviceListers, List<Lister<V1Endpoints>> endpointsListers,
83-
List<SharedInformer<V1Service>> serviceInformers, List<SharedInformer<V1Endpoints>> endpointsInformers,
84-
KubernetesDiscoveryProperties properties, CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
82+
List<Lister<V1Service>> serviceListers, List<Lister<V1Endpoints>> endpointsListers,
83+
List<SharedInformer<V1Service>> serviceInformers, List<SharedInformer<V1Endpoints>> endpointsInformers,
84+
KubernetesDiscoveryProperties properties, CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
8585
this.sharedInformerFactories = sharedInformerFactories;
8686
this.serviceListers = serviceListers;
8787
this.endpointsListers = endpointsListers;
@@ -143,11 +143,11 @@ public List<ServiceInstance> getInstances(String serviceId) {
143143
for (V1Service service : externalNameServices) {
144144
ServiceMetadata serviceMetadata = serviceMetadata(service);
145145
Map<String, String> serviceInstanceMetadata = serviceInstanceMetadata(Map.of(), serviceMetadata,
146-
properties);
146+
properties);
147147

148148
KubernetesClientInstanceIdHostPodNameSupplier supplierOne = externalName(service);
149149
ServiceInstance externalNameServiceInstance = externalNameServiceInstance(serviceMetadata, supplierOne,
150-
serviceInstanceMetadata);
150+
serviceInstanceMetadata);
151151
serviceInstances.add(externalNameServiceInstance);
152152
}
153153
}
@@ -185,7 +185,7 @@ private List<ServiceInstance> serviceInstances(V1Service service, String service
185185
ServiceMetadata serviceMetadata = serviceMetadata(service);
186186
Map<String, Integer> portsData = endpointSubsetsPortData(subsets);
187187
Map<String, String> serviceInstanceMetadata = serviceInstanceMetadata(portsData, serviceMetadata,
188-
properties);
188+
properties);
189189

190190
for (V1EndpointSubset endpointSubset : subsets) {
191191

@@ -196,12 +196,12 @@ private List<ServiceInstance> serviceInstances(V1Service service, String service
196196
for (V1EndpointAddress endpointAddress : addresses) {
197197

198198
KubernetesClientInstanceIdHostPodNameSupplier supplierOne = nonExternalName(endpointAddress,
199-
service);
199+
service);
200200
KubernetesClientPodLabelsAndAnnotationsSupplier supplierTwo = nonExternalName(coreV1Api,
201-
service.getMetadata().getNamespace());
201+
service.getMetadata().getNamespace());
202202

203203
ServiceInstance serviceInstance = serviceInstance(servicePortSecureResolver, serviceMetadata,
204-
supplierOne, supplierTwo, portData, serviceInstanceMetadata, properties);
204+
supplierOne, supplierTwo, portData, serviceInstanceMetadata, properties);
205205
instances.add(serviceInstance);
206206
}
207207
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
class KubernetesClientCacheableInformerDiscoveryClient extends KubernetesClientBlockingAbstractInformerDiscoveryClient {
3737

3838
KubernetesClientCacheableInformerDiscoveryClient(List<SharedInformerFactory> sharedInformerFactories,
39-
List<Lister<V1Service>> serviceListers, List<Lister<V1Endpoints>> endpointsListers,
40-
List<SharedInformer<V1Service>> serviceInformers, List<SharedInformer<V1Endpoints>> endpointsInformers,
41-
KubernetesDiscoveryProperties properties, CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
39+
List<Lister<V1Service>> serviceListers, List<Lister<V1Endpoints>> endpointsListers,
40+
List<SharedInformer<V1Service>> serviceInformers, List<SharedInformer<V1Endpoints>> endpointsInformers,
41+
KubernetesDiscoveryProperties properties, CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
4242
super(sharedInformerFactories, serviceListers, endpointsListers, serviceInformers, endpointsInformers,
43-
properties, coreV1Api, predicate);
43+
properties, coreV1Api, predicate);
4444
}
4545

4646
@Override

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import org.springframework.cloud.client.ServiceInstance;
2323

2424
class KubernetesClientCacheableInformerReactiveDiscoveryClient
25-
extends KubernetesClientReactiveAbstractInformerDiscoveryClient{
25+
extends KubernetesClientReactiveAbstractInformerDiscoveryClient {
2626

2727
KubernetesClientCacheableInformerReactiveDiscoveryClient(
28-
KubernetesClientInformerDiscoveryClient kubernetesDiscoveryClient) {
28+
KubernetesClientInformerDiscoveryClient kubernetesDiscoveryClient) {
2929
super(kubernetesDiscoveryClient);
3030
}
3131

@@ -45,4 +45,5 @@ public Flux<ServiceInstance> getInstances(String serviceId) {
4545
public String description() {
4646
return "Kubernetes Native Cacheable Reactive Discovery Client";
4747
}
48+
4849
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
3030

31-
3231
/**
3332
* @author Min Kim
3433
* @author Ryan Baxter
@@ -41,7 +40,7 @@ class KubernetesClientInformerDiscoveryClient extends KubernetesClientBlockingAb
4140
List<SharedInformer<V1Service>> serviceInformers, List<SharedInformer<V1Endpoints>> endpointsInformers,
4241
KubernetesDiscoveryProperties properties, CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
4342
super(sharedInformerFactories, serviceListers, endpointsListers, serviceInformers, endpointsInformers,
44-
properties, coreV1Api, predicate);
43+
properties, coreV1Api, predicate);
4544

4645
}
4746

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient(
7575
@ConditionalOnMissingBean
7676
@ConditionalOnDiscoveryCacheableBlockingEnabled
7777
KubernetesClientCacheableInformerDiscoveryClient kubernetesClientCacheableInformerDiscoveryClient(
78-
List<SharedInformerFactory> sharedInformerFactories, List<Lister<V1Service>> serviceListers,
79-
List<Lister<V1Endpoints>> endpointsListers, List<SharedInformer<V1Service>> serviceInformers,
80-
List<SharedInformer<V1Endpoints>> endpointsInformers, KubernetesDiscoveryProperties properties,
81-
CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
78+
List<SharedInformerFactory> sharedInformerFactories, List<Lister<V1Service>> serviceListers,
79+
List<Lister<V1Endpoints>> endpointsListers, List<SharedInformer<V1Service>> serviceInformers,
80+
List<SharedInformer<V1Endpoints>> endpointsInformers, KubernetesDiscoveryProperties properties,
81+
CoreV1Api coreV1Api, Predicate<V1Service> predicate) {
8282
return new KubernetesClientCacheableInformerDiscoveryClient(sharedInformerFactories, serviceListers,
83-
endpointsListers, serviceInformers, endpointsInformers, properties, coreV1Api, predicate);
83+
endpointsListers, serviceInformers, endpointsInformers, properties, coreV1Api, predicate);
8484
}
8585

8686
@Bean

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
/**
2020
* @author Ryan Baxter
2121
*/
22-
final class KubernetesClientInformerReactiveDiscoveryClient
22+
public final class KubernetesClientInformerReactiveDiscoveryClient
2323
extends KubernetesClientReactiveAbstractInformerDiscoveryClient {
2424

25-
KubernetesClientInformerReactiveDiscoveryClient(
25+
public KubernetesClientInformerReactiveDiscoveryClient(
2626
KubernetesClientInformerDiscoveryClient kubernetesDiscoveryClient) {
2727
super(kubernetesDiscoveryClient);
2828
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
4040
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
4141
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
42-
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnDiscoveryCacheableBlockingDisabled;
4342
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnDiscoveryCacheableReactiveDisabled;
4443
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnDiscoveryCacheableReactiveEnabled;
4544
import org.springframework.cloud.kubernetes.commons.discovery.conditionals.ConditionalOnSpringCloudKubernetesReactiveDiscovery;
@@ -90,7 +89,7 @@ KubernetesClientInformerReactiveDiscoveryClient kubernetesClientReactiveDiscover
9089
@ConditionalOnMissingBean
9190
@ConditionalOnDiscoveryCacheableReactiveEnabled
9291
KubernetesClientCacheableInformerReactiveDiscoveryClient kubernetesClientCacheableReactiveDiscoveryClient(
93-
KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient) {
92+
KubernetesClientInformerDiscoveryClient kubernetesClientInformerDiscoveryClient) {
9493
return new KubernetesClientCacheableInformerReactiveDiscoveryClient(kubernetesClientInformerDiscoveryClient);
9594
}
9695

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ abstract class KubernetesClientReactiveAbstractInformerDiscoveryClient implement
3131

3232
private final KubernetesClientInformerDiscoveryClient kubernetesDiscoveryClient;
3333

34-
public KubernetesClientReactiveAbstractInformerDiscoveryClient(
35-
KubernetesClientInformerDiscoveryClient kubernetesDiscoveryClient) {
34+
KubernetesClientReactiveAbstractInformerDiscoveryClient(
35+
KubernetesClientInformerDiscoveryClient kubernetesDiscoveryClient) {
3636
this.kubernetesDiscoveryClient = kubernetesDiscoveryClient;
3737
}
3838

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,59 @@ void reactiveDisabledWithSelectiveNamespaces() {
469469
});
470470
}
471471

472+
/**
473+
* <pre>
474+
* - no property related to cacheable in the blocking implementation is set, as such:
475+
* - KubernetesClientInformerDiscoveryClient is present
476+
* - KubernetesClientCacheableInformerDiscoveryClient is not present
477+
* </pre>
478+
*/
479+
@Test
480+
void blockingCacheableDefault() {
481+
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
482+
"spring.cloud.kubernetes.client.namespace=default");
483+
applicationContextRunner.run(context -> {
484+
assertThat(context).hasSingleBean(KubernetesClientInformerDiscoveryClient.class);
485+
assertThat(context).doesNotHaveBean(KubernetesClientCacheableInformerDiscoveryClient.class);
486+
});
487+
}
488+
489+
/**
490+
* <pre>
491+
* - cacheable in the blocking implementation = false, as such:
492+
* - KubernetesClientInformerDiscoveryClient is present
493+
* - KubernetesClientCacheableInformerDiscoveryClient is not present
494+
* </pre>
495+
*/
496+
@Test
497+
void blockingCacheableDisabled() {
498+
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
499+
"spring.cloud.kubernetes.discovery.cacheable.blocking.enabled=false",
500+
"spring.cloud.kubernetes.client.namespace=default");
501+
applicationContextRunner.run(context -> {
502+
assertThat(context).hasSingleBean(KubernetesClientInformerDiscoveryClient.class);
503+
assertThat(context).doesNotHaveBean(KubernetesClientCacheableInformerDiscoveryClient.class);
504+
});
505+
}
506+
507+
/**
508+
* <pre>
509+
* - cacheable in the blocking implementation = true, as such:
510+
* - KubernetesClientInformerDiscoveryClient is not present
511+
* - KubernetesClientCacheableInformerDiscoveryClient is present
512+
* </pre>
513+
*/
514+
@Test
515+
void blockingCacheableEnabled() {
516+
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
517+
"spring.cloud.kubernetes.discovery.cacheable.blocking.enabled=true",
518+
"spring.cloud.kubernetes.client.namespace=default");
519+
applicationContextRunner.run(context -> {
520+
assertThat(context).hasSingleBean(KubernetesClientInformerDiscoveryClient.class);
521+
assertThat(context).hasSingleBean(KubernetesClientCacheableInformerDiscoveryClient.class);
522+
});
523+
}
524+
472525
private void setup(String... properties) {
473526
applicationContextRunner = new ApplicationContextRunner()
474527
.withConfiguration(AutoConfigurations.of(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ void healthEnabledClassNotPresentWithSelectiveNamespaces() {
400400
@Test
401401
void reactiveCacheableDefault() {
402402
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
403-
"spring.cloud.kubernetes.client.namespace=default");
403+
"spring.cloud.kubernetes.client.namespace=default");
404404
applicationContextRunner.run(context -> {
405405
assertThat(context).hasSingleBean(KubernetesClientInformerReactiveDiscoveryClient.class);
406406
assertThat(context).doesNotHaveBean(KubernetesClientCacheableInformerReactiveDiscoveryClient.class);
@@ -417,8 +417,8 @@ void reactiveCacheableDefault() {
417417
@Test
418418
void reactiveCacheableDisabled() {
419419
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
420-
"spring.cloud.kubernetes.discovery.cacheable.reactive.enabled=false",
421-
"spring.cloud.kubernetes.client.namespace=default");
420+
"spring.cloud.kubernetes.discovery.cacheable.reactive.enabled=false",
421+
"spring.cloud.kubernetes.client.namespace=default");
422422
applicationContextRunner.run(context -> {
423423
assertThat(context).hasSingleBean(KubernetesClientInformerReactiveDiscoveryClient.class);
424424
assertThat(context).doesNotHaveBean(KubernetesClientCacheableInformerReactiveDiscoveryClient.class);
@@ -435,9 +435,9 @@ void reactiveCacheableDisabled() {
435435
@Test
436436
void reactiveCacheableEnabled() {
437437
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
438-
"spring.cloud.kubernetes.discovery.cacheable.reactive.enabled=true",
439-
"spring.cloud.discovery.client.health-indicator.enabled=false",
440-
"spring.cloud.kubernetes.client.namespace=default");
438+
"spring.cloud.kubernetes.discovery.cacheable.reactive.enabled=true",
439+
"spring.cloud.discovery.client.health-indicator.enabled=false",
440+
"spring.cloud.kubernetes.client.namespace=default");
441441
applicationContextRunner.run(context -> {
442442
assertThat(context).doesNotHaveBean(KubernetesClientInformerReactiveDiscoveryClient.class);
443443
assertThat(context).hasSingleBean(KubernetesClientCacheableInformerReactiveDiscoveryClient.class);

0 commit comments

Comments
 (0)