Config no longer implements Identifiable because this was in violation of the contrac...

[xmlrouter] / impl / src / main / java / org / wamblee / xmlrouter / impl / XMLRouterConfigurationImpl.java

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
index fe6d50773e7f4d9c5399f5b7abfe9b5d2e38a19e..7c570ff23baaa723c4e0c105919f24751c19702c 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
@@ -18,7 +18,8 @@ package org.wamblee.xmlrouter.impl;
 import java.util.ArrayList;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.wamblee.xmlrouter.config.RouterConfig;
+import org.wamblee.general.Pair;
+import org.wamblee.xmlrouter.common.Id;
 
 /**
  * Implements the XML Router configuration interface including the required
@@ -39,33 +40,30 @@ public class XMLRouterConfigurationImpl implements XMLRouterConfiguration {
     public XMLRouterConfigurationImpl(ExtendedRouterConfig aConfig) {
         config = aConfig;
         transformations = new TransformationPaths(config.transformationConfig()
-            .map());
+            .values());
     }
 
     public XMLRouterConfigurationImpl() {
-        this(new CompositeRouterConfig(new ArrayList<RouterConfig>()));
+        this(new CompositeRouterConfig(new Id<RouterConfig>("routerconfig"),
+            new ArrayList<RouterConfig>()));
     }
 
     @Override
-    public void startPublishEvent() {
+    public Pair<ExtendedRouterConfig, TransformationPaths> getConfig() {
         rlock.lock();
-    }
-
-    @Override
-    public void endPublishEvent() {
-        rlock.unlock();
-    }
-
-    @Override
-    public ExtendedRouterConfig getRouterConfig() {
-        return config;
+        try {
+            return new Pair<ExtendedRouterConfig, TransformationPaths>(config,
+                transformations);
+        } finally {
+            rlock.unlock();
+        }
     }
 
     @Override
     public void setRouterConfig(ExtendedRouterConfig aConfig) {
 
         TransformationPaths newTransformations = new TransformationPaths(
-            aConfig.transformationConfig().map());
+            aConfig.transformationConfig().values());
 
         wlock.lock();
         try {
@@ -75,9 +73,4 @@ public class XMLRouterConfigurationImpl implements XMLRouterConfiguration {
             wlock.unlock();
         }
     }
-
-    @Override
-    public TransformationPaths getTransformations() {
-        return transformations;
-    }
 }