From d8d66d047c1c67168a7c24b778f8ab3c49060489 Mon Sep 17 00:00:00 2001 From: erabii Date: Mon, 20 Nov 2023 15:46:35 +0200 Subject: [PATCH] simplifications in kubernetes discovery auto-configurations (#1510) --- .../KubernetesDiscoveryClientBlockingAutoConfiguration.java | 3 ++- .../KubernetesDiscoveryClientReactiveAutoConfiguration.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java index 0a6089ca..79f607a1 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java @@ -48,13 +48,14 @@ import org.springframework.web.client.RestTemplate; class KubernetesDiscoveryClientBlockingAutoConfiguration { @Bean + @ConditionalOnMissingBean @ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient") - @ConditionalOnMissingBean(RestTemplate.class) RestTemplate restTemplate() { return new RestTemplateBuilder().build(); } @Bean + @ConditionalOnMissingBean @ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient") KubernetesDiscoveryClient kubernetesDiscoveryClient(RestTemplate restTemplate, KubernetesDiscoveryClientProperties properties) { diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java index d9140d51..4be0e1a8 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java @@ -46,14 +46,13 @@ import org.springframework.web.reactive.function.client.WebClient; class KubernetesDiscoveryClientReactiveAutoConfiguration { @Bean - @ConditionalOnClass(name = { "org.springframework.web.reactive.function.client.WebClient" }) - @ConditionalOnMissingBean(WebClient.Builder.class) + @ConditionalOnMissingBean WebClient.Builder webClientBuilder() { return WebClient.builder(); } @Bean - @ConditionalOnClass(name = { "org.springframework.web.reactive.function.client.WebClient" }) + @ConditionalOnMissingBean KubernetesReactiveDiscoveryClient kubernetesReactiveDiscoveryClient(WebClient.Builder webClientBuilder, KubernetesDiscoveryClientProperties properties) { return new KubernetesReactiveDiscoveryClient(webClientBuilder, properties);