First version after introduction of meaningful ids and Identifiable interface.

[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 a203f93fe380e2d8d2ecc493ba4f2a4b89ed2dde..ea44601b72d1c6ca8d409c645b281bcf0d9c671d 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@ -83,7 +83,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
     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);
 
@@ -163,7 +163,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;
 
                     }
@@ -189,8 +189,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
 
     private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
         boolean allowed = true;
-        for (Filter filter : config.getRouterConfig().filterConfig().map()
-            .values()) {
+        for (Filter filter : config.getRouterConfig().filterConfig().values()) {
             if (!filter.isAllowed(aType, aEvent)) {
                 allowed = false;
             }
@@ -201,7 +200,7 @@ public class XMLRouter implements Gateway, DestinationRegistry {
     private List<String> determineDocumentTypes(DOMSource aEvent) {
         List<String> res = new ArrayList<String>();
         for (DocumentType type : config.getRouterConfig().documentTypeConfig()
-            .map().values()) {
+            .values()) {
             if (type.isInstance(aEvent)) {
                 res.add(type.getName());
             }
@@ -209,11 +208,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) + "'";
@@ -236,7 +230,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;
     }