diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java index 6209cc26..22396a03 100644 --- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java @@ -52,13 +52,7 @@ public class KubernetesApplicationContextInitializer implements @Override public void initialize(ConfigurableApplicationContext applicationContext) { - if(isKubernetesEnabled(applicationContext)){ - listenerSupplier.get().addKubernetesProfile(applicationContext.getEnvironment()); - } + listenerSupplier.get().addKubernetesProfile(applicationContext.getEnvironment()); } - private Boolean isKubernetesEnabled(ConfigurableApplicationContext applicationContext) { - return applicationContext.getEnvironment() - .getProperty("spring.cloud.kubernetes.enabled", Boolean.class, true); - } } diff --git a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializerTest.java b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializerTest.java deleted file mode 100644 index 306a48b4..00000000 --- a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializerTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.springframework.cloud.kubernetes.profile; - -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.function.Supplier; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.ConfigurableEnvironment; - -@RunWith(MockitoJUnitRunner.class) -public class KubernetesApplicationContextInitializerTest { - - @Mock - private Supplier listenerSupplier; - - @Mock - private ConfigurableApplicationContext applicationContext; - - @Mock - private ConfigurableEnvironment environment; - - @Mock - private KubernetesProfileApplicationListener listener; - - private KubernetesApplicationContextInitializer initializer; - - @Before - public void setUp() { - initializer = new KubernetesApplicationContextInitializer(listenerSupplier); - when(applicationContext.getEnvironment()).thenReturn(environment); - when(listenerSupplier.get()).thenReturn(listener); - } - - @Test - public void kubernetesDisabled() { - when(environment.getProperty("spring.cloud.kubernetes.enabled", Boolean.class, true)) - .thenReturn(false); - - initializer.initialize(applicationContext); - - verify(listenerSupplier, never()).get(); - } - - @Test - public void kubernetesEnabled() { - when(environment.getProperty("spring.cloud.kubernetes.enabled", Boolean.class, true)) - .thenReturn(true); - - initializer.initialize(applicationContext); - - verify(listenerSupplier).get(); - verify(listener).addKubernetesProfile(environment); - } -}