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/02/18 00:43:16 UTC
[8/8] incubator-tamaya git commit: Redesigned mutable-config
component slightly.
Redesigned mutable-config component slightly.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/8fc95128
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/8fc95128
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/8fc95128
Branch: refs/heads/master
Commit: 8fc95128e4a625fe7777971847ea214365b137b2
Parents: a231ff0
Author: anatole <an...@apache.org>
Authored: Thu Feb 18 00:42:38 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Thu Feb 18 00:42:38 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/tamaya/etcd/EtcdPropertySource.java | 2 +-
.../tamaya/etcd/internal/EtcdConfigChangeRequest.java | 11 +++++------
.../tamaya/etcd/internal/MutableConfigSupport.java | 8 ++++----
3 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8fc95128/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 db3902b..bb52432 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
@@ -69,7 +69,7 @@ public class EtcdPropertySource implements PropertySource{
@Override
public PropertyValue get(String key) {
// check prefix, if key does not start with it, it is not part of our name space
- // if so, the prefix part must be removed, so etcd can resolve without it
+ // if so, the prefix part must be removedProperties, so etcd can resolve without it
if(!key.startsWith(prefix)){
return null;
} else{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8fc95128/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
index 06ef1df..edd140b 100644
--- a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
+++ b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/EtcdConfigChangeRequest.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.etcd.internal;
import org.apache.tamaya.etcd.EtcdAccessor;
import org.apache.tamaya.etcd.EtcdBackends;
-import org.apache.tamaya.mutableconfig.spi.AbstractConfigChangeRequest;
+import org.apache.tamaya.mutableconfig.spi.AbstractMutableConfigurationBackendSpiSpi;
import java.net.URI;
import java.util.Map;
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
* {@code changeRequest.set("myTimedKey?ttl=30", "myValue");} will set a key {@code myTimedKey} valid only for
* 30 seconds.
*/
-class EtcdConfigChangeRequest extends AbstractConfigChangeRequest{
+class EtcdConfigChangeRequest extends AbstractMutableConfigurationBackendSpiSpi {
private static final Logger LOG = Logger.getLogger(EtcdConfigChangeRequest.class.getName());
@@ -42,7 +42,7 @@ class EtcdConfigChangeRequest extends AbstractConfigChangeRequest{
}
@Override
- public boolean exists(String keyExpression) {
+ public boolean isExisting(String keyExpression) {
for(EtcdAccessor accessor: EtcdBackends.getEtcdBackends()){
try{
Map<String,String> props = accessor.get(keyExpression);
@@ -60,16 +60,15 @@ class EtcdConfigChangeRequest extends AbstractConfigChangeRequest{
@Override
protected void commitInternal() {
- checkClosed();
for(EtcdAccessor accessor: EtcdBackends.getEtcdBackends()){
try{
- for(String k:getRemoved()){
+ for(String k: getRemovedProperties()){
Map<String,String> res = accessor.delete(k);
if(res.get("_ERROR")!=null){
LOG.info("Failed to remove key from etcd: " + k);
}
}
- for(Map.Entry<String,String> en:getProperties().entrySet()){
+ for(Map.Entry<String,String> en:getAddedProperties().entrySet()){
String key = en.getKey();
Integer ttl = null;
int index = en.getKey().indexOf('?');
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8fc95128/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/MutableConfigSupport.java
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/MutableConfigSupport.java b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/MutableConfigSupport.java
index bfcd18c..eb445e3 100644
--- a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/MutableConfigSupport.java
+++ b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/internal/MutableConfigSupport.java
@@ -18,15 +18,15 @@
*/
package org.apache.tamaya.etcd.internal;
-import org.apache.tamaya.mutableconfig.ConfigChangeRequest;
-import org.apache.tamaya.mutableconfig.spi.ConfigChangeManagerSpi;
+import org.apache.tamaya.mutableconfig.spi.MutableConfigurationBackendSpi;
+import org.apache.tamaya.mutableconfig.spi.MutableConfigurationBackendProviderSpi;
import java.net.URI;
/**
* Created by atsticks on 15.01.16.
*/
-public class MutableConfigSupport implements ConfigChangeManagerSpi{
+public class MutableConfigSupport implements MutableConfigurationBackendProviderSpi {
private URI backendURI;
@@ -35,7 +35,7 @@ public class MutableConfigSupport implements ConfigChangeManagerSpi{
}
@Override
- public ConfigChangeRequest createChangeRequest(URI uri) {
+ public MutableConfigurationBackendSpi getBackend(URI uri) {
if(backendURI.equals(uri)) {
return new EtcdConfigChangeRequest(backendURI);
}