SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant check

Browse Source
This commit is contained in:
Georgios Andrianakis
2018-06-15 23:16:11 +03:00
committed by Ioannis Canellos
parent 00d96a7cdc
commit 5205ebb3d3
2 changed files with 1 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java
View File

@@ -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);
}
}

60
spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializerTest.java
View File

@@ -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<KubernetesProfileApplicationListener> 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);
}
}