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

Upgrade to consul-api version 1.1.11

Browse Source 
fixes gh-211
This commit is contained in:
Spencer Gibb
2016-08-26 15:36:52 -06:00
parent ca440e74d8
commit 9e87a782ce
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java
View File

@@ -91,7 +91,7 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
String key = getValue.getKey();
if (!StringUtils.endsWithIgnoreCase(key, "/")) {
key = key.replace(context, "").replace('/', '.');
String value = getDecoded(getValue.getValue());
String value = getValue.getDecodedValue();
properties.put(key, value);
}
}
@@ -118,7 +118,7 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
}
protected void parseValue(GetValue getValue, ConsulConfigProperties.Format format) {
String value = getDecoded(getValue.getValue());
String value = getValue.getDecodedValue();
Properties props = generateProperties(value, format);
for (Map.Entry entry : props.entrySet()) {
@@ -154,6 +154,10 @@ public class ConsulPropertySource extends EnumerablePropertySource<ConsulClient>
return props;
}
/**
* @deprecated As of 1.1.0 use {@link GetValue#getDecodedValue()}.
*/
@Deprecated
public String getDecoded(String value) {
if (value == null)
return null;

2
spring-cloud-consul-dependencies/pom.xml
View File

@@ -19,7 +19,7 @@
<spring-cloud-netflix.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-deployer.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-deployer.version>
<spring-cloud-stream.version>Brooklyn.BUILD-SNAPSHOT</spring-cloud-stream.version>
<consul-api.version>1.1.10</consul-api.version>
<consul-api.version>1.1.11</consul-api.version>
<gson.version>2.3.1</gson.version>
<httpclient.version>4.5</httpclient.version>
<httpcore.version>4.4.1</httpcore.version>