remove ObjectProvider

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,7 +21,6 @@
 
 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.ConditionalOnBean;
@@ -74,8 +73,8 @@ public KubernetesEnvironmentRepository kubernetesEnvironmentRepository(CoreV1Api
 	@ConditionalOnBean(KubernetesEnvironmentRepository.class)
 	@ConditionalOnMissingBean
 	public KubernetesEnvironmentRepositoryFactory kubernetesEnvironmentRepositoryFactory(
-			ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider) {
-		return new KubernetesEnvironmentRepositoryFactory(kubernetesEnvironmentRepositoryProvider);
+			KubernetesEnvironmentRepository kubernetesEnvironmentRepository) {
+		return new KubernetesEnvironmentRepositoryFactory(kubernetesEnvironmentRepository);
 	}
 
 	@Bean

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

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.kubernetes.configserver;
 
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.cloud.config.server.environment.EnvironmentRepositoryFactory;
 
 /**
@@ -27,16 +26,15 @@
 public class KubernetesEnvironmentRepositoryFactory
 		implements EnvironmentRepositoryFactory<KubernetesEnvironmentRepository, KubernetesConfigServerProperties> {
 
-	private final ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider;
+	private final KubernetesEnvironmentRepository kubernetesEnvironmentRepository;
 
-	public KubernetesEnvironmentRepositoryFactory(
-			ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider) {
-		this.kubernetesEnvironmentRepositoryProvider = kubernetesEnvironmentRepositoryProvider;
+	public KubernetesEnvironmentRepositoryFactory(KubernetesEnvironmentRepository kubernetesEnvironmentRepository) {
+		this.kubernetesEnvironmentRepository = kubernetesEnvironmentRepository;
 	}
 
 	@Override
 	public KubernetesEnvironmentRepository build(KubernetesConfigServerProperties environmentProperties) {
-		return kubernetesEnvironmentRepositoryProvider.getIfAvailable();
+		return kubernetesEnvironmentRepository;
 	}
 
 }

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/CompositeProfileWithGitAndKubernetesConfigSourcesTests.java

@@ -43,17 +43,10 @@ class CompositeProfileWithGitAndKubernetesConfigSourcesTests {
 	private ConfigurableApplicationContext context;
 
 	@Test
-	void kubernetesEnvironmentRepositoryIsLoaded() {
+	void runTest() {
 		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepository.class)).hasSize(2);
-	}
-
-	@Test
-	void kubernetesPropertySourceSuppliersAreLoaded() {
+		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepositoryFactory.class)).hasSize(1);
 		assertThat(context.getBeanNamesForType(KubernetesPropertySourceSupplier.class)).isNotEmpty();
-	}
-
-	@Test
-	void gitEnvironmentRepositoryIsLoaded() {
 		assertThat(context.getBeanNamesForType(JGitEnvironmentRepository.class)).hasSize(1);
 	}
 

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/CompositeProfileWithMultipleKubernetesConfigSourcesTests.java

@@ -43,12 +43,9 @@ class CompositeProfileWithMultipleKubernetesConfigSourcesTests {
 	private ConfigurableApplicationContext context;
 
 	@Test
-	void kubernetesEnvironmentRepositoriesAreLoaded() {
+	void runTest() {
 		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepository.class)).hasSize(3);
-	}
-
-	@Test
-	void kubernetesPropertySourceSuppliersAreLoaded() {
+		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepositoryFactory.class)).hasSize(1);
 		assertThat(context.getBeanNamesForType(KubernetesPropertySourceSupplier.class)).isNotEmpty();
 	}
 

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/CompositeProfileWithOnlyKubernetesConfigSourceTests.java

@@ -40,12 +40,9 @@ class CompositeProfileWithOnlyKubernetesConfigSourceTests {
 	private ConfigurableApplicationContext context;
 
 	@Test
-	void kubernetesEnvironmentRepositoryIsLoaded() {
+	void runTest() {
 		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepository.class)).hasSize(2);
-	}
-
-	@Test
-	void kubernetesPropertySourceSuppliersAreLoaded() {
+		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepositoryFactory.class)).hasSize(1);
 		assertThat(context.getBeanNamesForType(KubernetesPropertySourceSupplier.class)).isNotEmpty();
 	}
 

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabledTests.java

@@ -38,6 +38,7 @@ class ConfigServerAutoConfigurationKubernetesDisabledTests {
 	@Test
 	void runTest() {
 		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepository.class)).hasSize(0);
+		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepositoryFactory.class)).hasSize(0);
 	}
 
 }

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests.java

@@ -40,6 +40,7 @@ class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisa
 	void runTest() {
 		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepository.class)).hasSize(1);
 		assertThat(context.getBeanNamesForType(KubernetesPropertySourceSupplier.class)).hasSize(0);
+		assertThat(context.getBeanNamesForType(KubernetesEnvironmentRepositoryFactory.class)).hasSize(1);
 	}
 
 }

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryFactoryTests.java

@@ -18,7 +18,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.config.server.environment.EnvironmentRepository;
@@ -28,38 +27,38 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 @SpringJUnitConfig
 @SpringBootTest
 class KubernetesEnvironmentRepositoryFactoryTests {
 
 	@MockBean
-	private ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider;
+	private KubernetesEnvironmentRepository mockRepository;
 
 	@Test
 	void testBuild() {
-		KubernetesEnvironmentRepository mockRepository = mock(KubernetesEnvironmentRepository.class);
-		when(kubernetesEnvironmentRepositoryProvider.getIfAvailable()).thenReturn(mockRepository);
-
-		KubernetesEnvironmentRepositoryFactory factory = new KubernetesEnvironmentRepositoryFactory(
-				kubernetesEnvironmentRepositoryProvider);
+		KubernetesEnvironmentRepositoryFactory factory = new KubernetesEnvironmentRepositoryFactory(mockRepository);
 		KubernetesConfigServerProperties properties = new KubernetesConfigServerProperties();
 
 		EnvironmentRepository repository = factory.build(properties);
 
 		assertThat(repository).isNotNull();
 		assertThat(repository).isInstanceOf(KubernetesEnvironmentRepository.class);
-		assertThat(repository).isEqualTo(mockRepository);
+		assertThat(repository).isSameAs(mockRepository);
 	}
 
 	@Configuration
 	static class TestConfig {
 
+		@Bean
+		public KubernetesEnvironmentRepository kubernetesEnvironmentRepository() {
+			return mock(KubernetesEnvironmentRepository.class);
+		}
+
 		@Bean
 		public KubernetesEnvironmentRepositoryFactory kubernetesEnvironmentRepositoryFactory(
-				ObjectProvider<KubernetesEnvironmentRepository> kubernetesEnvironmentRepositoryProvider) {
-			return new KubernetesEnvironmentRepositoryFactory(kubernetesEnvironmentRepositoryProvider);
+				KubernetesEnvironmentRepository kubernetesEnvironmentRepository) {
+			return new KubernetesEnvironmentRepositoryFactory(kubernetesEnvironmentRepository);
 		}
 
 	}