refactoring of the config interface towards more reuse in the implementation and...

[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 e86593d274642c3a18500a899e4a9d4b78255103..99b36354f1fa30a21d057b8995793c8b9283dddc 100644 (file)
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@ -17,7 +17,6 @@ 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;
@@ -32,6 +31,7 @@ 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;
@@ -42,95 +42,61 @@ import org.wamblee.xmlrouter.publish.Gateway;
 import org.wamblee.xmlrouter.subscribe.Destination;
 import org.wamblee.xmlrouter.subscribe.DestinationRegistry;
 
-// TODO concurrency.
-
+/**
+ * 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 Clock clock;
     private AtomicLong nextEventId;
-    private AtomicLong sequenceNumbers;
-    private Map<Id<DocumentType>, DocumentType> documentTypes;
+
+    private Config<DocumentType> documentTypes;
     private Transformations transformations;
-    private Map<Id<Filter>, Filter> filters;
+    private Config<Filter> filters;
     private Map<Id<Destination>, Destination> destinations;
 
     public XMLRouter(Clock aClock, EventListener aListener) {
+        sequenceNumbers = new AtomicLong(1);
         listener = aListener;
         clock = aClock;
         nextEventId = new AtomicLong(clock.currentTimeMillis());
-        sequenceNumbers = new AtomicLong(1);
-        documentTypes = new LinkedHashMap<Id<DocumentType>, DocumentType>();
+        documentTypes = new ConfigImpl<DocumentType>() {
+            @Override
+            public DocumentType wrap(Id<DocumentType> aId, DocumentType aType) {
+                return new RobustDocumentType(aId, aType);
+            }
+        };
         transformations = new Transformations();
-        filters = new LinkedHashMap<Id<Filter>, Filter>();
+        filters = new ConfigImpl<Filter>() {
+            @Override
+            public Filter wrap(Id<Filter> aId, Filter aFilter) {
+                return new RobustFilter(aId, aFilter);
+            }
+        };
         destinations = new LinkedHashMap<Id<Destination>, Destination>();
     }
 
     @Override
-    public Id<DocumentType> addDocumentType(DocumentType aType) {
-        long seqno = sequenceNumbers.getAndIncrement();
-        documentTypes.put(new Id<DocumentType>(seqno), aType);
-        return new Id<DocumentType>(seqno);
-    }
-
-    @Override
-    public void removeDocumentType(Id<DocumentType> aId) {
-        documentTypes.remove(aId);
-    }
-
-    @Override
-    public Collection<Id<DocumentType>> getDocumentTypes() {
-        return Collections.unmodifiableCollection(documentTypes.keySet());
-    }
-
-    @Override
-    public DocumentType getDocumentType(Id<DocumentType> aId) {
-        return documentTypes.get(aId);
-    }
-
-    @Override
-    public Id<Transformation> addTransformation(Transformation aTransformation) {
-        return transformations.addTransformation(aTransformation);
-    }
-
-    @Override
-    public void removeTransformation(Id<Transformation> aId) {
-        transformations.removeTransformation(aId);
-    }
-
-    @Override
-    public Collection<Id<Transformation>> getTransformations() {
-        return transformations.getTransformations();
-    }
-
-    @Override
-    public Transformation getTransformation(Id<Transformation> aId) {
-        return transformations.getTransformation(aId);
-    }
-
-    @Override
-    public Id<Filter> addFilter(Filter aFilter) {
-        long seqno = sequenceNumbers.getAndIncrement();
-        filters.put(new Id<Filter>(seqno), aFilter);
-        return new Id<Filter>(seqno);
-    }
-
-    @Override
-    public void removeFilter(Id<Filter> aId) {
-        filters.remove(aId);
+    public Config<DocumentType> getDocumentTypeConfig() {
+        return documentTypes;
     }
 
     @Override
-    public Collection<Id<Filter>> getFilters() {
-        return Collections.unmodifiableCollection(filters.keySet());
+    public Config<Transformation> getTransformationConfig() {
+        return transformations.getTransformationConfig();
     }
 
     @Override
-    public Filter getFilter(Id<Filter> aId) {
-        return filters.get(aId);
+    public Config<Filter> getFilterConfig() {
+        return filters;
     }
 
     @Override
@@ -243,7 +209,8 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
     private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
         boolean allowed = true;
-        for (Filter filter : filters.values()) {
+        for (Id<Filter> id : filters.ids()) {
+            Filter filter = filters.get(id);
             if (!filter.isAllowed(aType, aEvent)) {
                 allowed = false;
             }
@@ -253,7 +220,8 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry {
 
     private List<String> determineDocumentTypes(DOMSource aEvent) {
         List<String> res = new ArrayList<String>();
-        for (DocumentType type : documentTypes.values()) {
+        for (Id<DocumentType> id : documentTypes.ids()) {
+            DocumentType type = documentTypes.get(id);
             if (type.isInstance(aEvent)) {
                 res.add(type.getName());
             }