You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2010/02/25 07:31:33 UTC
svn commit: r916148 - in
/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators:
./ config/
Author: indika
Date: Thu Feb 25 06:31:33 2010
New Revision: 916148
URL: http://svn.apache.org/viewvc?rev=916148&view=rev
Log:
refactoring the class names
Added:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
- copied, changed from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/And.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java
- copied, changed from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Equal.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java
- copied, changed from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Match.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java
- copied, changed from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Not.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
- copied, changed from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Or.java
Removed:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/And.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Equal.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Match.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Not.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Or.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.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/MatchFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java
Copied: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java (from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/And.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java?p2=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java&p1=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/And.java&r1=915741&r2=916148&rev=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/And.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java Thu Feb 25 06:31:33 2010
@@ -28,7 +28,7 @@
* two or more evaluators
* <and>
*/
-public class And implements Evaluator {
+public class AndEvaluator implements Evaluator {
private Evaluator[] evaluators;
public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
Copied: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java (from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Equal.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java?p2=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java&p1=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Equal.java&r1=915741&r2=916148&rev=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Equal.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/EqualEvaluator.java Thu Feb 25 06:31:33 2010
@@ -32,8 +32,8 @@
* Syntax:
* <equal type="header | param | url" source="" value=""/>
*/
-public class Equal implements Evaluator {
- private Log log = LogFactory.getLog(Equal.class);
+public class EqualEvaluator implements Evaluator {
+ private Log log = LogFactory.getLog(EqualEvaluator.class);
private String value = null;
private String source = null;
Copied: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java (from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Match.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java?p2=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java&p1=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Match.java&r1=915741&r2=916148&rev=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Match.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/MatchEvaluator.java Thu Feb 25 06:31:33 2010
@@ -34,9 +34,9 @@
*
* The source is used to extract the HTTP header or URL param
*/
-public class Match implements Evaluator {
+public class MatchEvaluator implements Evaluator {
- private Log log = LogFactory.getLog(Match.class);
+ private Log log = LogFactory.getLog(MatchEvaluator.class);
private int type = 3;
Copied: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java (from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Not.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java?p2=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java&p1=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Not.java&r1=915741&r2=916148&rev=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Not.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/NotEvaluator.java Thu Feb 25 06:31:33 2010
@@ -27,7 +27,7 @@
* one evaluator
* </not>
*/
-public class Not implements Evaluator {
+public class NotEvaluator implements Evaluator {
private Evaluator evaluator;
public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
Copied: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java (from r915741, synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Or.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java?p2=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java&p1=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Or.java&r1=915741&r2=916148&rev=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Or.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java Thu Feb 25 06:31:33 2010
@@ -28,7 +28,7 @@
* two or more evaluators
* </or>
*/
-public class Or implements Evaluator {
+public class OrEvaluator implements Evaluator {
private Evaluator[] evaluators;
public boolean evaluate(EvaluatorContext context) throws EvaluatorException {
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java?rev=916148&r1=916147&r2=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AndFactory.java Thu Feb 25 06:31:33 2010
@@ -21,7 +21,7 @@
import org.apache.synapse.commons.evaluators.Evaluator;
import org.apache.synapse.commons.evaluators.EvaluatorException;
-import org.apache.synapse.commons.evaluators.And;
+import org.apache.synapse.commons.evaluators.AndEvaluator;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,7 +34,7 @@
private Log log = LogFactory.getLog(AndFactory.class);
public Evaluator create(OMElement e) throws EvaluatorException {
- And o = new And();
+ AndEvaluator o = new AndEvaluator();
Iterator it = e.getChildElements();
@@ -60,7 +60,7 @@
o.setEvaluators(evaluators.toArray(new Evaluator[evaluators.size()]));
} else {
handleException("Two or more expressions " +
- "should be provided under Or");
+ "should be provided under And");
return null;
}
return o;
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=916148&r1=916147&r2=916148&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 Feb 25 06:31:33 2010
@@ -21,7 +21,7 @@
import org.apache.synapse.commons.evaluators.Evaluator;
import org.apache.synapse.commons.evaluators.EvaluatorException;
-import org.apache.synapse.commons.evaluators.Equal;
+import org.apache.synapse.commons.evaluators.EqualEvaluator;
import org.apache.synapse.commons.evaluators.EvaluatorConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
@@ -34,7 +34,7 @@
private Log log = LogFactory.getLog(EqualFactory.class);
public Evaluator create(OMElement e) throws EvaluatorException {
- Equal equal = new Equal();
+ EqualEvaluator equal = new EqualEvaluator();
OMAttribute typeAttr = e.getAttribute(new QName(EvaluatorConstants.TYPE));
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=916148&r1=916147&r2=916148&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 Feb 25 06:31:33 2010
@@ -22,7 +22,7 @@
import org.apache.synapse.commons.evaluators.Evaluator;
import org.apache.synapse.commons.evaluators.EvaluatorException;
-import org.apache.synapse.commons.evaluators.Match;
+import org.apache.synapse.commons.evaluators.MatchEvaluator;
import org.apache.synapse.commons.evaluators.EvaluatorConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
@@ -36,7 +36,7 @@
private Log log = LogFactory.getLog(MatchFactory.class);
public Evaluator create(OMElement e) throws EvaluatorException {
- Match equal = new Match();
+ MatchEvaluator equal = new MatchEvaluator();
OMAttribute typeAttr = e.getAttribute(new QName(EvaluatorConstants.TYPE));
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java?rev=916148&r1=916147&r2=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/NotFactory.java Thu Feb 25 06:31:33 2010
@@ -22,7 +22,7 @@
import org.apache.synapse.commons.evaluators.Evaluator;
import org.apache.synapse.commons.evaluators.EvaluatorException;
-import org.apache.synapse.commons.evaluators.Not;
+import org.apache.synapse.commons.evaluators.NotEvaluator;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -32,7 +32,7 @@
private Log log = LogFactory.getLog(NotFactory.class);
public Evaluator create(OMElement e) throws EvaluatorException {
- Not not = new Not();
+ NotEvaluator not = new NotEvaluator();
OMElement ce = e.getFirstElement();
Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java?rev=916148&r1=916147&r2=916148&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/OrFactory.java Thu Feb 25 06:31:33 2010
@@ -21,7 +21,7 @@
package org.apache.synapse.commons.evaluators.config;
import org.apache.synapse.commons.evaluators.Evaluator;
-import org.apache.synapse.commons.evaluators.Or;
+import org.apache.synapse.commons.evaluators.OrEvaluator;
import org.apache.synapse.commons.evaluators.EvaluatorException;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
@@ -35,7 +35,7 @@
private Log log = LogFactory.getLog(OrFactory.class);
public Evaluator create(OMElement e) throws EvaluatorException {
- Or o = new Or();
+ OrEvaluator o = new OrEvaluator();
Iterator it = e.getChildElements();