summaryrefslogtreecommitdiff
path: root/qpid/java/common/src/main/java/org/apache/qpid/filter
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/common/src/main/java/org/apache/qpid/filter')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java9
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java2
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java2
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java15
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java4
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java1
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java4
7 files changed, 9 insertions, 28 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
index 47d970cfbd..35a7c93043 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
@@ -30,10 +30,6 @@ public abstract class ArithmeticExpression extends BinaryExpression
protected static final int LONG = 2;
protected static final int DOUBLE = 3;
- /**
- * @param left
- * @param right
- */
public ArithmeticExpression(Expression left, Expression right)
{
super(left, right);
@@ -262,11 +258,6 @@ public abstract class ArithmeticExpression extends BinaryExpression
return evaluate(lvalue, rvalue);
}
- /**
- * @param lvalue
- * @param rvalue
- * @return
- */
protected abstract Object evaluate(Object lvalue, Object rvalue);
}
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
index 6467bbbe1f..47f97ea908 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
@@ -83,7 +83,7 @@ public abstract class BinaryExpression implements Expression
* Returns the symbol that represents this binary expression. For example, addition is
* represented by "+"
*
- * @return
+ * @return the expression symbol
*/
public abstract String getExpressionSymbol();
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
index 13e1604d5f..5b1cf54680 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
@@ -28,7 +28,7 @@ public interface BooleanExpression extends Expression
{
/**
- * @param message
+ * @param message message to match
* @return true if the expression evaluates to Boolean.TRUE.
*/
public boolean matches(FilterableMessage message);
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
index 2cfb97dc6c..76f743000b 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
@@ -74,9 +74,6 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
private Pattern likePattern;
- /**
- * @param right
- */
public LikeExpression(Expression right, String like, int escape)
{
super(right);
@@ -316,9 +313,9 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
}
/**
- * Only Numeric expressions can be used in >, >=, < or <= expressions.s
+ * Only Numeric expressions can be used in {@literal >, >=, < or <=} expressions.
*
- * @param expr
+ * @param expr expression to check
*/
public static void checkLessThanOperand(Expression expr)
{
@@ -341,10 +338,10 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
}
/**
- * Validates that the expression can be used in == or <> expression.
+ * Validates that the expression can be used in {@literal == or <>} expression.
* Cannot not be NULL TRUE or FALSE literals.
*
- * @param expr
+ * @param expr expression to check
*/
public static void checkEqualOperand(Expression expr)
{
@@ -374,10 +371,6 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
}
}
- /**
- * @param left
- * @param right
- */
public ComparisonExpression(Expression left, Expression right)
{
super(left, right);
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 20c9f1438a..978ad3af7d 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
@@ -181,8 +181,8 @@ public class ConstantExpression implements Expression
* Encodes the value of string so that it looks like it would look like
* when it was provided in a selector.
*
- * @param s
- * @return
+ * @param s string to encode
+ * @return encoded string
*/
public static String encodeString(String s)
{
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java
index 1030c7b588..64630c142e 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java
@@ -27,6 +27,7 @@ public interface Expression
{
/**
+ * @param message message to evaluate
* @return the value of this expression
*/
public Object evaluate(FilterableMessage message);
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
index f8ec19d23b..6de3a03ee0 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
@@ -36,10 +36,6 @@ public abstract class LogicExpression extends BinaryExpression implements Boolea
return new AndExpression(lvalue, rvalue);
}
- /**
- * @param left
- * @param right
- */
public LogicExpression(BooleanExpression left, BooleanExpression right)
{
super(left, right);