X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FXMLRouter.java;h=2f4d45bae3a449e3118c50b8949a885b585a1071;hb=f8027d76e1c3e517a8b80a3476f51adee845fc5b;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..2f4d45b 100644
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@ -40,6 +40,8 @@ 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.
  * 
@@ -56,33 +58,34 @@ 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>();
     }
 
     @Override
     public void publish(String aSource, DOMSource aEvent) {
-        long time = clock.currentTimeMillis();
-
-        if (routerConfig.isDirty()) {
-            transformations.replaceTransformations(routerConfig
-                .transformationConfig().map());
-            routerConfig.resetDirty();
+        config.startPublishEvent();
+        try {
+            publishImpl(aSource, aEvent);
+        } finally {
+            config.endPublishEvent();
         }
+    }
+
+    private void publishImpl(String aSource, DOMSource aEvent) {
+        long time = clock.currentTimeMillis();
 
-        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);
 
@@ -124,7 +127,7 @@ public class XMLRouter implements 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.
@@ -137,8 +140,8 @@ public class XMLRouter implements 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;
@@ -162,7 +165,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;
 
                     }
@@ -188,7 +191,7 @@ public class XMLRouter implements 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;
             }
@@ -198,7 +201,7 @@ public class XMLRouter implements 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());
@@ -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;
     }