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

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

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java
index cd1997299d5e631f055fbda2060e0a56f9000c99..a20da62d53f60ca6a6b36306b0177b7a41db29c1 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java
@@ -18,17 +18,10 @@ 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.ConfigException;
 import org.wamblee.xmlrouter.config.DocumentType;
 import org.wamblee.xmlrouter.config.Filter;
-import org.wamblee.xmlrouter.config.RouterConfig;
-import org.wamblee.xmlrouter.config.RouterConfigService;
 import org.wamblee.xmlrouter.config.Transformation;
 
-// TODO pass unique id of config service in the constructor to allow multiple instances with
-// unique ids (ServiceFactory) 
-
 /**
  * Router configuration service providing an atomic configuration API for the
  * XML router.
@@ -47,13 +40,13 @@ public class XMLRouterConfigService implements RouterConfigService {
         application = aApplication;
         sequence = new AtomicLong(1L);
         config = aConfig;
-        routerConfigs = new ConfigImpl<RouterConfig>(new Id<Config>(
-            aApplication)) {
-            public RouterConfig wrap(final String aPrefix, final RouterConfig aT) {
+        routerConfigs = new ConfigImpl<RouterConfig>(RouterConfig.class,
+            aApplication) {
+            public RouterConfig wrap(final RouterConfig aT) {
                 return new RouterConfig() {
                     @Override
                     public Id<RouterConfig> getId() {
-                        return new Id<RouterConfig>(aT.getId().toString());
+                        return aT.getId();
                     }
 
                     @Override
@@ -77,8 +70,7 @@ public class XMLRouterConfigService implements RouterConfigService {
 
     @Override
     public RouterConfig emptyConfig(String aId) {
-        return new SingleRouterConfig(new Id<RouterConfig>(application + "." +
-            aId));
+        return new SingleRouterConfig(application + "." + aId);
     }
 
     @Override