X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FXMLRouter.java;h=9c0f2d4937e8ad5ff068da5d97aec56c09efabf5;hb=3b2c669b25bfcb5a3c3f06ff9180d85143bebb2a;hp=d74c93d09f20a99e09c57480952822c2a1ac4a4c;hpb=d96c59e2c9e5b15c4ce2023ac93d70b4c0ddf568;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 d74c93d..9c0f2d4 100644
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
 import javax.xml.transform.dom.DOMSource;
 
 import org.wamblee.general.Clock;
+import org.wamblee.general.Pair;
 import org.wamblee.xml.XMLDocument;
 import org.wamblee.xmlrouter.common.Id;
 import org.wamblee.xmlrouter.config.DocumentType;
@@ -56,19 +57,17 @@ public class XMLRouter implements Gateway, DestinationRegistry {
     private Clock clock;
     private AtomicLong nextEventId;
 
-    private ExtendedRouterConfig routerConfig;
-    private TransformationPaths transformations;
+    private XMLRouterConfiguration config;
 
     private Map<Id<Destination>, Destination> destinations;
 
-    public XMLRouter(Clock aClock, ExtendedRouterConfig aRouterConfig,
+    public XMLRouter(Clock aClock, XMLRouterConfiguration aConfig,
         EventListener aListener) {
         sequenceNumbers = new AtomicLong(1);
         listener = aListener;
         clock = aClock;
         nextEventId = new AtomicLong(clock.currentTimeMillis());
-        routerConfig = aRouterConfig;
-        transformations = new TransformationPaths();
+        config = aConfig;
         destinations = new LinkedHashMap<Id<Destination>, Destination>();
     }
 
@@ -76,28 +75,27 @@ public class XMLRouter implements Gateway, DestinationRegistry {
     public void publish(String aSource, DOMSource aEvent) {
         long time = clock.currentTimeMillis();
 
-        if (routerConfig.isDirty()) {
-            transformations.replaceTransformations(routerConfig
-                .transformationConfig().map());
-            routerConfig.resetDirty();
-        }
+        Pair<ExtendedRouterConfig, TransformationPaths> snapshotconfig = config
+            .getConfig();
 
-        Id<DOMSource> id = new Id<DOMSource>(nextEventId.getAndIncrement());
-        List<String> types = determineDocumentTypes(aEvent);
+        Id<DOMSource> id = new Id<DOMSource>(nextEventId.getAndIncrement() + "");
+        List<String> types = determineDocumentTypes(snapshotconfig.getFirst()
+            .documentTypeConfig().values(), aEvent);
         EventInfo info = new EventInfo(time, aSource, id, types, aEvent);
 
         boolean delivered = false;
         try {
 
             List<String> filteredInputTypes = determineFilteredInputTypes(
-                types, aEvent);
+                snapshotconfig.getFirst().filterConfig().values(), types,
+                aEvent);
             if (filteredInputTypes.isEmpty()) {
                 if (LOGGER.isLoggable(Level.FINE)) {
                     String doc = new XMLDocument(aEvent).print(true);
                     LOGGER
                         .log(
                             Level.FINE,
-                            "Event ''0}'' from source {1} removed because of filters.",
+                            "Event ''{0}'' from source ''{1}'' removed because of filters.",
                             new Object[] { doc, aSource });
                 }
             }
@@ -109,7 +107,9 @@ public class XMLRouter implements Gateway, DestinationRegistry {
             // This is however certainly not the main case.
 
             for (String inputType : filteredInputTypes) {
-                boolean result = deliverEvent(info, inputType);
+                boolean result = deliverEvent(snapshotconfig.getFirst()
+                    .filterConfig().values(), snapshotconfig.getSecond(), info,
+                    inputType);
                 delivered = delivered || result;
             }
         } finally {
@@ -120,11 +120,12 @@ public class XMLRouter implements Gateway, DestinationRegistry {
         }
     }
 
-    private boolean deliverEvent(EventInfo aInfo, String aInputType) {
+    private boolean deliverEvent(Collection<Filter> aFilters,
+        TransformationPaths aTransformations, EventInfo aInfo, String aInputType) {
 
         boolean delivered = false;
         Set<String> possibleTargetTypes = new HashSet<String>();
-        possibleTargetTypes.addAll(transformations
+        possibleTargetTypes.addAll(aTransformations
             .getPossibleTargetTypes(aInputType));
 
         // ask each destination what target types, if any they want to have.
@@ -137,7 +138,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
             if (!requested.isEmpty()) {
                 // Deliver to the destination.
                 for (String targetType : requested) {
-                    TransformationPath path = transformations.getPath(
+                    TransformationPath path = aTransformations.getPath(
                         aInputType, targetType);
                     List<Transformation> ts = path.getTransformations();
                     int i = 0;
@@ -152,7 +153,8 @@ public class XMLRouter implements Gateway, DestinationRegistry {
                                 aInfo.getEvent(), aInputType, t, orig);
                         }
 
-                        if (!isAllowedByFilters(t.getToType(), transformed)) {
+                        if (!isAllowedByFilters(aFilters, t.getToType(),
+                            transformed)) {
                             allowed = false;
                         }
                         i++;
@@ -162,7 +164,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
                         // allow the event.
                         boolean result = destination.receive(transformed);
                         listener.delivered(aInfo, ts, destinationId.getId(),
-                            destination.getName(), result);
+                            result);
                         delivered = delivered || result;
 
                     }
@@ -172,13 +174,13 @@ public class XMLRouter implements Gateway, DestinationRegistry {
         return delivered;
     }
 
-    private List<String> determineFilteredInputTypes(List<String> aTypes,
-        DOMSource aEvent) {
+    private List<String> determineFilteredInputTypes(
+        Collection<Filter> aFilters, List<String> aTypes, DOMSource aEvent) {
 
         // apply filters to the input
         List<String> filteredTypes = new ArrayList<String>();
         for (String type : aTypes) {
-            boolean allowed = isAllowedByFilters(type, aEvent);
+            boolean allowed = isAllowedByFilters(aFilters, type, aEvent);
             if (allowed) {
                 filteredTypes.add(type);
             }
@@ -186,9 +188,10 @@ public class XMLRouter implements Gateway, DestinationRegistry {
         return filteredTypes;
     }
 
-    private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
+    private boolean isAllowedByFilters(Collection<Filter> aFilters,
+        String aType, DOMSource aEvent) {
         boolean allowed = true;
-        for (Filter filter : routerConfig.filterConfig().map().values()) {
+        for (Filter filter : aFilters) {
             if (!filter.isAllowed(aType, aEvent)) {
                 allowed = false;
             }
@@ -196,10 +199,10 @@ public class XMLRouter implements Gateway, DestinationRegistry {
         return allowed;
     }
 
-    private List<String> determineDocumentTypes(DOMSource aEvent) {
+    private List<String> determineDocumentTypes(
+        Collection<DocumentType> aTypes, DOMSource aEvent) {
         List<String> res = new ArrayList<String>();
-        for (DocumentType type : routerConfig.documentTypeConfig().map()
-            .values()) {
+        for (DocumentType type : aTypes) {
             if (type.isInstance(aEvent)) {
                 res.add(type.getName());
             }
@@ -207,11 +210,6 @@ public class XMLRouter implements 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) + "'";
@@ -234,7 +232,7 @@ public class XMLRouter implements 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;
     }