Author: hiranya
Date: Thu Aug 5 04:48:56 2010
New Revision: 982467
URL: http://svn.apache.org/viewvc?rev=982467&view=rev
Log:
Using constants in the evaluators for match types
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java?rev=982467&r1=982466&r2=982467&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
Thu Aug 5 04:48:56 2010
@@ -37,20 +37,20 @@ public class EqualEvaluator implements E
private String source = null;
- private int type = 3;
+ private int type = EvaluatorConstants.TYPE_HEADER;
public boolean evaluate(EvaluatorContext context) throws
EvaluatorException {
String sourceText = null;
- if (type == 1) {
+ if (type == EvaluatorConstants.TYPE_URL) {
sourceText = context.getUrl();
- } else if (type == 2) {
+ } else if (type == EvaluatorConstants.TYPE_PARAM) {
try {
sourceText = context.getParam(source);
} catch (UnsupportedEncodingException e) {
handleException("Error retrieving paramter: " + source);
}
- } else if (type == 3) {
+ } else if (type == EvaluatorConstants.TYPE_HEADER) {
sourceText = context.getHeader(source);
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java?rev=982467&r1=982466&r2=982467&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java
Thu Aug 5 04:48:56 2010
@@ -42,7 +42,7 @@ public class EvaluatorConstants {
public static final String PRIORITY = "priority";
public static final String DEFAULT_PRIORITY = "defaultPriority";
- public static final int MATCH_TYPE_URL = 1;
- public static final int MATCH_TYPE_PARAM = 2;
- public static final int MATCH_TYPE_HEADER = 3;
+ public static final int TYPE_URL = 1;
+ public static final int TYPE_PARAM = 2;
+ public static final int TYPE_HEADER = 3;
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java?rev=982467&r1=982466&r2=982467&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
Thu Aug 5 04:48:56 2010
@@ -40,7 +40,7 @@ public class MatchEvaluator implements E
private Log log = LogFactory.getLog(MatchEvaluator.class);
- private int type = EvaluatorConstants.MATCH_TYPE_HEADER;
+ private int type = EvaluatorConstants.TYPE_HEADER;
private String source = null;
@@ -49,15 +49,15 @@ public class MatchEvaluator implements E
public boolean evaluate(EvaluatorContext context) throws
EvaluatorException {
String sourceText = null;
- if (type == EvaluatorConstants.MATCH_TYPE_URL) {
+ if (type == EvaluatorConstants.TYPE_URL) {
sourceText = context.getUrl();
- } else if (type == EvaluatorConstants.MATCH_TYPE_PARAM) {
+ } else if (type == EvaluatorConstants.TYPE_PARAM) {
try {
sourceText = context.getParam(source);
} catch (UnsupportedEncodingException e) {
handleException("Error retrieving paramter: " + source);
}
- } else if (type == EvaluatorConstants.MATCH_TYPE_HEADER) {
+ } else if (type == EvaluatorConstants.TYPE_HEADER) {
sourceText = context.getHeader(source);
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java?rev=982467&r1=982466&r2=982467&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualFactory.java
Thu Aug 5 04:48:56 2010
@@ -45,16 +45,16 @@ public class EqualFactory implements Eva
OMAttribute typeAttr = e.getAttribute(new
QName(EvaluatorConstants.TYPE));
- int type = 3;
+ int type = EvaluatorConstants.TYPE_HEADER;
if (typeAttr != null) {
String value = typeAttr.getAttributeValue();
if (value.equals(EvaluatorConstants.HEADER)) {
- type = 3;
+ type = EvaluatorConstants.TYPE_HEADER;
} else if (value.equals(EvaluatorConstants.PARAM)) {
- type = 2;
+ type = EvaluatorConstants.TYPE_PARAM;
} else if (value.equals(EvaluatorConstants.URL)) {
- type = 1;
+ type = EvaluatorConstants.TYPE_URL;
}
}
@@ -62,7 +62,7 @@ public class EqualFactory implements Eva
OMAttribute sourceAttr = e.getAttribute(new
QName(EvaluatorConstants.SOURCE));
if (sourceAttr == null) {
- if (type != 1) {
+ if (type != EvaluatorConstants.TYPE_URL) {
handleException(EvaluatorConstants.SOURCE + " attribute is
required");
return null;
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java?rev=982467&r1=982466&r2=982467&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/EqualSerializer.java
Thu Aug 5 04:48:56 2010
@@ -37,7 +37,7 @@ public class EqualSerializer extends Abs
EqualEvaluator equalEvaluator = (EqualEvaluator) evaluator;
OMElement eqaulElement = fac.createOMElement(new
QName(EvaluatorConstants.EQUAL));
- if (equalEvaluator.getType() != 1) {
+ if (equalEvaluator.getType() != EvaluatorConstants.TYPE_URL) {
if (equalEvaluator.getSource() != null) {
eqaulElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.SOURCE,
nullNS,
equalEvaluator.getSource()));
@@ -49,13 +49,13 @@ public class EqualSerializer extends Abs
}
}
- if (equalEvaluator.getType() == 1) {
+ if (equalEvaluator.getType() == EvaluatorConstants.TYPE_URL) {
eqaulElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
EvaluatorConstants.URL));
- } else if (equalEvaluator.getType() == 2) {
+ } else if (equalEvaluator.getType() == EvaluatorConstants.TYPE_PARAM) {
eqaulElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
EvaluatorConstants.PARAM));
- } else if (equalEvaluator.getType() == 3) {
+ } else if (equalEvaluator.getType() == EvaluatorConstants.TYPE_HEADER)
{
eqaulElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
EvaluatorConstants.HEADER));
} else {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java?rev=982467&r1=982466&r2=982467&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchFactory.java
Thu Aug 5 04:48:56 2010
@@ -47,16 +47,16 @@ public class MatchFactory implements Eva
OMAttribute typeAttr = e.getAttribute(new
QName(EvaluatorConstants.TYPE));
- int type = 3;
+ int type = EvaluatorConstants.TYPE_HEADER;
if (typeAttr != null) {
String value = typeAttr.getAttributeValue();
if (value.equals(EvaluatorConstants.HEADER)) {
- type = EvaluatorConstants.MATCH_TYPE_HEADER;
+ type = EvaluatorConstants.TYPE_HEADER;
} else if (value.equals(EvaluatorConstants.PARAM)) {
- type = EvaluatorConstants.MATCH_TYPE_PARAM;
+ type = EvaluatorConstants.TYPE_PARAM;
} else if (value.equals(EvaluatorConstants.URL)) {
- type = EvaluatorConstants.MATCH_TYPE_URL;
+ type = EvaluatorConstants.TYPE_URL;
}
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java?rev=982467&r1=982466&r2=982467&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/MatchSerializer.java
Thu Aug 5 04:48:56 2010
@@ -22,7 +22,7 @@ public class MatchSerializer extends Abs
MatchEvaluator matchEvaluator = (MatchEvaluator) evaluator;
OMElement matchElement = fac.createOMElement(new
QName(EvaluatorConstants.MATCH));
- if (matchEvaluator.getType() != 1) {
+ if (matchEvaluator.getType() != EvaluatorConstants.TYPE_URL) {
if (matchEvaluator.getSource() != null) {
matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.SOURCE,
nullNS,
matchEvaluator.getSource()));
@@ -34,13 +34,13 @@ public class MatchSerializer extends Abs
}
}
- if (matchEvaluator.getType() == EvaluatorConstants.MATCH_TYPE_URL) {
+ if (matchEvaluator.getType() == EvaluatorConstants.TYPE_URL) {
matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
EvaluatorConstants.URL));
- } else if (matchEvaluator.getType() ==
EvaluatorConstants.MATCH_TYPE_PARAM) {
+ } else if (matchEvaluator.getType() == EvaluatorConstants.TYPE_PARAM) {
matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
EvaluatorConstants.PARAM));
- } else if (matchEvaluator.getType() ==
EvaluatorConstants.MATCH_TYPE_HEADER) {
+ } else if (matchEvaluator.getType() == EvaluatorConstants.TYPE_HEADER)
{
matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
EvaluatorConstants.HEADER));
} else {
