From 0d49c9a12e74670c5bcf2c66622c12e577cff71d Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 4 Apr 2016 11:51:04 -0600 Subject: [PATCH] Change default config server id to lowercase. All caps is a holdover from eureka, but eureka query is case insensitive. This helps case sensitive service registries like consul and zookeeper. --- .../cloud/config/client/ConfigClientProperties.java | 2 +- ...entConfigServiceBootstrapConfigurationTests.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java index 548b658f..689a39be 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java @@ -217,7 +217,7 @@ public class ConfigClientProperties { } public static class Discovery { - public static final String DEFAULT_CONFIG_SERVER = "CONFIGSERVER"; + public static final String DEFAULT_CONFIG_SERVER = "configserver"; /** * Flag to indicate that config server discovery is enabled (config server URL will be diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java index 5b61394c..6bf966df 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java @@ -31,6 +31,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import static org.junit.Assert.assertEquals; import static org.mockito.BDDMockito.given; +import static org.springframework.cloud.config.client.ConfigClientProperties.Discovery.DEFAULT_CONFIG_SERVER; /** * @author Dave Syer @@ -61,12 +62,12 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests { @Test public void onWhenRequested() throws Exception { - given(this.client.getInstances("CONFIGSERVER")) + given(this.client.getInstances(DEFAULT_CONFIG_SERVER)) .willReturn(Arrays.asList(this.info)); setup("spring.cloud.config.discovery.enabled=true"); assertEquals(1, this.context.getBeanNamesForType( DiscoveryClientConfigServiceBootstrapConfiguration.class).length); - Mockito.verify(this.client).getInstances("CONFIGSERVER"); + Mockito.verify(this.client).getInstances(DEFAULT_CONFIG_SERVER); ConfigClientProperties locator = this.context .getBean(ConfigClientProperties.class); assertEquals("http://foo:8877/", locator.getRawUri()); @@ -75,12 +76,12 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests { @Test public void secureWhenRequested() throws Exception { this.info = new DefaultServiceInstance("app", "foo", 443, true); - given(this.client.getInstances("CONFIGSERVER")) + given(this.client.getInstances(DEFAULT_CONFIG_SERVER)) .willReturn(Arrays.asList(this.info)); setup("spring.cloud.config.discovery.enabled=true"); assertEquals(1, this.context.getBeanNamesForType( DiscoveryClientConfigServiceBootstrapConfiguration.class).length); - Mockito.verify(this.client).getInstances("CONFIGSERVER"); + Mockito.verify(this.client).getInstances(DEFAULT_CONFIG_SERVER); ConfigClientProperties locator = this.context .getBean(ConfigClientProperties.class); assertEquals("https://foo:443/", locator.getRawUri()); @@ -89,7 +90,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests { @Test public void setsPasssword() throws Exception { this.info.getMetadata().put("password", "bar"); - given(this.client.getInstances("CONFIGSERVER")) + given(this.client.getInstances(DEFAULT_CONFIG_SERVER)) .willReturn(Arrays.asList(this.info)); setup("spring.cloud.config.discovery.enabled=true"); ConfigClientProperties locator = this.context @@ -102,7 +103,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests { @Test public void setsPath() throws Exception { this.info.getMetadata().put("configPath", "/bar"); - given(this.client.getInstances("CONFIGSERVER")) + given(this.client.getInstances(DEFAULT_CONFIG_SERVER)) .willReturn(Arrays.asList(this.info)); setup("spring.cloud.config.discovery.enabled=true"); ConfigClientProperties locator = this.context