Skip to content

Commit 944bbbf

Browse files
committed
minor simplification
Signed-off-by: wind57 <[email protected]>
1 parent faa2292 commit 944bbbf

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ else if (!discoveryProperties.namespaces().isEmpty()) {
8282
}
8383

8484
LOG.debug(() -> "found services : " + result);
85-
return Flux.defer(() -> Flux.just(result));
85+
return Flux.just(result);
8686
}
8787

8888
private void addMappedService(KubernetesServiceInstanceMapper<V1Service> mapper, List<ServiceInstance> services,

spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/reactive/KubernetesReactiveDiscoveryClient.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
2626
import org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesClientServicesFunction;
2727
import org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClient;
28-
import org.springframework.util.Assert;
28+
29+
import java.util.Objects;
2930

3031
/**
3132
* Kubernetes implementation of {@link ReactiveDiscoveryClient}. Currently relies on the
@@ -50,7 +51,7 @@ public String description() {
5051

5152
@Override
5253
public Flux<ServiceInstance> getInstances(String serviceId) {
53-
Assert.notNull(serviceId, "[Assertion failed] - the object argument must not be null");
54+
Objects.requireNonNull(serviceId, "serviceId must not be null");
5455
return Flux.defer(() -> Flux.fromIterable(kubernetesDiscoveryClient.getInstances(serviceId)))
5556
.subscribeOn(Schedulers.boundedElastic());
5657
}

spring-cloud-kubernetes-fabric8-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ else if (!discoveryProperties.namespaces().isEmpty()) {
101101
}
102102

103103
LOG.debug(() -> "found services : " + result);
104-
return Flux.defer(() -> Flux.just(result));
104+
return Flux.just(result);
105105
}
106106

107107
private void addMappedService(KubernetesServiceInstanceMapper<Service> mapper, List<ServiceInstance> services,

0 commit comments

Comments
 (0)