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

Support .yaml extension for FILES format.

Browse Source
This commit is contained in:
Spencer Gibb
2016-03-11 16:16:40 -07:00
parent 373072182a
commit c6e7db055e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulFilesPropertySource.java
View File

@@ -36,7 +36,7 @@ public class ConsulFilesPropertySource extends ConsulPropertySource {
}
public void init(GetValue value) {
if (this.getContext().endsWith(".yml")) {
if (this.getContext().endsWith(".yml") || this.getContext().endsWith(".yaml")) {
parseValue(value, YAML);
} else if (this.getContext().endsWith(".properties")) {
parseValue(value, PROPERTIES);

1
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocator.java
View File

@@ -75,6 +75,7 @@ public class ConsulPropertySourceLocator implements PropertySourceLocator {
suffixes.add("/");
} else {
suffixes.add(".yml");
suffixes.add(".yaml");
suffixes.add(".properties");
}

2
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java
View File

@@ -53,7 +53,7 @@ public class ConsulPropertySourceLocatorFilesTests {
public static final String ROOT = PREFIX + UUID.randomUUID();
public static final String APP_NAME = "testFilesFormat";
public static final String APPLICATION_YML = "/application.yml";
public static final String APPLICATION_DEV_YML = "/application-dev.yml";
public static final String APPLICATION_DEV_YML = "/application-dev.yaml";
public static final String APP_NAME_PROPS = "/"+APP_NAME+".properties";
public static final String APP_NAME_DEV_PROPS = "/"+APP_NAME+"-dev.properties";