X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FXMLRouter.java;h=8fa78f4a18af15854b1c835dc4378daa44cee59d;hb=19413a6699295b4bbebc1b3bdb9838fd4370e581;hp=e166d75d74880926b86459ab60971862dec0d0e8;hpb=3994d4a35e7404908fc17beac75479c1a72fa915;p=xmlrouter

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 e166d75..8fa78f4 100644
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@ -17,108 +17,96 @@ 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;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 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;
 import org.wamblee.xmlrouter.publish.Gateway;
 import org.wamblee.xmlrouter.subscribe.Destination;
 import org.wamblee.xmlrouter.subscribe.DestinationRegistry;
 
-// TODO concurrency.
-
-public class XMLRouter implements Config, Gateway, DestinationRegistry {
+/**
+ * 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 AtomicInteger sequenceNumbers;
-    private Map<Integer, DocumentType> documentTypes;
+    private Clock clock;
+    private AtomicLong nextEventId;
+
+    private ExtendedRouterConfig routerConfig;
     private Transformations transformations;
-    private Map<Integer, Filter> filters;
-    private Map<Integer, Destination> destinations;
 
-    public XMLRouter(EventListener aListener) {
+    private Map<Id<Destination>, Destination> destinations;
+
+    public XMLRouter(Clock aClock, EventListener aListener) {
+        sequenceNumbers = new AtomicLong(1);
         listener = aListener;
-        sequenceNumbers = new AtomicInteger(1);
-        documentTypes = new LinkedHashMap<Integer, DocumentType>();
+        clock = aClock;
+        nextEventId = new AtomicLong(clock.currentTimeMillis());
+        routerConfig = new SingleRouterConfig(sequenceNumbers);
         transformations = new Transformations();
-        filters = new LinkedHashMap<Integer, Filter>();
-        destinations = new LinkedHashMap<Integer, Destination>();
-    }
-
-    @Override
-    public Id<DocumentType> addDocumentType(DocumentType aType) {
-        int seqno = sequenceNumbers.getAndIncrement();
-        documentTypes.put(seqno, aType);
-        return new Id<DocumentType>(seqno);
-    }
-
-    @Override
-    public void removeDocumentType(Id<DocumentType> aId) {
-        documentTypes.remove(aId);
-    }
-
-    @Override
-    public Collection<DocumentType> getDocumentTypes() {
-        return Collections.unmodifiableCollection(documentTypes.values());
+        destinations = new LinkedHashMap<Id<Destination>, Destination>();
     }
 
     @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<Transformation> getTransformations() {
-        return transformations.getTransformations();
+    public Config<Filter> filterConfig() {
+        return routerConfig.filterConfig();
     }
 
     @Override
-    public Id<Filter> addFilter(Filter aFilter) {
-        int seqno = sequenceNumbers.getAndIncrement();
-        filters.put(seqno, aFilter);
-        return new Id<Filter>(seqno);
-    }
+    public void publish(String aSource, DOMSource aEvent) {
+        long time = clock.currentTimeMillis();
 
-    @Override
-    public void removeFilter(Id<Filter> aId) {
-        filters.remove(aId);
-    }
-
-    @Override
-    public Collection<Filter> getFilters() {
-        return Collections.unmodifiableCollection(filters.values());
-    }
+        if (routerConfig.isDirty()) {
+            transformations.replaceTransformations(routerConfig
+                .transformationConfig().map());
+            routerConfig.resetDirty();
+        }
 
-    @Override
-    public boolean publish(String aSource, DOMSource aEvent) {
+        Id<DOMSource> id = new Id<DOMSource>(nextEventId.getAndIncrement());
+        List<String> types = determineDocumentTypes(aEvent);
+        EventInfo info = new EventInfo(time, aSource, id, types, aEvent);
 
         boolean delivered = false;
         try {
 
-            List<String> filteredInputTypes = determineFilteredInputTypes(aEvent);
+            List<String> filteredInputTypes = determineFilteredInputTypes(
+                types, aEvent);
             if (filteredInputTypes.isEmpty()) {
                 if (LOGGER.isLoggable(Level.FINE)) {
                     String doc = new XMLDocument(aEvent).print(true);
@@ -128,7 +116,6 @@ public class XMLRouter implements Config, Gateway, DestinationRegistry {
                             "Event ''0}'' from source {1} removed because of filters.",
                             new Object[] { doc, aSource });
                 }
-                return delivered;
             }
 
             // get the reachable target types through transformations.
@@ -138,19 +125,18 @@ public class XMLRouter implements Config, Gateway, DestinationRegistry {
             // This is however certainly not the main case.
 
             for (String inputType : filteredInputTypes) {
-                boolean result = deliverEvent(aSource, aEvent, inputType);
+                boolean result = deliverEvent(info, inputType);
                 delivered = delivered || result;
             }
         } finally {
             if (!delivered) {
                 destinationNotFound(aSource, aEvent);
+                listener.notDelivered(info);
             }
-            return delivered;
         }
     }
 
-    private boolean deliverEvent(String aSource, DOMSource aEvent,
-        String aInputType) {
+    private boolean deliverEvent(EventInfo aInfo, String aInputType) {
 
         boolean delivered = false;
         Set<String> possibleTargetTypes = new HashSet<String>();
@@ -158,7 +144,10 @@ public class XMLRouter implements Config, Gateway, DestinationRegistry {
             .getPossibleTargetTypes(aInputType));
 
         // ask each destination what target types, if any they want to have.
-        for (Destination destination : destinations.values()) {
+        for (Map.Entry<Id<Destination>, Destination> entry : destinations
+            .entrySet()) {
+            Id<Destination> destinationId = entry.getKey();
+            Destination destination = entry.getValue();
             Collection<String> requested = destination
                 .chooseFromTargetTypes(possibleTargetTypes);
             if (!requested.isEmpty()) {
@@ -169,14 +158,14 @@ public class XMLRouter implements Config, Gateway, DestinationRegistry {
                     List<Transformation> ts = path.getTransformations();
                     int i = 0;
                     boolean allowed = true;
-                    DOMSource transformed = aEvent;
+                    DOMSource transformed = aInfo.getEvent();
                     while (i < ts.size() && allowed && transformed != null) {
                         Transformation t = ts.get(i);
                         DOMSource orig = transformed;
                         transformed = t.transform(transformed);
                         if (transformed == null) {
-                            transformationReturnedNull(aSource, aEvent,
-                                aInputType, t, orig);
+                            transformationReturnedNull(aInfo.getSource(),
+                                aInfo.getEvent(), aInputType, t, orig);
                         }
 
                         if (!isAllowedByFilters(t.getToType(), transformed)) {
@@ -188,6 +177,8 @@ public class XMLRouter implements Config, Gateway, DestinationRegistry {
                         // all transformations done and all filters still
                         // allow the event.
                         boolean result = destination.receive(transformed);
+                        listener.delivered(aInfo, ts, destinationId.getId(),
+                            destination.getName(), result);
                         delivered = delivered || result;
 
                     }
@@ -197,11 +188,12 @@ public class XMLRouter implements Config, Gateway, DestinationRegistry {
         return delivered;
     }
 
-    private List<String> determineFilteredInputTypes(DOMSource aEvent) {
-        List<String> types = determineDocumentTypes(aEvent);
+    private List<String> determineFilteredInputTypes(List<String> aTypes,
+        DOMSource aEvent) {
+
         // apply filters to the input
         List<String> filteredTypes = new ArrayList<String>();
-        for (String type : types) {
+        for (String type : aTypes) {
             boolean allowed = isAllowedByFilters(type, aEvent);
             if (allowed) {
                 filteredTypes.add(type);
@@ -212,7 +204,7 @@ public class XMLRouter implements Config, 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;
             }
@@ -222,7 +214,8 @@ public class XMLRouter implements Config, 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());
             }
@@ -230,13 +223,6 @@ public class XMLRouter implements Config, 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));
@@ -263,15 +249,15 @@ public class XMLRouter implements Config, Gateway, DestinationRegistry {
     @Override
     public Id<Destination> registerDestination(Destination aDestination) {
         notNull("destination", aDestination);
-        int seqno = sequenceNumbers.getAndIncrement();
+        long seqno = sequenceNumbers.getAndIncrement();
         Id<Destination> id = new Id<Destination>(seqno);
-        destinations.put(seqno, new RobustDestination(id, aDestination));
+        destinations.put(id, new RobustDestination(id, aDestination));
         return id;
     }
 
     @Override
     public void unregisterDestination(Id<Destination> aId) {
-        destinations.remove(aId.getId());
+        destinations.remove(aId);
     }
 
     private void notNull(String aName, Object aValue) {