equality based on the ids of the contents of SingleRouterConfig.

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

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
index 8fa78f4a18af15854b1c835dc4378daa44cee59d..2f4d45bae3a449e3118c50b8949a885b585a1071 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@ -31,10 +31,8 @@ import javax.xml.transform.dom.DOMSource;
 import org.wamblee.general.Clock;
 import org.wamblee.xml.XMLDocument;
 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;
 import org.wamblee.xmlrouter.listener.EventInfo;
 import org.wamblee.xmlrouter.listener.EventListener;
@@ -42,13 +40,15 @@ import org.wamblee.xmlrouter.publish.Gateway;
 import org.wamblee.xmlrouter.subscribe.Destination;
 import org.wamblee.xmlrouter.subscribe.DestinationRegistry;
 
+// TODO check intermediate types during transformation based on filters. 
+
 /**
  * The XML Router.
  * 
  * @author Erik Brakkee
  * 
  */
-public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
+public class XMLRouter implements Gateway, DestinationRegistry {
 
     private static final Logger LOGGER = Logger.getLogger(XMLRouter.class
         .getName());
@@ -58,47 +58,34 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
     private Clock clock;
     private AtomicLong nextEventId;
 
-    private ExtendedRouterConfig routerConfig;
-    private Transformations transformations;
+    private XMLRouterConfiguration config;
 
     private Map<Id<Destination>, Destination> destinations;
 
-    public XMLRouter(Clock aClock, EventListener aListener) {
+    public XMLRouter(Clock aClock, XMLRouterConfiguration aConfig,
+        EventListener aListener) {
         sequenceNumbers = new AtomicLong(1);
         listener = aListener;
         clock = aClock;
         nextEventId = new AtomicLong(clock.currentTimeMillis());
-        routerConfig = new SingleRouterConfig(sequenceNumbers);
-        transformations = new Transformations();
+        config = aConfig;
         destinations = new LinkedHashMap<Id<Destination>, Destination>();
     }
 
     @Override
-    public Config<DocumentType> documentTypeConfig() {
-        return routerConfig.documentTypeConfig();
-    }
-
-    @Override
-    public Config<Transformation> transformationConfig() {
-        return routerConfig.transformationConfig();
-    }
-
-    @Override
-    public Config<Filter> filterConfig() {
-        return routerConfig.filterConfig();
+    public void publish(String aSource, DOMSource aEvent) {
+        config.startPublishEvent();
+        try {
+            publishImpl(aSource, aEvent);
+        } finally {
+            config.endPublishEvent();
+        }
     }
 
-    @Override
-    public void publish(String aSource, DOMSource aEvent) {
+    private void publishImpl(String aSource, DOMSource aEvent) {
         long time = clock.currentTimeMillis();
 
-        if (routerConfig.isDirty()) {
-            transformations.replaceTransformations(routerConfig
-                .transformationConfig().map());
-            routerConfig.resetDirty();
-        }
-
-        Id<DOMSource> id = new Id<DOMSource>(nextEventId.getAndIncrement());
+        Id<DOMSource> id = new Id<DOMSource>(nextEventId.getAndIncrement() + "");
         List<String> types = determineDocumentTypes(aEvent);
         EventInfo info = new EventInfo(time, aSource, id, types, aEvent);
 
@@ -140,7 +127,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
         boolean delivered = false;
         Set<String> possibleTargetTypes = new HashSet<String>();
-        possibleTargetTypes.addAll(transformations
+        possibleTargetTypes.addAll(config.getTransformations()
             .getPossibleTargetTypes(aInputType));
 
         // ask each destination what target types, if any they want to have.
@@ -153,8 +140,8 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
             if (!requested.isEmpty()) {
                 // Deliver to the destination.
                 for (String targetType : requested) {
-                    TransformationPath path = transformations.getPath(
-                        aInputType, targetType);
+                    TransformationPath path = config.getTransformations()
+                        .getPath(aInputType, targetType);
                     List<Transformation> ts = path.getTransformations();
                     int i = 0;
                     boolean allowed = true;
@@ -178,7 +165,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
                         // allow the event.
                         boolean result = destination.receive(transformed);
                         listener.delivered(aInfo, ts, destinationId.getId(),
-                            destination.getName(), result);
+                            result);
                         delivered = delivered || result;
 
                     }
@@ -204,7 +191,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
     private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
         boolean allowed = true;
-        for (Filter filter : routerConfig.filterConfig().map().values()) {
+        for (Filter filter : config.getRouterConfig().filterConfig().values()) {
             if (!filter.isAllowed(aType, aEvent)) {
                 allowed = false;
             }
@@ -214,7 +201,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
     private List<String> determineDocumentTypes(DOMSource aEvent) {
         List<String> res = new ArrayList<String>();
-        for (DocumentType type : routerConfig.documentTypeConfig().map()
+        for (DocumentType type : config.getRouterConfig().documentTypeConfig()
             .values()) {
             if (type.isInstance(aEvent)) {
                 res.add(type.getName());
@@ -223,11 +210,6 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
         return res;
     }
 
-    private void logEvent(String aMessage, String aSource, DOMSource aEvent) {
-        LOGGER.log(Level.WARNING,
-            aMessage + ": " + eventToString(aSource, aEvent));
-    }
-
     private String eventToString(String aSource, DOMSource aEvent) {
         return "source '" + aSource + "': Event: '" +
             new XMLDocument(aEvent).print(true) + "'";
@@ -250,7 +232,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
     public Id<Destination> registerDestination(Destination aDestination) {
         notNull("destination", aDestination);
         long seqno = sequenceNumbers.getAndIncrement();
-        Id<Destination> id = new Id<Destination>(seqno);
+        Id<Destination> id = new Id<Destination>(seqno + "");
         destinations.put(id, new RobustDestination(id, aDestination));
         return id;
     }