You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by hi...@apache.org on 2010/08/04 12:27:36 UTC

svn commit: r982198 - in /synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators: EvaluatorConstants.java MatchEvaluator.java config/MatchFactory.java config/MatchSerializer.java

Author: hiranya
Date: Wed Aug  4 10:27:36 2010
New Revision: 982198

URL: http://svn.apache.org/viewvc?rev=982198&view=rev
Log:
Adding some constants for the different types of match executors


Modified:
    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/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/EvaluatorConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EvaluatorConstants.java?rev=982198&r1=982197&r2=982198&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 Wed Aug  4 10:27:36 2010
@@ -41,4 +41,8 @@ public class EvaluatorConstants {
     public static final String CONDITION = "condition";
     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;
 }

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=982198&r1=982197&r2=982198&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 Wed Aug  4 10:27:36 2010
@@ -40,7 +40,7 @@ public class MatchEvaluator implements E
 
     private Log log = LogFactory.getLog(MatchEvaluator.class);
 
-    private int type = 3;
+    private int type = EvaluatorConstants.MATCH_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 == 1) {
+        if (type == EvaluatorConstants.MATCH_TYPE_URL) {
             sourceText = context.getUrl();
-        } else if (type == 2) {
+        } else if (type == EvaluatorConstants.MATCH_TYPE_PARAM) {
             try {
                 sourceText = context.getParam(source);
             } catch (UnsupportedEncodingException e) {
                 handleException("Error retrieving paramter: " + source);
             }
-        } else if (type == 3) {
+        } else if (type == EvaluatorConstants.MATCH_TYPE_HEADER) {
             sourceText = context.getHeader(source);
         }
 

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=982198&r1=982197&r2=982198&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 Wed Aug  4 10:27:36 2010
@@ -52,11 +52,11 @@ public class MatchFactory implements Eva
         if (typeAttr != null) {
             String value = typeAttr.getAttributeValue();
             if (value.equals(EvaluatorConstants.HEADER)) {
-                type = 3;
+                type = EvaluatorConstants.MATCH_TYPE_HEADER;
             } else if (value.equals(EvaluatorConstants.PARAM)) {
-                type = 2;
+                type = EvaluatorConstants.MATCH_TYPE_PARAM;
             } else if (value.equals(EvaluatorConstants.URL)) {
-                type = 1;
+                type = EvaluatorConstants.MATCH_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=982198&r1=982197&r2=982198&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 Wed Aug  4 10:27:36 2010
@@ -34,13 +34,13 @@ public class MatchSerializer extends Abs
             }
         }
 
-        if (matchEvaluator.getType() == 1) {
+        if (matchEvaluator.getType() == EvaluatorConstants.MATCH_TYPE_URL) {
             matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
                     EvaluatorConstants.URL));
-        } else if (matchEvaluator.getType() == 2) {
+        } else if (matchEvaluator.getType() == EvaluatorConstants.MATCH_TYPE_PARAM) {
             matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
                     EvaluatorConstants.PARAM));
-        } else if (matchEvaluator.getType() == 3) {
+        } else if (matchEvaluator.getType() == EvaluatorConstants.MATCH_TYPE_HEADER) {
             matchElement.addAttribute(fac.createOMAttribute(EvaluatorConstants.TYPE, nullNS,
                     EvaluatorConstants.HEADER));
         } else {