Skip to content

do not use Flux::defer when there is no need #1977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 18, 2025
Merged

do not use Flux::defer when there is no need #1977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
944bbbf
minor simplification
wind57 Aug 18, 2025
5b904c4
checkstyle
wind57 Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...gframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ else if (!discoveryProperties.namespaces().isEmpty()) {
}

LOG.debug(() -> "found services : " + result);
return Flux.defer(() -> Flux.just(result));
return Flux.just(result);
Copy link
Contributor Author

@wind57 wind57 Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since result is already a computed List<ServiceInstance>, there is no need to defer

}

private void addMappedService(KubernetesServiceInstanceMapper<V1Service> mapper, List<ServiceInstance> services,
Expand Down
5 changes: 3 additions & 2 deletions ...mework/cloud/kubernetes/fabric8/discovery/reactive/KubernetesReactiveDiscoveryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.cloud.kubernetes.fabric8.discovery.reactive;

import java.util.Objects;

import io.fabric8.kubernetes.client.KubernetesClient;
import reactor.core.publisher.Flux;
import reactor.core.scheduler.Schedulers;
Expand All @@ -25,7 +27,6 @@
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
import org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesClientServicesFunction;
import org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClient;
import org.springframework.util.Assert;

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

@Override
public Flux<ServiceInstance> getInstances(String serviceId) {
Assert.notNull(serviceId, "[Assertion failed] - the object argument must not be null");
Objects.requireNonNull(serviceId, "serviceId must not be null");
return Flux.defer(() -> Flux.fromIterable(kubernetesDiscoveryClient.getInstances(serviceId)))
.subscribeOn(Schedulers.boundedElastic());
}
Expand Down
2 changes: 1 addition & 1 deletion ...rg/springframework/cloud/kubernetes/fabric8/loadbalancer/Fabric8ServicesListSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ else if (!discoveryProperties.namespaces().isEmpty()) {
}

LOG.debug(() -> "found services : " + result);
return Flux.defer(() -> Flux.just(result));
return Flux.just(result);
Copy link
Contributor Author

@wind57 wind57 Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, no need to defer

}

private void addMappedService(KubernetesServiceInstanceMapper<Service> mapper, List<ServiceInstance> services,
Expand Down
Loading