equality based on the ids of the contents of SingleRouterConfig.

[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 b0b02713017ed583b421b3f96e54c5015fc2bf4a..679e55df7baa6f4fe9c71066cc6fa37927c7076a 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java
@@ -15,8 +15,12 @@
  */
 package org.wamblee.xmlrouter.impl;
 
+import java.util.ArrayList;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.wamblee.xmlrouter.common.Id;
+import org.wamblee.xmlrouter.config.RouterConfig;
+
 /**
  * Implements the XML Router configuration interface including the required
  * locking.
@@ -33,20 +37,15 @@ public class XMLRouterConfigurationImpl implements XMLRouterConfiguration {
     private ExtendedRouterConfig config;
     private TransformationPaths transformations;
 
-    public XMLRouterConfigurationImpl(ExtendedRouterConfig aConfig,
-        TransformationPaths aTransformations) {
+    public XMLRouterConfigurationImpl(ExtendedRouterConfig aConfig) {
         config = aConfig;
-        transformations = aTransformations;
-    }
-
-    @Override
-    public void startConfigurationChange() {
-        wlock.lock();
+        transformations = new TransformationPaths(config.transformationConfig()
+            .values());
     }
 
-    @Override
-    public void endConfigurationChange() {
-        wlock.unlock();
+    public XMLRouterConfigurationImpl() {
+        this(new CompositeRouterConfig(new Id<RouterConfig>("routerconfig"),
+            new ArrayList<RouterConfig>()));
     }
 
     @Override
@@ -60,12 +59,27 @@ public class XMLRouterConfigurationImpl implements XMLRouterConfiguration {
     }
 
     @Override
-    public ExtendedRouterConfig routerConfig() {
+    public ExtendedRouterConfig getRouterConfig() {
         return config;
     }
 
     @Override
-    public TransformationPaths transformations() {
+    public void setRouterConfig(ExtendedRouterConfig aConfig) {
+
+        TransformationPaths newTransformations = new TransformationPaths(
+            aConfig.transformationConfig().values());
+
+        wlock.lock();
+        try {
+            config = aConfig;
+            transformations = newTransformations;
+        } finally {
+            wlock.unlock();
+        }
+    }
+
+    @Override
+    public TransformationPaths getTransformations() {
         return transformations;
     }
 }