You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/01/08 12:54:22 UTC
incubator-tamaya git commit: TAMAYA-133: Fixed quality issues.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 846842cb2 -> d623237a5
TAMAYA-133: Fixed quality issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/d623237a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/d623237a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/d623237a
Branch: refs/heads/master
Commit: d623237a5f887dba665cf192f412e81032392a59
Parents: 846842c
Author: anatole <an...@apache.org>
Authored: Fri Jan 8 12:54:17 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Fri Jan 8 12:54:17 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java | 1 -
.../main/java/org/apache/tamaya/etcd/EtcdPropertySource.java | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d623237a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
index cd4724a..dac5c94 100644
--- a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
+++ b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdAccessor.java
@@ -29,7 +29,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.SystemDefaultCredentialsProvider;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d623237a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
index 64e9c6d..b44d32e 100644
--- a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
+++ b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
@@ -93,8 +93,7 @@ public class EtcdPropertySource implements PropertySource{
// if so, the prefix part must be removed, so etcd can resolve without it
if(!key.startsWith(prefix)){
return null;
- }
- else{
+ } else{
key = key.substring(prefix.length());
}
Map<String,String> props = null;
@@ -156,8 +155,7 @@ public class EtcdPropertySource implements PropertySource{
for(Map.Entry<String,String> entry:props.entrySet()){
if(entry.getKey().startsWith("_")){
map.put("_" + prefix + entry.getKey().substring(1), entry.getValue());
- }
- else{
+ } else{
map.put(prefix+ entry.getKey(), entry.getValue());
}
}