git://wamblee.org
/
xmlrouter
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turned the API packages into bundles.
[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..9c0f2d4937e8ad5ff068da5d97aec56c09efabf5 100644
(file)
--- a/
impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
+++ b/
impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouter.java
@@
-29,6
+29,7
@@
import java.util.logging.Logger;
import javax.xml.transform.dom.DOMSource;
import org.wamblee.general.Clock;
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.DocumentType;
import org.wamblee.xml.XMLDocument;
import org.wamblee.xmlrouter.common.Id;
import org.wamblee.xmlrouter.config.DocumentType;
@@
-72,40
+73,29
@@
public class XMLRouter implements Gateway, DestinationRegistry {
@Override
public void publish(String aSource, DOMSource aEvent) {
@Override
public void publish(String aSource, DOMSource aEvent) {
- config.startPublishEvent();
- try {
- publishImpl(aSource, aEvent);
- } finally {
- config.endPublishEvent();
- }
- }
-
- private void publishImpl(String aSource, DOMSource aEvent) {
long time = clock.currentTimeMillis();
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();
- }
+ Pair<ExtendedRouterConfig, TransformationPaths> snapshotconfig = config
+ .getConfig();
- Id<DOMSource> id = new Id<DOMSource>(nextEventId.getAndIncrement());
- List<String> types = determineDocumentTypes(aEvent);
+ Id<DOMSource> id = new Id<DOMSource>(nextEventId.getAndIncrement() + "");
+ List<String> types = determineDocumentTypes(snapshotconfig.getFirst()
+ .documentTypeConfig().values(), aEvent);
EventInfo info = new EventInfo(time, aSource, id, types, aEvent);
boolean delivered = false;
try {
List<String> filteredInputTypes = determineFilteredInputTypes(
EventInfo info = new EventInfo(time, aSource, id, types, aEvent);
boolean delivered = false;
try {
List<String> 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,
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 });
}
}
new Object[] { doc, aSource });
}
}
@@
-117,7
+107,9
@@
public class XMLRouter implements Gateway, DestinationRegistry {
// This is however certainly not the main case.
for (String inputType : filteredInputTypes) {
// 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 {
delivered = delivered || result;
}
} finally {
@@
-128,11
+120,12
@@
public class XMLRouter implements Gateway, DestinationRegistry {
}
}
}
}
- private boolean deliverEvent(EventInfo aInfo, String aInputType) {
+ private boolean deliverEvent(Collection<Filter> aFilters,
+ TransformationPaths aTransformations, EventInfo aInfo, String aInputType) {
boolean delivered = false;
Set<String> possibleTargetTypes = new HashSet<String>();
boolean delivered = false;
Set<String> possibleTargetTypes = new HashSet<String>();
- possibleTargetTypes.addAll(
config.transformations()
+ possibleTargetTypes.addAll(
aTransformations
.getPossibleTargetTypes(aInputType));
// ask each destination what target types, if any they want to have.
.getPossibleTargetTypes(aInputType));
// ask each destination what target types, if any they want to have.
@@
-145,7
+138,7
@@
public class XMLRouter implements Gateway, DestinationRegistry {
if (!requested.isEmpty()) {
// Deliver to the destination.
for (String targetType : requested) {
if (!requested.isEmpty()) {
// Deliver to the destination.
for (String targetType : requested) {
- TransformationPath path =
config.transformations()
.getPath(
+ TransformationPath path =
aTransformations
.getPath(
aInputType, targetType);
List<Transformation> ts = path.getTransformations();
int i = 0;
aInputType, targetType);
List<Transformation> ts = path.getTransformations();
int i = 0;
@@
-160,7
+153,8
@@
public class XMLRouter implements Gateway, DestinationRegistry {
aInfo.getEvent(), aInputType, t, orig);
}
aInfo.getEvent(), aInputType, t, orig);
}
- if (!isAllowedByFilters(t.getToType(), transformed)) {
+ if (!isAllowedByFilters(aFilters, t.getToType(),
+ transformed)) {
allowed = false;
}
i++;
allowed = false;
}
i++;
@@
-170,7
+164,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;
}
@@
-180,13
+174,13
@@
public class XMLRouter implements Gateway, DestinationRegistry {
return delivered;
}
return delivered;
}
- private List<String> determineFilteredInputTypes(
List<String> aTypes,
- DOMSource aEvent) {
+ private List<String> determineFilteredInputTypes(
+
Collection<Filter> aFilters, List<String> aTypes,
DOMSource aEvent) {
// apply filters to the input
List<String> filteredTypes = new ArrayList<String>();
for (String type : aTypes) {
// apply filters to the input
List<String> filteredTypes = new ArrayList<String>();
for (String type : aTypes) {
- boolean allowed = isAllowedByFilters(type, aEvent);
+ boolean allowed = isAllowedByFilters(
aFilters,
type, aEvent);
if (allowed) {
filteredTypes.add(type);
}
if (allowed) {
filteredTypes.add(type);
}
@@
-194,10
+188,10
@@
public class XMLRouter implements Gateway, DestinationRegistry {
return filteredTypes;
}
return filteredTypes;
}
- private boolean isAllowedByFilters(String aType, DOMSource aEvent) {
+ private boolean isAllowedByFilters(Collection<Filter> aFilters,
+ String aType, DOMSource aEvent) {
boolean allowed = true;
boolean allowed = true;
- for (Filter filter : config.routerConfig().filterConfig().map()
- .values()) {
+ for (Filter filter : aFilters) {
if (!filter.isAllowed(aType, aEvent)) {
allowed = false;
}
if (!filter.isAllowed(aType, aEvent)) {
allowed = false;
}
@@
-205,10
+199,10
@@
public class XMLRouter implements Gateway, DestinationRegistry {
return allowed;
}
return allowed;
}
- private List<String> determineDocumentTypes(DOMSource aEvent) {
+ private List<String> determineDocumentTypes(
+ Collection<DocumentType> aTypes, DOMSource aEvent) {
List<String> res = new ArrayList<String>();
List<String> res = new ArrayList<String>();
- for (DocumentType type : config.routerConfig().documentTypeConfig()
- .map().values()) {
+ for (DocumentType type : aTypes) {
if (type.isInstance(aEvent)) {
res.add(type.getName());
}
if (type.isInstance(aEvent)) {
res.add(type.getName());
}
@@
-216,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) + "'";
@@
-243,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;
}