From dcdc7c27dcb5ee768ac92b964e028bff02487434 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 7 Dec 2018 12:08:34 -0500 Subject: [PATCH] Updates property condition to spring.cloud.config.discovery.enabled --- ...ntConfigClientBootstrapConfiguration.java} | 9 +++--- ...figClientBootstrapConfigurationTests.java} | 31 +++++++++---------- 2 files changed, 18 insertions(+), 22 deletions(-) rename spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/{KubernetesDiscoveryClientBootstrapConfiguration.java => KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java} (76%) rename spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/{KubernetesDiscoveryAutoConfigurationTests.java => KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java} (88%) diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBootstrapConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java similarity index 76% rename from spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBootstrapConfiguration.java rename to spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java index 5c248d33..7207adb5 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java @@ -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 {} diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryAutoConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java similarity index 88% rename from spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryAutoConfigurationTests.java rename to spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java index 43cc80ca..c62dafb2 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java @@ -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; } }