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

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

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java
index 08a95dececa394295164503153eca2c3606264a7..2b578bdf2c5a2208482b38f1c47aa2ddf3339e97 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java
@@ -18,28 +18,24 @@ package org.wamblee.xmlrouter.impl;
 import java.util.Collection;
 
 import org.wamblee.xmlrouter.common.Id;
-import org.wamblee.xmlrouter.config.Config;
 import org.wamblee.xmlrouter.config.DocumentType;
 import org.wamblee.xmlrouter.config.Filter;
-import org.wamblee.xmlrouter.config.RouterConfig;
 import org.wamblee.xmlrouter.config.Transformation;
 
-// TODO test this class.
 public class CompositeRouterConfig implements ExtendedRouterConfig {
 
-    private Id<RouterConfig> id;
+    private static final Id<RouterConfig> ID = new Id<RouterConfig>(
+        "compositerouterconfig");
     private CompositeConfig<DocumentType> documentTypes;
     private CompositeConfig<Transformation> transformations;
     private CompositeConfig<Filter> filters;
 
     public CompositeRouterConfig(Id<RouterConfig> aId,
         Collection<RouterConfig> aConfigs) {
-        id = aId;
-        documentTypes = new CompositeConfig<DocumentType>(new Id<Config>(
-            "documentTypes"));
-        transformations = new CompositeConfig<Transformation>(new Id<Config>(
-            "transformations"));
-        filters = new CompositeConfig<Filter>(new Id<Config>("filters"));
+        documentTypes = new CompositeConfig<DocumentType>(DocumentType.class);
+        transformations = new CompositeConfig<Transformation>(
+            Transformation.class);
+        filters = new CompositeConfig<Filter>(Filter.class);
         for (RouterConfig config : aConfigs) {
             documentTypes.addConfig(config.documentTypeConfig());
             transformations.addConfig(config.transformationConfig());
@@ -47,11 +43,9 @@ public class CompositeRouterConfig implements ExtendedRouterConfig {
         }
     }
 
-    // TODO test id.
-
     @Override
     public Id<RouterConfig> getId() {
-        return id;
+        return ID;
     }
 
     @Override