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 637440fe4dc0b6e0f1ae4d87fda3676817978302..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
@@ -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.
  * 
@@ -83,14 +85,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
     private void publishImpl(String aSource, DOMSource aEvent) {
         long time = clock.currentTimeMillis();
 
-        // TODO dirty flag will become unnecessary in the future.
-        if (config.routerConfig().isDirty()) {
-            config.transformations().replaceTransformations(
-                config.routerConfig().transformationConfig().map());
-            config.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);
 
@@ -132,7 +127,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
 
         boolean delivered = false;
         Set<String> possibleTargetTypes = new HashSet<String>();
-        possibleTargetTypes.addAll(config.transformations()
+        possibleTargetTypes.addAll(config.getTransformations()
             .getPossibleTargetTypes(aInputType));
 
         // ask each destination what target types, if any they want to have.
@@ -145,8 +140,8 @@ public class XMLRouter implements Gateway, DestinationRegistry {
             if (!requested.isEmpty()) {
                 // Deliver to the destination.
                 for (String targetType : requested) {
-                    TransformationPath path = config.transformations().getPath(
-                        aInputType, targetType);
+                    TransformationPath path = config.getTransformations()
+                        .getPath(aInputType, targetType);
                     List<Transformation> ts = path.getTransformations();
                     int i = 0;
                     boolean allowed = true;
@@ -170,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;
 
                     }
@@ -196,8 +191,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
 
     private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
         boolean allowed = true;
-        for (Filter filter : config.routerConfig().filterConfig().map()
-            .values()) {
+        for (Filter filter : config.getRouterConfig().filterConfig().values()) {
             if (!filter.isAllowed(aType, aEvent)) {
                 allowed = false;
             }
@@ -207,8 +201,8 @@ public class XMLRouter implements Gateway, DestinationRegistry {
 
     private List<String> determineDocumentTypes(DOMSource aEvent) {
         List<String> res = new ArrayList<String>();
-        for (DocumentType type : config.routerConfig().documentTypeConfig()
-            .map().values()) {
+        for (DocumentType type : config.getRouterConfig().documentTypeConfig()
+            .values()) {
             if (type.isInstance(aEvent)) {
                 res.add(type.getName());
             }
@@ -216,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) + "'";
@@ -243,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;
     }