Author: heshan
Date: Fri Jun 17 09:55:04 2011
New Revision: 1136830
URL: http://svn.apache.org/viewvc?rev=1136830&view=rev
Log:
Refactoring the conditional router mediator.
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRoute.java
- copied, changed from r1136758,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/Route.java
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/Route.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java
synapse/trunk/java/repository/schema/mediators/filter/cond_router.xsd
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java?rev=1136830&r1=1136829&r2=1136830&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorFactory.java
Fri Jun 17 09:55:04 2011
@@ -27,7 +27,7 @@ import org.apache.synapse.commons.evalua
import org.apache.synapse.commons.evaluators.config.EvaluatorFactoryFinder;
import org.apache.synapse.mediators.eip.Target;
import org.apache.synapse.mediators.filters.router.ConditionalRouterMediator;
-import org.apache.synapse.mediators.filters.router.Route;
+import org.apache.synapse.mediators.filters.router.ConditionalRoute;
import javax.xml.namespace.QName;
import java.util.Iterator;
@@ -48,7 +48,7 @@ public class ConditionalRouterMediatorFa
private static final QName CONDITIONAL_ROUTER_Q
= new QName(XMLConfigConstants.SYNAPSE_NAMESPACE,
"conditionalRouter");
private static final QName ROUTE_Q
- = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "route");
+ = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE,
"conditionalRoute");
private static final QName CONDITION_Q
= new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "condition");
private static final QName TARGET_Q
@@ -82,19 +82,19 @@ public class ConditionalRouterMediatorFa
Iterator itr = elem.getChildrenWithName(ROUTE_Q);
while (itr.hasNext()) {
OMElement routeElem = (OMElement) itr.next();
- Route route = new Route();
+ ConditionalRoute conditionalRoute = new ConditionalRoute();
if (routeElem.getAttribute(BREAK_ROUTE_ATTR) != null) {
if (JavaUtils.isTrueExplicitly(
routeElem.getAttributeValue(BREAK_ROUTE_ATTR).trim()))
{
- route.setBreakRoute(true);
+ conditionalRoute.setBreakRoute(true);
} else if (JavaUtils.isFalseExplicitly(
routeElem.getAttributeValue(BREAK_ROUTE_ATTR).trim()))
{
- route.setBreakRoute(false);
+ conditionalRoute.setBreakRoute(false);
} else {
- handleException("breakRoute attribute value of the route
element must " +
+ handleException("breakRoute attribute value of the
conditionalRoute element must " +
"be either 'true' or 'false', the value found is :
"
+
routeElem.getAttributeValue(BREAK_ROUTE_ATTR).trim());
}
@@ -109,7 +109,7 @@ public class ConditionalRouterMediatorFa
try {
Evaluator evaluator =
EvaluatorFactoryFinder.getInstance().getEvaluator(
conditionElem.getFirstElement());
- route.setEvaluator(evaluator);
+ conditionalRoute.setEvaluator(evaluator);
} catch (EvaluatorException ee) {
handleException("Couldn't build the condition of the
conditional router", ee);
}
@@ -121,8 +121,8 @@ public class ConditionalRouterMediatorFa
} else {
target.setAsynchronous(false);
}
- route.setTarget(target);
- conditionalRouterMediator.addRoute(route);
+ conditionalRoute.setTarget(target);
+ conditionalRouterMediator.addRoute(conditionalRoute);
}
return conditionalRouterMediator;
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java?rev=1136830&r1=1136829&r2=1136830&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ConditionalRouterMediatorSerializer.java
Fri Jun 17 09:55:04 2011
@@ -24,8 +24,8 @@ import org.apache.synapse.Mediator;
import org.apache.synapse.commons.evaluators.config.EvaluatorSerializerFinder;
import org.apache.synapse.commons.evaluators.config.EvaluatorSerializer;
import org.apache.synapse.commons.evaluators.EvaluatorException;
+import org.apache.synapse.mediators.filters.router.ConditionalRoute;
import org.apache.synapse.mediators.filters.router.ConditionalRouterMediator;
-import org.apache.synapse.mediators.filters.router.Route;
/**
* <pre>
@@ -49,21 +49,21 @@ public class ConditionalRouterMediatorSe
Boolean.toString(conditionalRouterMediator.isContinueAfter()), nullNS);
}
- for (Route route : conditionalRouterMediator.getRoutes()) {
- OMElement routeElem = fac.createOMElement("route", synNS);
+ for (ConditionalRoute conditionalRoute :
conditionalRouterMediator.getConditionalRoutes()) {
+ OMElement routeElem = fac.createOMElement("conditionalRoute",
synNS);
- if (route.isBreakRouteExplicitlySet()) {
- routeElem.addAttribute("breakRoute",
Boolean.toString(route.isBreakRoute()), nullNS);
+ if (conditionalRoute.isBreakRouteExplicitlySet()) {
+ routeElem.addAttribute("breakRoute",
Boolean.toString(conditionalRoute.isBreakRoute()), nullNS);
}
- if (route.getEvaluator() != null) {
+ if (conditionalRoute.getEvaluator() != null) {
EvaluatorSerializer evaluatorSerializer =
EvaluatorSerializerFinder.getInstance().getSerializer(
- route.getEvaluator().getName());
+ conditionalRoute.getEvaluator().getName());
if (evaluatorSerializer != null) {
OMElement conditionElement =
fac.createOMElement("condition", synNS);
try {
- evaluatorSerializer.serialize(conditionElement,
route.getEvaluator());
+ evaluatorSerializer.serialize(conditionElement,
conditionalRoute.getEvaluator());
} catch (EvaluatorException e) {
handleException("Cannot serialize the Evaluator", e);
}
@@ -72,13 +72,13 @@ public class ConditionalRouterMediatorSe
}
}
- if (route.getTarget() != null) {
-
routeElem.addChild(TargetSerializer.serializeTarget(route.getTarget()));
+ if (conditionalRoute.getTarget() != null) {
+
routeElem.addChild(TargetSerializer.serializeTarget(conditionalRoute.getTarget()));
} else {
- handleException("Route in a conditional router has to have a
target");
+ handleException("ConditionalRoute in a conditional router has
to have a target");
}
- if (route.getTarget().isAsynchronous()) {
+ if (conditionalRoute.getTarget().isAsynchronous()) {
routeElem.addAttribute(fac.createOMAttribute("asynchronous",
nullNS, "true"));
}
Copied:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRoute.java
(from r1136758,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/Route.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRoute.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRoute.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/Route.java&r1=1136758&r2=1136830&rev=1136830&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/Route.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRoute.java
Fri Jun 17 09:55:04 2011
@@ -25,7 +25,7 @@ import org.apache.synapse.mediators.eip.
/**
*
*/
-public class Route {
+public class ConditionalRoute {
private Evaluator evaluator;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java?rev=1136830&r1=1136829&r2=1136830&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/router/ConditionalRouterMediator.java
Fri Jun 17 09:55:04 2011
@@ -38,7 +38,7 @@ import java.util.Map;
*/
public class ConditionalRouterMediator extends AbstractMediator {
- private List<Route> routes = new ArrayList<Route>();
+ private List<ConditionalRoute> conditionalRoutes = new
ArrayList<ConditionalRoute>();
private boolean continueAfter;
@@ -69,10 +69,10 @@ public class ConditionalRouterMediator e
context.setMessageContext(((Axis2MessageContext)
synCtx).getAxis2MessageContext());
try {
- for (Route route : routes) {
- if (route.getEvaluator().evaluate(context)) {
- route.getTarget().mediate(synCtx);
- if (route.isBreakRoute()) {
+ for (ConditionalRoute conditionalRoute : conditionalRoutes) {
+ if (conditionalRoute.getEvaluator().evaluate(context)) {
+ conditionalRoute.getTarget().mediate(synCtx);
+ if (conditionalRoute.isBreakRoute()) {
break;
}
}
@@ -83,12 +83,12 @@ public class ConditionalRouterMediator e
return continueAfter;
}
- public List<Route> getRoutes() {
- return routes;
+ public List<ConditionalRoute> getConditionalRoutes() {
+ return conditionalRoutes;
}
- public void addRoute(Route route) {
- routes.add(route);
+ public void addRoute(ConditionalRoute conditionalRoute) {
+ conditionalRoutes.add(conditionalRoute);
}
public boolean isContinueAfter() {
Modified: synapse/trunk/java/repository/schema/mediators/filter/cond_router.xsd
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/filter/cond_router.xsd?rev=1136830&r1=1136829&r2=1136830&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/filter/cond_router.xsd
(original)
+++ synapse/trunk/java/repository/schema/mediators/filter/cond_router.xsd Fri
Jun 17 09:55:04 2011
@@ -28,16 +28,16 @@
<xs:element name="conditionalRouter">
<xs:annotation>
<xs:documentation source="description">
- ConditionalRouter mediator to route messages by looking at the
+ ConditionalRouter mediator to conditionalRoute messages by
looking at the
provided conditions by evaluating xpath over the current
message
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element name="route" minOccurs="1" maxOccurs="unbounded">
+ <xs:element name="conditionalRoute" minOccurs="1"
maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
- A single route in the conditional router, which
should have a condition
+ A single conditionalRoute in the conditional
router, which should have a condition
and a target
</xs:documentation>
</xs:annotation>
