ObjectProvider for missing bean

Signed-off-by: Arjav <[email protected]>

Author: arjavdongaonkar

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/java/org/springframework/cloud/kubernetes/configserver/KubernetesConfigServerAutoConfiguration.java

@@ -21,9 +21,11 @@
 
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -57,22 +59,19 @@
 @EnableConfigurationProperties(KubernetesConfigServerProperties.class)
 public class KubernetesConfigServerAutoConfiguration {
 
-	@Configuration(proxyBeanMethods = false)
-	static class KubernetesFactoryConfig {
-
-		@Bean
-		public KubernetesEnvironmentRepositoryFactory kubernetesEnvironmentRepositoryFactory(
-			KubernetesEnvironmentRepository kubernetesEnvironmentRepository) {
-			return new KubernetesEnvironmentRepositoryFactory(kubernetesEnvironmentRepository);
-		}
+	@Bean
+	@ConditionalOnMissingBean
+	public KubernetesEnvironmentRepositoryFactory kubernetesEnvironmentRepositoryFactory(
+		ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider) {
+		return new KubernetesEnvironmentRepositoryFactory(kubernetesEnvironmentRepositoryProvider);
 	}
 
 	@Bean
 	@Profile("kubernetes")
+	@ConditionalOnMissingBean
 	public EnvironmentRepository kubernetesEnvironmentRepository(CoreV1Api coreV1Api,
 																 List<KubernetesPropertySourceSupplier> kubernetesPropertySourceSuppliers,
 																 KubernetesNamespaceProvider kubernetesNamespaceProvider) {
-		System.out.println("Creating KubernetesEnvironmentRepository bean...");
 		return new KubernetesEnvironmentRepository(coreV1Api, kubernetesPropertySourceSuppliers,
 			kubernetesNamespaceProvider.getNamespace());
 	}

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryFactory.java

@@ -1,20 +1,24 @@
 package org.springframework.cloud.kubernetes.configserver;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.cloud.config.server.environment.EnvironmentRepositoryFactory;
 import org.springframework.stereotype.Component;
 
+/**
+ * Factory class for creating instances of {@link KubernetesEnvironmentRepository}.
+ */
 @Component
 public class KubernetesEnvironmentRepositoryFactory
 	implements EnvironmentRepositoryFactory<KubernetesEnvironmentRepository, KubernetesConfigServerProperties> {
 
-	private final KubernetesEnvironmentRepository kubernetesEnvironmentRepository;
+	private final ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider;
 
-	public KubernetesEnvironmentRepositoryFactory(KubernetesEnvironmentRepository kubernetesEnvironmentRepository) {
-		this.kubernetesEnvironmentRepository = kubernetesEnvironmentRepository;
+	public KubernetesEnvironmentRepositoryFactory(ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider) {
+		this.kubernetesEnvironmentRepositoryProvider = kubernetesEnvironmentRepositoryProvider;
 	}
 
 	@Override
 	public KubernetesEnvironmentRepository build(KubernetesConfigServerProperties environmentProperties) {
-		return kubernetesEnvironmentRepository;
+		return kubernetesEnvironmentRepositoryProvider.getIfAvailable();
 	}
 }