Now using RouterConfig internally inside the XML Router.

[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 e86593d274642c3a18500a899e4a9d4b78255103..8fa78f4a18af15854b1c835dc4378daa44cee59d 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@ -17,7 +17,6 @@ package org.wamblee.xmlrouter.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -32,6 +31,7 @@ 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;
@@ -42,101 +42,62 @@ import org.wamblee.xmlrouter.publish.Gateway;
 import org.wamblee.xmlrouter.subscribe.Destination;
 import org.wamblee.xmlrouter.subscribe.DestinationRegistry;
 
-// TODO concurrency.
-
+/**
+ * The XML Router.
+ * 
+ * @author Erik Brakkee
+ * 
+ */
 public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
     private static final Logger LOGGER = Logger.getLogger(XMLRouter.class
         .getName());
 
+    private AtomicLong sequenceNumbers;
     private EventListener listener;
     private Clock clock;
     private AtomicLong nextEventId;
-    private AtomicLong sequenceNumbers;
-    private Map<Id<DocumentType>, DocumentType> documentTypes;
+
+    private ExtendedRouterConfig routerConfig;
     private Transformations transformations;
-    private Map<Id<Filter>, Filter> filters;
+
     private Map<Id<Destination>, Destination> destinations;
 
     public XMLRouter(Clock aClock, EventListener aListener) {
+        sequenceNumbers = new AtomicLong(1);
         listener = aListener;
         clock = aClock;
         nextEventId = new AtomicLong(clock.currentTimeMillis());
-        sequenceNumbers = new AtomicLong(1);
-        documentTypes = new LinkedHashMap<Id<DocumentType>, DocumentType>();
+        routerConfig = new SingleRouterConfig(sequenceNumbers);
         transformations = new Transformations();
-        filters = new LinkedHashMap<Id<Filter>, Filter>();
         destinations = new LinkedHashMap<Id<Destination>, Destination>();
     }
 
     @Override
-    public Id<DocumentType> addDocumentType(DocumentType aType) {
-        long seqno = sequenceNumbers.getAndIncrement();
-        documentTypes.put(new Id<DocumentType>(seqno), aType);
-        return new Id<DocumentType>(seqno);
-    }
-
-    @Override
-    public void removeDocumentType(Id<DocumentType> aId) {
-        documentTypes.remove(aId);
-    }
-
-    @Override
-    public Collection<Id<DocumentType>> getDocumentTypes() {
-        return Collections.unmodifiableCollection(documentTypes.keySet());
-    }
-
-    @Override
-    public DocumentType getDocumentType(Id<DocumentType> aId) {
-        return documentTypes.get(aId);
-    }
-
-    @Override
-    public Id<Transformation> addTransformation(Transformation aTransformation) {
-        return transformations.addTransformation(aTransformation);
+    public Config<DocumentType> documentTypeConfig() {
+        return routerConfig.documentTypeConfig();
     }
 
     @Override
-    public void removeTransformation(Id<Transformation> aId) {
-        transformations.removeTransformation(aId);
+    public Config<Transformation> transformationConfig() {
+        return routerConfig.transformationConfig();
     }
 
     @Override
-    public Collection<Id<Transformation>> getTransformations() {
-        return transformations.getTransformations();
-    }
-
-    @Override
-    public Transformation getTransformation(Id<Transformation> aId) {
-        return transformations.getTransformation(aId);
-    }
-
-    @Override
-    public Id<Filter> addFilter(Filter aFilter) {
-        long seqno = sequenceNumbers.getAndIncrement();
-        filters.put(new Id<Filter>(seqno), aFilter);
-        return new Id<Filter>(seqno);
-    }
-
-    @Override
-    public void removeFilter(Id<Filter> aId) {
-        filters.remove(aId);
-    }
-
-    @Override
-    public Collection<Id<Filter>> getFilters() {
-        return Collections.unmodifiableCollection(filters.keySet());
-    }
-
-    @Override
-    public Filter getFilter(Id<Filter> aId) {
-        return filters.get(aId);
+    public Config<Filter> filterConfig() {
+        return routerConfig.filterConfig();
     }
 
     @Override
     public void publish(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());
         List<String> types = determineDocumentTypes(aEvent);
         EventInfo info = new EventInfo(time, aSource, id, types, aEvent);
@@ -243,7 +204,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
     private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
         boolean allowed = true;
-        for (Filter filter : filters.values()) {
+        for (Filter filter : routerConfig.filterConfig().map().values()) {
             if (!filter.isAllowed(aType, aEvent)) {
                 allowed = false;
             }
@@ -253,7 +214,8 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
     private List<String> determineDocumentTypes(DOMSource aEvent) {
         List<String> res = new ArrayList<String>();
-        for (DocumentType type : documentTypes.values()) {
+        for (DocumentType type : routerConfig.documentTypeConfig().map()
+            .values()) {
             if (type.isInstance(aEvent)) {
                 res.add(type.getName());
             }
@@ -261,13 +223,6 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
         return res;
     }
 
-    private void logEvent(String aMessage, String aSource, DOMSource aEvent,
-        Exception aException) {
-        LOGGER.log(Level.WARNING, aMessage + ": source '" + aSource +
-            "': Event: '" + new XMLDocument(aEvent).print(true) + "'",
-            aException);
-    }
-
     private void logEvent(String aMessage, String aSource, DOMSource aEvent) {
         LOGGER.log(Level.WARNING,
             aMessage + ": " + eventToString(aSource, aEvent));