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

Updates property condition to spring.cloud.config.discovery.enabled

Browse Source
This commit is contained in:
Spencer Gibb
2018-12-07 12:08:34 -05:00
parent 0483187eac
commit dcdc7c27dc
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBootstrapConfiguration.java → spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java
View File

@@ -22,8 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@Configuration
@ConditionalOnProperty(value = "spring.cloud.kubernetes.discovery.enabled",
matchIfMissing = false)
@Import({KubernetesDiscoveryClientAutoConfiguration.class,
KubernetesAutoConfiguration.class})
public class KubernetesDiscoveryClientBootstrapConfiguration {}
@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled")
@Import({KubernetesAutoConfiguration.class,
KubernetesDiscoveryClientAutoConfiguration.class, })
public class KubernetesDiscoveryClientConfigClientBootstrapConfiguration {}

31
spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryAutoConfigurationTests.java → spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java
View File

@@ -16,16 +16,11 @@
*/
package org.springframework.cloud.kubernetes.discovery;
import static junit.framework.TestCase.assertEquals;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import java.util.Collections;
import java.util.Arrays;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.cloud.client.DefaultServiceInstance;
@@ -35,17 +30,20 @@ import org.springframework.cloud.commons.util.UtilAutoConfiguration;
import org.springframework.cloud.config.client.ConfigClientProperties;
import org.springframework.cloud.config.client.DiscoveryClientConfigServiceBootstrapConfiguration;
import org.springframework.cloud.kubernetes.KubernetesAutoConfiguration;
import org.springframework.cloud.test.ClassPathExclusions;
import org.springframework.cloud.test.ModifiedClassPathRunner;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import static junit.framework.TestCase.assertEquals;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* @author Zhanwei Wang
*/
@RunWith(ModifiedClassPathRunner.class)
public class KubernetesDiscoveryAutoConfigurationTests {
public class KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests {
private AnnotationConfigApplicationContext context;
@After
@@ -80,7 +78,7 @@ public class KubernetesDiscoveryAutoConfigurationTests {
TestPropertyValues.of(env).applyTo(parent);
parent.register(UtilAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, EnvironmentKnobbler.class,
KubernetesDiscoveryClientBootstrapConfiguration.class,
KubernetesDiscoveryClientConfigClientBootstrapConfiguration.class,
DiscoveryClientConfigServiceBootstrapConfiguration.class,
ConfigClientProperties.class);
parent.refresh();
@@ -96,13 +94,12 @@ public class KubernetesDiscoveryAutoConfigurationTests {
protected static class EnvironmentKnobbler {
@Bean
public DiscoveryClient kubernetesDiscoveryClient(
KubernetesDiscoveryProperties properties) {
public KubernetesDiscoveryClient kubernetesDiscoveryClient() {
KubernetesDiscoveryClient client = mock(KubernetesDiscoveryClient.class);
ServiceInstance instance = new DefaultServiceInstance("configserver",
"fake", 8888, false);
ServiceInstance instance = new DefaultServiceInstance("configserver1",
"configserver", "fake", 8888, false);
given(client.getInstances("configserver"))
.willReturn(Arrays.asList(instance));
.willReturn(Collections.singletonList(instance));
return client;
}
}