Skip to content

Fabric8 Discovery client clean-up 2 #1214

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 1 commit into from
Feb 8, 2023
Merged

Fabric8 Discovery client clean-up 2 #1214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .../springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
import io.kubernetes.client.openapi.models.V1EndpointAddress;
import io.kubernetes.client.openapi.models.V1Endpoints;
import io.kubernetes.client.openapi.models.V1Service;
import jakarta.annotation.PostConstruct;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import org.springframework.beans.factory.InitializingBean;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
Expand All @@ -55,7 +55,7 @@
* @author Ryan Baxter
* @author Tim Yysewyn
*/
public class KubernetesInformerDiscoveryClient implements DiscoveryClient, InitializingBean {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would like to continue cleaning up some classes via small PRs, so that they are easy to review. This one does the obvious thing of replacing InitializingBean with @PostConstruct

public class KubernetesInformerDiscoveryClient implements DiscoveryClient {

private static final Log log = LogFactory.getLog(KubernetesInformerDiscoveryClient.class);

Expand Down Expand Up @@ -233,8 +233,8 @@ public List<String> getServices() {
.collect(Collectors.toList());
}

@Override
public void afterPropertiesSet() throws Exception {
@PostConstruct
public void afterPropertiesSet() {
this.sharedInformerFactory.startAllRegisteredInformers();
if (!Wait.poll(Duration.ofSeconds(1), Duration.ofSeconds(this.properties.cacheLoadingTimeoutSeconds()), () -> {
log.info("Waiting for the cache of informers to be fully loaded..");
Expand Down