now making sure that ids re prefixed by the config id.

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

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java
index c58ef8909f6e6db8ebc19bcdda4fea35b3ece394..b069215b102731099ee88f6a22384af64a5ac886 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java
@@ -15,12 +15,11 @@
  */
 package org.wamblee.xmlrouter.impl;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 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;
 
 /**
@@ -30,7 +29,7 @@ import org.wamblee.xmlrouter.config.Transformation;
  * @author Erik Brakkee
  */
 public class SingleRouterConfig implements ExtendedRouterConfig {
-    private AtomicLong sequenceNumbers;
+    private Id<RouterConfig> id;
     private ExtendedConfig<DocumentType> documentTypes;
     private ExtendedConfig<Transformation> transformations;
     private ExtendedConfig<Filter> filters;
@@ -41,29 +40,37 @@ public class SingleRouterConfig implements ExtendedRouterConfig {
      * @param aSequenceNumberGenerator
      *            Sequence number generator to use.
      */
-    public SingleRouterConfig(AtomicLong aSequenceNumberGenerator) {
-        sequenceNumbers = aSequenceNumberGenerator;
-        documentTypes = new ConfigImpl<DocumentType>(sequenceNumbers) {
+    public SingleRouterConfig(Id<RouterConfig> aId) {
+        id = aId;
+        documentTypes = new ConfigImpl<DocumentType>(new Id<Config>(
+            "documentTypes")) {
             @Override
-            public DocumentType wrap(Id<DocumentType> aId, DocumentType aT) {
-                return new RobustDocumentType(aId, aT);
+            public DocumentType wrap(String aPrefix, DocumentType aT) {
+                return new RobustDocumentType(aPrefix, aT);
             }
         };
-        transformations = new ConfigImpl<Transformation>(sequenceNumbers) {
+        transformations = new ConfigImpl<Transformation>(new Id<Config>(
+            "transformations")) {
             @Override
-            public Transformation wrap(Id<Transformation> aId,
+            public Transformation wrap(String aPrefix,
                 Transformation aTransformation) {
-                return new RobustTransformation(aId, aTransformation);
+                return new RobustTransformation(aPrefix, aTransformation);
             }
         };
-        filters = new ConfigImpl<Filter>(sequenceNumbers) {
+        filters = new ConfigImpl<Filter>(new Id<Config>("filters")) {
             @Override
-            public Filter wrap(Id<Filter> aId, Filter aFilter) {
-                return new RobustFilter(aId, aFilter);
+            public Filter wrap(String aPrefix, Filter aFilter) {
+                return new RobustFilter(aPrefix, aFilter);
             }
         };
     }
 
+    // TODO test getId.
+    @Override
+    public Id<RouterConfig> getId() {
+        return id;
+    }
+
     @Override
     public Config<DocumentType> documentTypeConfig() {
         return documentTypes;