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=8fa78f4a18af15854b1c835dc4378daa44cee59d;hpb=19413a6699295b4bbebc1b3bdb9838fd4370e581;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 8fa78f4..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,12 +29,11 @@ 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.Config; import org.wamblee.xmlrouter.config.DocumentType; import org.wamblee.xmlrouter.config.Filter; -import org.wamblee.xmlrouter.config.RouterConfig; import org.wamblee.xmlrouter.config.Transformation; import org.wamblee.xmlrouter.listener.EventInfo; import org.wamblee.xmlrouter.listener.EventListener; @@ -48,7 +47,7 @@ import org.wamblee.xmlrouter.subscribe.DestinationRegistry; * @author Erik Brakkee * */ -public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { +public class XMLRouter implements Gateway, DestinationRegistry { private static final Logger LOGGER = Logger.getLogger(XMLRouter.class .getName()); @@ -58,62 +57,45 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { private Clock clock; private AtomicLong nextEventId; - private ExtendedRouterConfig routerConfig; - private Transformations transformations; + private XMLRouterConfiguration config; private Map, Destination> destinations; - public XMLRouter(Clock aClock, EventListener aListener) { + public XMLRouter(Clock aClock, XMLRouterConfiguration aConfig, + EventListener aListener) { sequenceNumbers = new AtomicLong(1); listener = aListener; clock = aClock; nextEventId = new AtomicLong(clock.currentTimeMillis()); - routerConfig = new SingleRouterConfig(sequenceNumbers); - transformations = new Transformations(); + config = aConfig; destinations = new LinkedHashMap, Destination>(); } - @Override - public Config documentTypeConfig() { - return routerConfig.documentTypeConfig(); - } - - @Override - public Config transformationConfig() { - return routerConfig.transformationConfig(); - } - - @Override - public Config filterConfig() { - return routerConfig.filterConfig(); - } - @Override public void publish(String aSource, DOMSource aEvent) { long time = clock.currentTimeMillis(); - if (routerConfig.isDirty()) { - transformations.replaceTransformations(routerConfig - .transformationConfig().map()); - routerConfig.resetDirty(); - } + Pair snapshotconfig = config + .getConfig(); - Id id = new Id(nextEventId.getAndIncrement()); - List types = determineDocumentTypes(aEvent); + Id id = new Id(nextEventId.getAndIncrement() + ""); + List types = determineDocumentTypes(snapshotconfig.getFirst() + .documentTypeConfig().values(), aEvent); EventInfo info = new EventInfo(time, aSource, id, types, aEvent); boolean delivered = false; try { List 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 }); } } @@ -125,7 +107,9 @@ public class XMLRouter implements RouterConfig, 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 { @@ -136,11 +120,12 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { } } - private boolean deliverEvent(EventInfo aInfo, String aInputType) { + private boolean deliverEvent(Collection aFilters, + TransformationPaths aTransformations, EventInfo aInfo, String aInputType) { boolean delivered = false; Set possibleTargetTypes = new HashSet(); - possibleTargetTypes.addAll(transformations + possibleTargetTypes.addAll(aTransformations .getPossibleTargetTypes(aInputType)); // ask each destination what target types, if any they want to have. @@ -153,7 +138,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { if (!requested.isEmpty()) { // Deliver to the destination. for (String targetType : requested) { - TransformationPath path = transformations.getPath( + TransformationPath path = aTransformations.getPath( aInputType, targetType); List ts = path.getTransformations(); int i = 0; @@ -168,7 +153,8 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { aInfo.getEvent(), aInputType, t, orig); } - if (!isAllowedByFilters(t.getToType(), transformed)) { + if (!isAllowedByFilters(aFilters, t.getToType(), + transformed)) { allowed = false; } i++; @@ -178,7 +164,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { // allow the event. boolean result = destination.receive(transformed); listener.delivered(aInfo, ts, destinationId.getId(), - destination.getName(), result); + result); delivered = delivered || result; } @@ -188,13 +174,13 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { return delivered; } - private List determineFilteredInputTypes(List aTypes, - DOMSource aEvent) { + private List determineFilteredInputTypes( + Collection aFilters, List aTypes, DOMSource aEvent) { // apply filters to the input List filteredTypes = new ArrayList(); for (String type : aTypes) { - boolean allowed = isAllowedByFilters(type, aEvent); + boolean allowed = isAllowedByFilters(aFilters, type, aEvent); if (allowed) { filteredTypes.add(type); } @@ -202,9 +188,10 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { return filteredTypes; } - private boolean isAllowedByFilters(String aType, DOMSource aEvent) { + private boolean isAllowedByFilters(Collection 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; } @@ -212,10 +199,10 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { return allowed; } - private List determineDocumentTypes(DOMSource aEvent) { + private List determineDocumentTypes( + Collection aTypes, DOMSource aEvent) { List res = new ArrayList(); - for (DocumentType type : routerConfig.documentTypeConfig().map() - .values()) { + for (DocumentType type : aTypes) { if (type.isInstance(aEvent)) { res.add(type.getName()); } @@ -223,11 +210,6 @@ public class XMLRouter implements RouterConfig, 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) + "'"; @@ -250,7 +232,7 @@ public class XMLRouter implements RouterConfig, Gateway, DestinationRegistry { public Id registerDestination(Destination aDestination) { notNull("destination", aDestination); long seqno = sequenceNumbers.getAndIncrement(); - Id id = new Id(seqno); + Id id = new Id(seqno + ""); destinations.put(id, new RobustDestination(id, aDestination)); return id; }