git://wamblee.org
/
xmlrouter
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 a203f93fe380e2d8d2ecc493ba4f2a4b89ed2dde..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;
import org.wamblee.xmlrouter.subscribe.Destination;
import org.wamblee.xmlrouter.subscribe.DestinationRegistry;
+// TODO check intermediate types during transformation based on filters.
+
/**
* The XML Router.
*
/**
* The XML Router.
*
@@
-83,7
+85,7
@@
public class XMLRouter implements Gateway, DestinationRegistry {
private void publishImpl(String aSource, DOMSource aEvent) {
long time = clock.currentTimeMillis();
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);
List<String> types = determineDocumentTypes(aEvent);
EventInfo info = new EventInfo(time, aSource, id, types, aEvent);
@@
-163,7
+165,7
@@
public class XMLRouter implements Gateway, DestinationRegistry {
// allow the event.
boolean result = destination.receive(transformed);
listener.delivered(aInfo, ts, destinationId.getId(),
// allow the event.
boolean result = destination.receive(transformed);
listener.delivered(aInfo, ts, destinationId.getId(),
-
destination.getName(),
result);
+ result);
delivered = delivered || result;
}
delivered = delivered || result;
}
@@
-189,8
+191,7
@@
public class XMLRouter implements Gateway, DestinationRegistry {
private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
boolean allowed = true;
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;
}
if (!filter.isAllowed(aType, aEvent)) {
allowed = false;
}
@@
-201,7
+202,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()
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());
}
if (type.isInstance(aEvent)) {
res.add(type.getName());
}
@@
-209,11
+210,6
@@
public class XMLRouter implements Gateway, DestinationRegistry {
return res;
}
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) + "'";
private String eventToString(String aSource, DOMSource aEvent) {
return "source '" + aSource + "': Event: '" +
new XMLDocument(aEvent).print(true) + "'";
@@
-236,7
+232,7
@@
public class XMLRouter implements Gateway, DestinationRegistry {
public Id<Destination> registerDestination(Destination aDestination) {
notNull("destination", aDestination);
long seqno = sequenceNumbers.getAndIncrement();
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;
}
destinations.put(id, new RobustDestination(id, aDestination));
return id;
}