You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by va...@apache.org on 2025/07/31 09:11:56 UTC
(qpid-broker-j) branch main updated: QPID-8703: [Broker-J] Use same javacc plugin for broker-core and query-engine modules (#302)
This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 15b631531d QPID-8703: [Broker-J] Use same javacc plugin for broker-core and query-engine modules (#302)
15b631531d is described below
commit 15b631531d35b2cb4bbb279538d9b45048cdb5d5
Author: Daniil Kirilyuk <da...@gmail.com>
AuthorDate: Thu Jul 31 11:11:52 2025 +0200
QPID-8703: [Broker-J] Use same javacc plugin for broker-core and query-engine modules (#302)
---
broker-core/pom.xml | 1 +
broker-core/src/main/grammar/SelectorParser.jj | 68 +-
.../qpid/server/filter/OrderByExpression.java | 14 +-
.../server/filter/selector/ParseException.java | 48 +-
.../server/filter/selector/SelectorParser.java | 907 +++++++++--------
.../selector/SelectorParserTokenManager.java | 345 ++++---
.../server/filter/selector/SimpleCharStream.java | 21 +-
.../apache/qpid/server/filter/selector/Token.java | 7 +-
.../qpid/server/filter/selector/TokenMgrError.java | 37 +-
broker-plugins/management-http/pom.xml | 1 +
.../main/grammar/ConfiguredObjectFilterParser.jj | 118 +--
.../servlet/query/ConfiguredObjectExpression.java | 2 +-
.../query/ConfiguredObjectExpressionFactory.java | 19 +-
.../query/ConfiguredObjectFilterParser.java | 1063 +++++++++++---------
.../ConfiguredObjectFilterParserTokenManager.java | 368 ++++---
.../plugin/servlet/query/ParseException.java | 52 +-
.../plugin/servlet/query/SimpleCharStream.java | 21 +-
.../management/plugin/servlet/query/Token.java | 6 +-
.../plugin/servlet/query/TokenMgrError.java | 36 +-
broker-plugins/query-engine/pom.xml | 4 +-
.../src/main/grammar/ExpressionParser.jj | 2 +
.../engine/exception/QueryParsingException.java | 4 +-
.../function/datetime/ExtractExpressionTest.java | 2 +-
pom.xml | 6 -
24 files changed, 1758 insertions(+), 1394 deletions(-)
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index 80bb26a496..797112c293 100644
--- a/broker-core/pom.xml
+++ b/broker-core/pom.xml
@@ -242,6 +242,7 @@
<includes>
<include>SelectorParser.jj</include>
</includes>
+ <jdkVersion>17</jdkVersion>
</configuration>
</execution>
</executions>
diff --git a/broker-core/src/main/grammar/SelectorParser.jj b/broker-core/src/main/grammar/SelectorParser.jj
index 63f369a1dc..1d7a9db9b0 100644
--- a/broker-core/src/main/grammar/SelectorParser.jj
+++ b/broker-core/src/main/grammar/SelectorParser.jj
@@ -180,9 +180,9 @@ TOKEN [IGNORE_CASE] :
// ----------------------------------------------------------------------------
// Grammer
// ----------------------------------------------------------------------------
-BooleanExpression JmsSelector() :
+BooleanExpression<E> JmsSelector() :
{
- Expression left=null;
+ Expression<E> left=null;
}
{
(
@@ -194,10 +194,10 @@ BooleanExpression JmsSelector() :
}
-Expression orExpression() :
+Expression<E> orExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
left = andExpression()
@@ -212,10 +212,10 @@ Expression orExpression() :
}
}
-Expression andExpression() :
+Expression<E> andExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
left = equalityExpression()
@@ -230,10 +230,10 @@ Expression andExpression() :
}
}
-Expression equalityExpression() :
+Expression<E> equalityExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
left = comparisonExpression()
@@ -263,15 +263,15 @@ Expression equalityExpression() :
}
}
-Expression comparisonExpression() :
+Expression<E> comparisonExpression() :
{
- Expression left;
- Expression right;
- Expression low;
- Expression high;
+ Expression<E> left;
+ Expression<E> right;
+ Expression<E> low;
+ Expression<E> high;
String t, u;
boolean not;
- ArrayList list;
+ ArrayList<String> list;
}
{
left = addExpression()
@@ -325,7 +325,7 @@ Expression comparisonExpression() :
|
<IN> "(" t = stringLiteral()
{
- list = new ArrayList();
+ list = new ArrayList<>();
list.add( t );
}
( "," t = stringLiteral()
@@ -339,7 +339,7 @@ Expression comparisonExpression() :
|
LOOKAHEAD(2) <NOT> <IN> "(" t = stringLiteral()
{
- list = new ArrayList();
+ list = new ArrayList<>();
list.add( t );
}
( "," t = stringLiteral()
@@ -356,10 +356,10 @@ Expression comparisonExpression() :
}
}
-Expression addExpression() :
+Expression<E> addExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
left = multExpr()
@@ -382,10 +382,10 @@ Expression addExpression() :
}
}
-Expression multExpr() :
+Expression<E> multExpr() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
left = unaryExpr()
@@ -410,10 +410,10 @@ Expression multExpr() :
}
}
-Expression unaryExpr() :
+Expression<E> unaryExpr() :
{
String s=null;
- Expression left=null;
+ Expression<E> left=null;
}
{
(
@@ -441,9 +441,9 @@ Expression unaryExpr() :
}
}
-Expression primaryExpr() :
+Expression<E> primaryExpr() :
{
- Expression left=null;
+ Expression<E> left=null;
}
{
(
@@ -458,18 +458,18 @@ Expression primaryExpr() :
}
}
-ConstantExpression literal() :
+ConstantExpression<E> literal() :
{
Token t;
String s;
- ConstantExpression left=null;
+ ConstantExpression<E> left=null;
}
{
(
(
s = stringLiteral()
{
- left = new ConstantExpression(s);
+ left = new ConstantExpression<>(s);
}
)
|
@@ -550,11 +550,11 @@ String stringLiteral() :
}
}
-PropertyExpression variable() :
+PropertyExpression<E> variable() :
{
Token t;
StringBuffer rc = new StringBuffer();
- PropertyExpression left=null;
+ PropertyExpression<E> left=null;
}
{
(
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java b/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
index 87d45d1ce9..c9aab44c69 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
@@ -19,27 +19,27 @@
package org.apache.qpid.server.filter;
-public class OrderByExpression implements Expression
+public class OrderByExpression<T> implements Expression<T>
{
public enum Order
{ ASC, DESC }
- private final Expression _expression;
+ private final Expression<T> _expression;
private final Order _order;
- public OrderByExpression(Expression expression)
+ public OrderByExpression(Expression<T> expression)
{
this(expression, Order.ASC);
}
- public OrderByExpression(Expression expression, Order order)
+ public OrderByExpression(Expression<T> expression, Order order)
{
_expression = expression;
_order = order;
}
@Override
- public Object evaluate(final Object object)
+ public Object evaluate(final T object)
{
return _expression.evaluate(object);
}
@@ -51,11 +51,11 @@ public class OrderByExpression implements Expression
public boolean isColumnIndex()
{
- return (_expression instanceof ConstantExpression && ((ConstantExpression)_expression).getValue() instanceof Number);
+ return (_expression instanceof ConstantExpression && ((ConstantExpression<T>) _expression).getValue() instanceof Number);
}
public int getColumnIndex()
{
- return ((Number)((ConstantExpression)_expression).getValue()).intValue();
+ return ((Number) ((ConstantExpression<T>) _expression).getValue()).intValue();
}
}
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/ParseException.java b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/ParseException.java
index ea28826696..2998c433d0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/ParseException.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/ParseException.java
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
-/* JavaCCOptions:KEEP_LINE_COL=null */
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
+/* JavaCCOptions:KEEP_LINE_COLUMN=true */
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -41,6 +41,11 @@ public class ParseException extends Exception {
*/
private static final long serialVersionUID = 1L;
+ /**
+ * The end of line string for this machine.
+ */
+ protected static String EOL = System.getProperty("line.separator", "\n");
+
/**
* This constructor is used by the method "generateParseException"
* in the generated parser. Calling this constructor generates
@@ -81,7 +86,7 @@ public class ParseException extends Exception {
/**
* This is the last token that has been consumed successfully. If
* this object has been created due to a parse error, the token
- * followng this token will (therefore) be the first error token.
+ * following this token will (therefore) be the first error token.
*/
public Token currentToken;
@@ -109,8 +114,8 @@ public class ParseException extends Exception {
private static String initialise(Token currentToken,
int[][] expectedTokenSequences,
String[] tokenImage) {
- String eol = System.getProperty("line.separator", "\n");
- StringBuffer expected = new StringBuffer();
+
+ StringBuilder expected = new StringBuilder();
int maxSize = 0;
for (int i = 0; i < expectedTokenSequences.length; i++) {
if (maxSize < expectedTokenSequences[i].length) {
@@ -122,7 +127,7 @@ public class ParseException extends Exception {
if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
expected.append("...");
}
- expected.append(eol).append(" ");
+ expected.append(EOL).append(" ");
}
String retval = "Encountered \"";
Token tok = currentToken.next;
@@ -138,21 +143,26 @@ public class ParseException extends Exception {
retval += " \"";
tok = tok.next;
}
- retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
- retval += "." + eol;
- if (expectedTokenSequences.length == 1) {
- retval += "Was expecting:" + eol + " ";
+ if (currentToken.next != null) {
+ retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+ }
+ retval += "." + EOL;
+
+
+ if (expectedTokenSequences.length == 0) {
+ // Nothing to add here
} else {
- retval += "Was expecting one of:" + eol + " ";
+ if (expectedTokenSequences.length == 1) {
+ retval += "Was expecting:" + EOL + " ";
+ } else {
+ retval += "Was expecting one of:" + EOL + " ";
+ }
+ retval += expected.toString();
}
- retval += expected.toString();
+
return retval;
}
- /**
- * The end of line string for this machine.
- */
- protected String eol = System.getProperty("line.separator", "\n");
/**
* Used to convert raw characters to their escaped version
@@ -160,13 +170,11 @@ public class ParseException extends Exception {
* string literal.
*/
static String add_escapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
{
- case 0 :
- continue;
case '\b':
retval.append("\\b");
continue;
@@ -205,4 +213,4 @@ public class ParseException extends Exception {
}
}
-/* JavaCC - OriginalChecksum=f191e3976fe6d5a6a93a2d6f845dcf9d (do not edit this line) */
+/* JavaCC - OriginalChecksum=4d6a5d18523de3474fcfc04986130868 (do not edit this line) */
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParser.java b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParser.java
index f2e067786e..61ecd8f8e5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParser.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParser.java
@@ -1,3 +1,4 @@
+/* SelectorParser.java */
/* Generated By:JavaCC: Do not edit this line. SelectorParser.java */
/*
*
@@ -77,95 +78,96 @@ public class SelectorParser<E> implements SelectorParserConstants {
// ----------------------------------------------------------------------------
// Grammer
// ----------------------------------------------------------------------------
- final public BooleanExpression JmsSelector() throws ParseException {
- Expression left=null;
+ final public BooleanExpression<E> JmsSelector() throws ParseException {Expression<E> left=null;
left = orExpression();
jj_consume_token(0);
- {if (true) return asBooleanExpression(left);}
+{if ("" != null) return asBooleanExpression(left);}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression orExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> orExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = andExpression();
label_1:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case OR:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case OR:{
;
break;
+ }
default:
break label_1;
}
jj_consume_token(OR);
right = andExpression();
- left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
+left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression andExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> andExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = equalityExpression();
label_2:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case AND:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case AND:{
;
break;
+ }
default:
break label_2;
}
jj_consume_token(AND);
right = equalityExpression();
- left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
+left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression equalityExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> equalityExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = comparisonExpression();
label_3:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case IS:
case 27:
- case 28:
+ case 28:{
;
break;
+ }
default:
break label_3;
}
if (jj_2_1(2)) {
jj_consume_token(27);
right = comparisonExpression();
- left = ComparisonExpression.createEqual(left, right);
+left = ComparisonExpression.createEqual(left, right);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 28:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 28:{
jj_consume_token(28);
right = comparisonExpression();
- left = ComparisonExpression.createNotEqual(left, right);
+left = ComparisonExpression.createNotEqual(left, right);
break;
+ }
default:
if (jj_2_2(2)) {
jj_consume_token(IS);
jj_consume_token(NULL);
- left = ComparisonExpression.createIsNull(left);
+left = ComparisonExpression.createIsNull(left);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IS:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case IS:{
jj_consume_token(IS);
jj_consume_token(NOT);
jj_consume_token(NULL);
- left = ComparisonExpression.createIsNotNull(left);
+left = ComparisonExpression.createIsNotNull(left);
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
@@ -174,22 +176,21 @@ public class SelectorParser<E> implements SelectorParserConstants {
}
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression comparisonExpression() throws ParseException {
- Expression left;
- Expression right;
- Expression low;
- Expression high;
+ final public Expression<E> comparisonExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
+ Expression<E> low;
+ Expression<E> high;
String t, u;
boolean not;
- ArrayList list;
+ ArrayList<String> list;
left = addExpression();
label_4:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case NOT:
case BETWEEN:
case LIKE:
@@ -197,71 +198,79 @@ public class SelectorParser<E> implements SelectorParserConstants {
case 29:
case 30:
case 31:
- case 32:
+ case 32:{
;
break;
+ }
default:
break label_4;
}
if (jj_2_3(2)) {
jj_consume_token(29);
right = addExpression();
- left = ComparisonExpression.createGreaterThan(left, right);
+left = ComparisonExpression.createGreaterThan(left, right);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 30:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 30:{
jj_consume_token(30);
right = addExpression();
- left = ComparisonExpression.createGreaterThanEqual(left, right);
+left = ComparisonExpression.createGreaterThanEqual(left, right);
break;
- case 31:
+ }
+ case 31:{
jj_consume_token(31);
right = addExpression();
- left = ComparisonExpression.createLessThan(left, right);
+left = ComparisonExpression.createLessThan(left, right);
break;
- case 32:
+ }
+ case 32:{
jj_consume_token(32);
right = addExpression();
- left = ComparisonExpression.createLessThanEqual(left, right);
+left = ComparisonExpression.createLessThanEqual(left, right);
break;
- case LIKE:
- u=null;
+ }
+ case LIKE:{
+u=null;
jj_consume_token(LIKE);
t = stringLiteral();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ESCAPE:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case ESCAPE:{
jj_consume_token(ESCAPE);
u = stringLiteral();
break;
+ }
default:
;
}
- left = ComparisonExpression.createLike(left, t, u);
+left = ComparisonExpression.createLike(left, t, u);
break;
+ }
default:
if (jj_2_4(2)) {
- u=null;
+u=null;
jj_consume_token(NOT);
jj_consume_token(LIKE);
t = stringLiteral();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ESCAPE:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case ESCAPE:{
jj_consume_token(ESCAPE);
u = stringLiteral();
break;
+ }
default:
;
}
- left = ComparisonExpression.createNotLike(left, t, u);
+left = ComparisonExpression.createNotLike(left, t, u);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BETWEEN:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case BETWEEN:{
jj_consume_token(BETWEEN);
low = addExpression();
jj_consume_token(AND);
high = addExpression();
- left = ComparisonExpression.createBetween(left, low, high);
+left = ComparisonExpression.createBetween(left, low, high);
break;
+ }
default:
if (jj_2_5(2)) {
jj_consume_token(NOT);
@@ -269,54 +278,57 @@ public class SelectorParser<E> implements SelectorParserConstants {
low = addExpression();
jj_consume_token(AND);
high = addExpression();
- left = ComparisonExpression.createNotBetween(left, low, high);
+left = ComparisonExpression.createNotBetween(left, low, high);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IN:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case IN:{
jj_consume_token(IN);
jj_consume_token(33);
t = stringLiteral();
- list = new ArrayList();
+list = new ArrayList<>();
list.add( t );
label_5:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 34:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 34:{
;
break;
+ }
default:
break label_5;
}
jj_consume_token(34);
t = stringLiteral();
- list.add( t );
+list.add( t );
}
jj_consume_token(35);
- left = ComparisonExpression.createInFilter(left, list, false );
+left = ComparisonExpression.createInFilter(left, list, false );
break;
+ }
default:
if (jj_2_6(2)) {
jj_consume_token(NOT);
jj_consume_token(IN);
jj_consume_token(33);
t = stringLiteral();
- list = new ArrayList();
+list = new ArrayList<>();
list.add( t );
label_6:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 34:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 34:{
;
break;
+ }
default:
break label_6;
}
jj_consume_token(34);
t = stringLiteral();
- list.add( t );
+list.add( t );
}
jj_consume_token(35);
- left = ComparisonExpression.createNotInFilter(left, list, false);
+left = ComparisonExpression.createNotInFilter(left, list, false);
} else {
jj_consume_token(-1);
throw new ParseException();
@@ -328,13 +340,12 @@ public class SelectorParser<E> implements SelectorParserConstants {
}
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression addExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> addExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = multExpr();
label_7:
while (true) {
@@ -343,91 +354,95 @@ public class SelectorParser<E> implements SelectorParserConstants {
} else {
break label_7;
}
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 36:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 36:{
jj_consume_token(36);
right = multExpr();
- left = ArithmeticExpression.createPlus(left, right);
+left = ArithmeticExpression.createPlus(left, right);
break;
- case 37:
+ }
+ case 37:{
jj_consume_token(37);
right = multExpr();
- left = ArithmeticExpression.createMinus(left, right);
+left = ArithmeticExpression.createMinus(left, right);
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression multExpr() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> multExpr() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = unaryExpr();
label_8:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case 38:
case 39:
- case 40:
+ case 40:{
;
break;
+ }
default:
break label_8;
}
if (jj_2_8(2)) {
jj_consume_token(38);
right = unaryExpr();
- left = ArithmeticExpression.createMultiply(left, right);
+left = ArithmeticExpression.createMultiply(left, right);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 39:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 39:{
jj_consume_token(39);
right = unaryExpr();
- left = ArithmeticExpression.createDivide(left, right);
+left = ArithmeticExpression.createDivide(left, right);
break;
- case 40:
+ }
+ case 40:{
jj_consume_token(40);
right = unaryExpr();
- left = ArithmeticExpression.createMod(left, right);
+left = ArithmeticExpression.createMod(left, right);
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression unaryExpr() throws ParseException {
- String s=null;
- Expression left=null;
+ final public Expression<E> unaryExpr() throws ParseException {String s=null;
+ Expression<E> left=null;
if (jj_2_9(2147483647)) {
jj_consume_token(36);
left = unaryExpr();
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 37:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 37:{
jj_consume_token(37);
left = unaryExpr();
- left = UnaryExpression.createNegate(left);
+left = UnaryExpression.createNegate(left);
break;
+ }
default:
if (jj_2_10(2147483647)) {
jj_consume_token(NOT);
left = equalityExpression();
- left = UnaryExpression.createNOT( asBooleanExpression(left) );
+left = UnaryExpression.createNOT( asBooleanExpression(left) );
} else if (jj_2_11(2147483647)) {
jj_consume_token(NOT);
left = unaryExpr();
- left = UnaryExpression.createNOT( asBooleanExpression(left) );
+left = UnaryExpression.createNOT( asBooleanExpression(left) );
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case TRUE:
case FALSE:
case NULL:
@@ -438,9 +453,10 @@ public class SelectorParser<E> implements SelectorParserConstants {
case STRING_LITERAL:
case ID:
case QUOTED_ID:
- case 33:
+ case 33:{
left = primaryExpr();
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
@@ -448,13 +464,12 @@ public class SelectorParser<E> implements SelectorParserConstants {
}
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression primaryExpr() throws ParseException {
- Expression left=null;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ final public Expression<E> primaryExpr() throws ParseException {Expression<E> left=null;
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case TRUE:
case FALSE:
case NULL:
@@ -462,13 +477,15 @@ public class SelectorParser<E> implements SelectorParserConstants {
case HEX_LITERAL:
case OCTAL_LITERAL:
case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
+ case STRING_LITERAL:{
left = literal();
break;
+ }
case ID:
- case QUOTED_ID:
+ case QUOTED_ID:{
left = variable();
break;
+ }
default:
if (jj_2_12(2)) {
jj_consume_token(33);
@@ -479,61 +496,67 @@ public class SelectorParser<E> implements SelectorParserConstants {
throw new ParseException();
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public ConstantExpression literal() throws ParseException {
- Token t;
+ final public ConstantExpression<E> literal() throws ParseException {Token t;
String s;
- ConstantExpression left=null;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STRING_LITERAL:
+ ConstantExpression<E> left=null;
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case STRING_LITERAL:{
s = stringLiteral();
- left = new ConstantExpression(s);
+left = new ConstantExpression<>(s);
break;
- case DECIMAL_LITERAL:
+ }
+ case DECIMAL_LITERAL:{
t = jj_consume_token(DECIMAL_LITERAL);
- left = ConstantExpression.createFromDecimal(t.image);
+left = ConstantExpression.createFromDecimal(t.image);
break;
- case HEX_LITERAL:
+ }
+ case HEX_LITERAL:{
t = jj_consume_token(HEX_LITERAL);
- left = ConstantExpression.createFromHex(t.image);
+left = ConstantExpression.createFromHex(t.image);
break;
- case OCTAL_LITERAL:
+ }
+ case OCTAL_LITERAL:{
t = jj_consume_token(OCTAL_LITERAL);
- left = ConstantExpression.createFromOctal(t.image);
+left = ConstantExpression.createFromOctal(t.image);
break;
- case FLOATING_POINT_LITERAL:
+ }
+ case FLOATING_POINT_LITERAL:{
t = jj_consume_token(FLOATING_POINT_LITERAL);
- left = ConstantExpression.createFloat(t.image);
+left = ConstantExpression.createFloat(t.image);
break;
- case TRUE:
+ }
+ case TRUE:{
jj_consume_token(TRUE);
- left = ConstantExpression.TRUE;
+left = ConstantExpression.TRUE;
break;
- case FALSE:
+ }
+ case FALSE:{
jj_consume_token(FALSE);
- left = ConstantExpression.FALSE;
+left = ConstantExpression.FALSE;
break;
- case NULL:
+ }
+ case NULL:{
jj_consume_token(NULL);
- left = ConstantExpression.NULL;
+left = ConstantExpression.NULL;
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public String stringLiteral() throws ParseException {
- Token t;
+ final public String stringLiteral() throws ParseException {Token t;
StringBuffer rc = new StringBuffer();
boolean first=true;
t = jj_consume_token(STRING_LITERAL);
- // Decode the sting value.
+// Decode the sting value.
String image = t.image;
for( int i=1; i < image.length()-1; i++ ) {
char c = image.charAt(i);
@@ -543,22 +566,22 @@ public class SelectorParser<E> implements SelectorParserConstants {
}
rc.append(c);
}
- {if (true) return rc.toString();}
+ {if ("" != null) return rc.toString();}
throw new Error("Missing return statement in function");
- }
+}
- final public PropertyExpression variable() throws ParseException {
- Token t;
+ final public PropertyExpression<E> variable() throws ParseException {Token t;
StringBuffer rc = new StringBuffer();
- PropertyExpression left=null;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ID:
+ PropertyExpression<E> left=null;
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case ID:{
t = jj_consume_token(ID);
- left = _factory.createPropertyExpression(t.image);
+left = _factory.createPropertyExpression(t.image);
break;
- case QUOTED_ID:
+ }
+ case QUOTED_ID:{
t = jj_consume_token(QUOTED_ID);
- // Decode the sting value.
+// Decode the sting value.
String image = t.image;
for( int i=1; i < image.length()-1; i++ ) {
char c = image.charAt(i);
@@ -568,106 +591,120 @@ public class SelectorParser<E> implements SelectorParserConstants {
}
rc.append(c);
}
- {if (true) return _factory.createPropertyExpression(rc.toString());}
+ {if ("" != null) return _factory.createPropertyExpression(rc.toString());}
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- private boolean jj_2_1(int xla) {
+ private boolean jj_2_1(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_1(); }
+ try { return (!jj_3_1()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_2(int xla) {
+ private boolean jj_2_2(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_2(); }
+ try { return (!jj_3_2()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_3(int xla) {
+ private boolean jj_2_3(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_3(); }
+ try { return (!jj_3_3()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_4(int xla) {
+ private boolean jj_2_4(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_4(); }
+ try { return (!jj_3_4()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_5(int xla) {
+ private boolean jj_2_5(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_5(); }
+ try { return (!jj_3_5()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_6(int xla) {
+ private boolean jj_2_6(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_6(); }
+ try { return (!jj_3_6()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_7(int xla) {
+ private boolean jj_2_7(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_7(); }
+ try { return (!jj_3_7()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_8(int xla) {
+ private boolean jj_2_8(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_8(); }
+ try { return (!jj_3_8()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_9(int xla) {
+ private boolean jj_2_9(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_9(); }
+ try { return (!jj_3_9()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_10(int xla) {
+ private boolean jj_2_10(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_10(); }
+ try { return (!jj_3_10()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_11(int xla) {
+ private boolean jj_2_11(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_11(); }
+ try { return (!jj_3_11()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_12(int xla) {
+ private boolean jj_2_12(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_12(); }
+ try { return (!jj_3_12()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_3R_38() {
+ private boolean jj_3R_literal_468_5_38()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_47()) {
+ if (jj_3R_literal_469_9_47()) {
jj_scanpos = xsp;
- if (jj_3R_48()) {
+ if (jj_3R_literal_476_9_48()) {
jj_scanpos = xsp;
- if (jj_3R_49()) {
+ if (jj_3R_literal_483_9_49()) {
jj_scanpos = xsp;
- if (jj_3R_50()) {
+ if (jj_3R_literal_490_9_50()) {
jj_scanpos = xsp;
- if (jj_3R_51()) {
+ if (jj_3R_literal_497_9_51()) {
jj_scanpos = xsp;
- if (jj_3R_52()) {
+ if (jj_3R_literal_504_9_52()) {
jj_scanpos = xsp;
- if (jj_3R_53()) {
+ if (jj_3R_literal_511_9_53()) {
jj_scanpos = xsp;
- if (jj_3R_54()) return true;
+ if (jj_3R_literal_518_9_54()) return true;
}
}
}
@@ -678,72 +715,81 @@ public class SelectorParser<E> implements SelectorParserConstants {
return false;
}
- private boolean jj_3R_9() {
- if (jj_3R_10()) return true;
+ private boolean jj_3R_comparisonExpression_277_5_9()
+ {
+ if (jj_3R_addExpression_365_5_10()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_26()) { jj_scanpos = xsp; break; }
+ if (jj_3R_comparisonExpression_279_9_26()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_39() {
+ private boolean jj_3R_variable_560_5_39()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_55()) {
+ if (jj_3R_variable_561_9_55()) {
jj_scanpos = xsp;
- if (jj_3R_56()) return true;
+ if (jj_3R_variable_566_9_56()) return true;
}
return false;
}
- private boolean jj_3R_10() {
- if (jj_3R_11()) return true;
+ private boolean jj_3R_addExpression_365_5_10()
+ {
+ if (jj_3R_multExpr_391_5_11()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_31()) { jj_scanpos = xsp; break; }
+ if (jj_3R_addExpression_367_13_31()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3_12() {
+ private boolean jj_3_12()
+ {
if (jj_scan_token(33)) return true;
- if (jj_3R_14()) return true;
+ if (jj_3R_orExpression_203_5_14()) return true;
if (jj_scan_token(35)) return true;
return false;
}
- private boolean jj_3R_30() {
- if (jj_3R_39()) return true;
+ private boolean jj_3R_primaryExpr_452_9_30()
+ {
+ if (jj_3R_variable_560_5_39()) return true;
return false;
}
- private boolean jj_3R_29() {
- if (jj_3R_38()) return true;
+ private boolean jj_3R_primaryExpr_450_9_29()
+ {
+ if (jj_3R_literal_468_5_38()) return true;
return false;
}
- private boolean jj_3R_28() {
+ private boolean jj_3R_equalityExpression_256_9_28()
+ {
if (jj_scan_token(IS)) return true;
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(NULL)) return true;
return false;
}
- private boolean jj_3_11() {
+ private boolean jj_3_11()
+ {
if (jj_scan_token(NOT)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3R_25() {
+ private boolean jj_3R_primaryExpr_449_5_25()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_29()) {
+ if (jj_3R_primaryExpr_450_9_29()) {
jj_scanpos = xsp;
- if (jj_3R_30()) {
+ if (jj_3R_primaryExpr_452_9_30()) {
jj_scanpos = xsp;
if (jj_3_12()) return true;
}
@@ -751,164 +797,185 @@ public class SelectorParser<E> implements SelectorParserConstants {
return false;
}
- private boolean jj_3R_46() {
+ private boolean jj_3R_comparisonExpression_345_11_46()
+ {
if (jj_scan_token(34)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
return false;
}
- private boolean jj_3R_44() {
+ private boolean jj_3R_comparisonExpression_311_44_44()
+ {
if (jj_scan_token(ESCAPE)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
return false;
}
- private boolean jj_3_2() {
+ private boolean jj_3_2()
+ {
if (jj_scan_token(IS)) return true;
if (jj_scan_token(NULL)) return true;
return false;
}
- private boolean jj_3R_20() {
- if (jj_3R_25()) return true;
+ private boolean jj_3R_unaryExpr_437_13_20()
+ {
+ if (jj_3R_primaryExpr_449_5_25()) return true;
return false;
}
- private boolean jj_3R_42() {
+ private boolean jj_3R_stringLiteral_537_5_42()
+ {
if (jj_scan_token(STRING_LITERAL)) return true;
return false;
}
- private boolean jj_3_10() {
+ private boolean jj_3_10()
+ {
if (jj_scan_token(NOT)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_equalityExpression_239_5_13()) return true;
return false;
}
- private boolean jj_3R_27() {
+ private boolean jj_3R_equalityExpression_246_9_27()
+ {
if (jj_scan_token(28)) return true;
- if (jj_3R_9()) return true;
+ if (jj_3R_comparisonExpression_277_5_9()) return true;
return false;
}
- private boolean jj_3R_19() {
+ private boolean jj_3R_unaryExpr_432_13_19()
+ {
if (jj_scan_token(NOT)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3_6() {
+ private boolean jj_3_6()
+ {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(IN)) return true;
if (jj_scan_token(33)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_46()) { jj_scanpos = xsp; break; }
+ if (jj_3R_comparisonExpression_345_11_46()) { jj_scanpos = xsp; break; }
}
if (jj_scan_token(35)) return true;
return false;
}
- private boolean jj_3_9() {
+ private boolean jj_3_9()
+ {
if (jj_scan_token(36)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3_1() {
+ private boolean jj_3_1()
+ {
if (jj_scan_token(27)) return true;
- if (jj_3R_9()) return true;
+ if (jj_3R_comparisonExpression_277_5_9()) return true;
return false;
}
- private boolean jj_3R_21() {
+ private boolean jj_3R_equalityExpression_241_9_21()
+ {
Token xsp;
xsp = jj_scanpos;
if (jj_3_1()) {
jj_scanpos = xsp;
- if (jj_3R_27()) {
+ if (jj_3R_equalityExpression_246_9_27()) {
jj_scanpos = xsp;
if (jj_3_2()) {
jj_scanpos = xsp;
- if (jj_3R_28()) return true;
+ if (jj_3R_equalityExpression_256_9_28()) return true;
}
}
}
return false;
}
- private boolean jj_3R_45() {
+ private boolean jj_3R_comparisonExpression_331_11_45()
+ {
if (jj_scan_token(34)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
return false;
}
- private boolean jj_3R_18() {
+ private boolean jj_3R_unaryExpr_427_9_18()
+ {
if (jj_scan_token(NOT)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_equalityExpression_239_5_13()) return true;
return false;
}
- private boolean jj_3R_43() {
+ private boolean jj_3R_comparisonExpression_302_38_43()
+ {
if (jj_scan_token(ESCAPE)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
return false;
}
- private boolean jj_3R_17() {
+ private boolean jj_3R_unaryExpr_422_13_17()
+ {
if (jj_scan_token(37)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3R_13() {
- if (jj_3R_9()) return true;
+ private boolean jj_3R_equalityExpression_239_5_13()
+ {
+ if (jj_3R_comparisonExpression_277_5_9()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_21()) { jj_scanpos = xsp; break; }
+ if (jj_3R_equalityExpression_241_9_21()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_16() {
+ private boolean jj_3R_unaryExpr_420_13_16()
+ {
if (jj_scan_token(36)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3R_54() {
+ private boolean jj_3R_literal_518_9_54()
+ {
if (jj_scan_token(NULL)) return true;
return false;
}
- private boolean jj_3R_37() {
+ private boolean jj_3R_comparisonExpression_326_9_37()
+ {
if (jj_scan_token(IN)) return true;
if (jj_scan_token(33)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_45()) { jj_scanpos = xsp; break; }
+ if (jj_3R_comparisonExpression_331_11_45()) { jj_scanpos = xsp; break; }
}
if (jj_scan_token(35)) return true;
return false;
}
- private boolean jj_3R_12() {
+ private boolean jj_3R_unaryExpr_419_9_12()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_16()) {
+ if (jj_3R_unaryExpr_420_13_16()) {
jj_scanpos = xsp;
- if (jj_3R_17()) {
+ if (jj_3R_unaryExpr_422_13_17()) {
jj_scanpos = xsp;
- if (jj_3R_18()) {
+ if (jj_3R_unaryExpr_427_9_18()) {
jj_scanpos = xsp;
- if (jj_3R_19()) {
+ if (jj_3R_unaryExpr_432_13_19()) {
jj_scanpos = xsp;
- if (jj_3R_20()) return true;
+ if (jj_3R_unaryExpr_437_13_20()) return true;
}
}
}
@@ -916,222 +983,251 @@ public class SelectorParser<E> implements SelectorParserConstants {
return false;
}
- private boolean jj_3R_53() {
+ private boolean jj_3R_literal_511_9_53()
+ {
if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3_5() {
+ private boolean jj_3_5()
+ {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(BETWEEN)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
if (jj_scan_token(AND)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
return false;
}
- private boolean jj_3R_58() {
+ private boolean jj_3R_andExpression_223_9_58()
+ {
if (jj_scan_token(AND)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_equalityExpression_239_5_13()) return true;
return false;
}
- private boolean jj_3R_36() {
+ private boolean jj_3R_comparisonExpression_316_9_36()
+ {
if (jj_scan_token(BETWEEN)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
if (jj_scan_token(AND)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
return false;
}
- private boolean jj_3R_52() {
+ private boolean jj_3R_literal_504_9_52()
+ {
if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_22() {
- if (jj_3R_13()) return true;
+ private boolean jj_3R_andExpression_221_5_22()
+ {
+ if (jj_3R_equalityExpression_239_5_13()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_58()) { jj_scanpos = xsp; break; }
+ if (jj_3R_andExpression_223_9_58()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_24() {
+ private boolean jj_3R_multExpr_403_9_24()
+ {
if (jj_scan_token(40)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3R_51() {
+ private boolean jj_3R_literal_497_9_51()
+ {
if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
return false;
}
- private boolean jj_3_4() {
+ private boolean jj_3_4()
+ {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(LIKE)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_44()) jj_scanpos = xsp;
+ if (jj_3R_comparisonExpression_311_44_44()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3R_23() {
+ private boolean jj_3R_multExpr_398_9_23()
+ {
if (jj_scan_token(39)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3R_57() {
+ private boolean jj_3R_orExpression_205_9_57()
+ {
if (jj_scan_token(OR)) return true;
- if (jj_3R_22()) return true;
+ if (jj_3R_andExpression_221_5_22()) return true;
return false;
}
- private boolean jj_3R_50() {
+ private boolean jj_3R_literal_490_9_50()
+ {
if (jj_scan_token(OCTAL_LITERAL)) return true;
return false;
}
- private boolean jj_3R_35() {
+ private boolean jj_3R_comparisonExpression_299_9_35()
+ {
if (jj_scan_token(LIKE)) return true;
- if (jj_3R_42()) return true;
+ if (jj_3R_stringLiteral_537_5_42()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_43()) jj_scanpos = xsp;
+ if (jj_3R_comparisonExpression_302_38_43()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3_8() {
+ private boolean jj_3_8()
+ {
if (jj_scan_token(38)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_unaryExpr_419_9_12()) return true;
return false;
}
- private boolean jj_3R_15() {
+ private boolean jj_3R_multExpr_393_9_15()
+ {
Token xsp;
xsp = jj_scanpos;
if (jj_3_8()) {
jj_scanpos = xsp;
- if (jj_3R_23()) {
+ if (jj_3R_multExpr_398_9_23()) {
jj_scanpos = xsp;
- if (jj_3R_24()) return true;
+ if (jj_3R_multExpr_403_9_24()) return true;
}
}
return false;
}
- private boolean jj_3R_34() {
+ private boolean jj_3R_comparisonExpression_294_9_34()
+ {
if (jj_scan_token(32)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
return false;
}
- private boolean jj_3R_14() {
- if (jj_3R_22()) return true;
+ private boolean jj_3R_orExpression_203_5_14()
+ {
+ if (jj_3R_andExpression_221_5_22()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_57()) { jj_scanpos = xsp; break; }
+ if (jj_3R_orExpression_205_9_57()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_49() {
+ private boolean jj_3R_literal_483_9_49()
+ {
if (jj_scan_token(HEX_LITERAL)) return true;
return false;
}
- private boolean jj_3R_11() {
- if (jj_3R_12()) return true;
+ private boolean jj_3R_multExpr_391_5_11()
+ {
+ if (jj_3R_unaryExpr_419_9_12()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_15()) { jj_scanpos = xsp; break; }
+ if (jj_3R_multExpr_393_9_15()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_33() {
+ private boolean jj_3R_comparisonExpression_289_9_33()
+ {
if (jj_scan_token(31)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
return false;
}
- private boolean jj_3R_41() {
+ private boolean jj_3R_addExpression_374_17_41()
+ {
if (jj_scan_token(37)) return true;
- if (jj_3R_11()) return true;
+ if (jj_3R_multExpr_391_5_11()) return true;
return false;
}
- private boolean jj_3_7() {
+ private boolean jj_3_7()
+ {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(36)) {
jj_scanpos = xsp;
if (jj_scan_token(37)) return true;
}
- if (jj_3R_11()) return true;
+ if (jj_3R_multExpr_391_5_11()) return true;
return false;
}
- private boolean jj_3R_48() {
+ private boolean jj_3R_literal_476_9_48()
+ {
if (jj_scan_token(DECIMAL_LITERAL)) return true;
return false;
}
- private boolean jj_3R_32() {
+ private boolean jj_3R_comparisonExpression_284_9_32()
+ {
if (jj_scan_token(30)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
return false;
}
- private boolean jj_3R_40() {
+ private boolean jj_3R_addExpression_369_17_40()
+ {
if (jj_scan_token(36)) return true;
- if (jj_3R_11()) return true;
+ if (jj_3R_multExpr_391_5_11()) return true;
return false;
}
- private boolean jj_3R_56() {
+ private boolean jj_3R_variable_566_9_56()
+ {
if (jj_scan_token(QUOTED_ID)) return true;
return false;
}
- private boolean jj_3R_47() {
- if (jj_3R_42()) return true;
+ private boolean jj_3R_literal_469_9_47()
+ {
+ if (jj_3R_stringLiteral_537_5_42()) return true;
return false;
}
- private boolean jj_3_3() {
+ private boolean jj_3_3()
+ {
if (jj_scan_token(29)) return true;
- if (jj_3R_10()) return true;
+ if (jj_3R_addExpression_365_5_10()) return true;
return false;
}
- private boolean jj_3R_26() {
+ private boolean jj_3R_comparisonExpression_279_9_26()
+ {
Token xsp;
xsp = jj_scanpos;
if (jj_3_3()) {
jj_scanpos = xsp;
- if (jj_3R_32()) {
+ if (jj_3R_comparisonExpression_284_9_32()) {
jj_scanpos = xsp;
- if (jj_3R_33()) {
+ if (jj_3R_comparisonExpression_289_9_33()) {
jj_scanpos = xsp;
- if (jj_3R_34()) {
+ if (jj_3R_comparisonExpression_294_9_34()) {
jj_scanpos = xsp;
- if (jj_3R_35()) {
+ if (jj_3R_comparisonExpression_299_9_35()) {
jj_scanpos = xsp;
if (jj_3_4()) {
jj_scanpos = xsp;
- if (jj_3R_36()) {
+ if (jj_3R_comparisonExpression_316_9_36()) {
jj_scanpos = xsp;
if (jj_3_5()) {
jj_scanpos = xsp;
- if (jj_3R_37()) {
+ if (jj_3R_comparisonExpression_326_9_37()) {
jj_scanpos = xsp;
if (jj_3_6()) return true;
}
@@ -1146,17 +1242,19 @@ public class SelectorParser<E> implements SelectorParserConstants {
return false;
}
- private boolean jj_3R_55() {
+ private boolean jj_3R_variable_561_9_55()
+ {
if (jj_scan_token(ID)) return true;
return false;
}
- private boolean jj_3R_31() {
+ private boolean jj_3R_addExpression_367_13_31()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_40()) {
+ if (jj_3R_addExpression_369_17_40()) {
jj_scanpos = xsp;
- if (jj_3R_41()) return true;
+ if (jj_3R_addExpression_374_17_41()) return true;
}
return false;
}
@@ -1174,120 +1272,141 @@ public class SelectorParser<E> implements SelectorParserConstants {
/** Constructor with InputStream. */
public SelectorParser(java.io.InputStream stream) {
- this(stream, null);
+ this(stream, null);
}
/** Constructor with InputStream and supplied encoding */
public SelectorParser(java.io.InputStream stream, String encoding) {
- try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
- token_source = new SelectorParserTokenManager(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+ token_source = new SelectorParserTokenManager(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Reinitialise. */
public void ReInit(java.io.InputStream stream) {
- ReInit(stream, null);
+ ReInit(stream, null);
}
/** Reinitialise. */
public void ReInit(java.io.InputStream stream, String encoding) {
- try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
- token_source.ReInit(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+ token_source.ReInit(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Constructor. */
public SelectorParser(java.io.Reader stream) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
- token_source = new SelectorParserTokenManager(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ token_source = new SelectorParserTokenManager(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Reinitialise. */
public void ReInit(java.io.Reader stream) {
- jj_input_stream.ReInit(stream, 1, 1);
- token_source.ReInit(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ } else {
+ jj_input_stream.ReInit(stream, 1, 1);
+ }
+ if (token_source == null) {
+ token_source = new SelectorParserTokenManager(jj_input_stream);
+ }
+
+ token_source.ReInit(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Constructor with generated Token Manager. */
public SelectorParser(SelectorParserTokenManager tm) {
- token_source = tm;
- token = new Token();
- jj_ntk = -1;
+ token_source = tm;
+ token = new Token();
+ jj_ntk = -1;
}
/** Reinitialise. */
public void ReInit(SelectorParserTokenManager tm) {
- token_source = tm;
- token = new Token();
- jj_ntk = -1;
+ token_source = tm;
+ token = new Token();
+ jj_ntk = -1;
}
private Token jj_consume_token(int kind) throws ParseException {
- Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
- jj_ntk = -1;
- if (token.kind == kind) {
- return token;
+ Token oldToken;
+ if ((oldToken = token).next != null) token = token.next;
+ else token = token.next = token_source.getNextToken();
+ jj_ntk = -1;
+ if (token.kind == kind) {
+ return token;
+ }
+ token = oldToken;
+ throw generateParseException();
+ }
+
+ @SuppressWarnings("serial")
+ static private final class LookaheadSuccess extends Error {
+ @Override
+ public Throwable fillInStackTrace() {
+ return this;
}
- token = oldToken;
- throw generateParseException();
}
-
- static private final class LookaheadSuccess extends Error { }
- final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+ static private final LookaheadSuccess jj_ls = new LookaheadSuccess();
private boolean jj_scan_token(int kind) {
- if (jj_scanpos == jj_lastpos) {
- jj_la--;
- if (jj_scanpos.next == null) {
- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
- } else {
- jj_lastpos = jj_scanpos = jj_scanpos.next;
- }
- } else {
- jj_scanpos = jj_scanpos.next;
- }
- if (jj_scanpos.kind != kind) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
- return false;
+ if (jj_scanpos == jj_lastpos) {
+ jj_la--;
+ if (jj_scanpos.next == null) {
+ jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+ } else {
+ jj_lastpos = jj_scanpos = jj_scanpos.next;
+ }
+ } else {
+ jj_scanpos = jj_scanpos.next;
+ }
+ if (jj_scanpos.kind != kind) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
+ return false;
}
/** Get the next Token. */
final public Token getNextToken() {
- if (token.next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
- jj_ntk = -1;
- return token;
+ if (token.next != null) token = token.next;
+ else token = token.next = token_source.getNextToken();
+ jj_ntk = -1;
+ return token;
}
/** Get the specific Token. */
final public Token getToken(int index) {
- Token t = token;
- for (int i = 0; i < index; i++) {
- if (t.next != null) t = t.next;
- else t = t.next = token_source.getNextToken();
- }
- return t;
+ Token t = token;
+ for (int i = 0; i < index; i++) {
+ if (t.next != null) t = t.next;
+ else t = t.next = token_source.getNextToken();
+ }
+ return t;
}
- private int jj_ntk() {
- if ((jj_nt=token.next) == null)
- return (jj_ntk = (token.next=token_source.getNextToken()).kind);
- else
- return (jj_ntk = jj_nt.kind);
+ private int jj_ntk_f() {
+ if ((jj_nt=token.next) == null)
+ return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+ else
+ return (jj_ntk = jj_nt.kind);
}
/** Generate ParseException. */
public ParseException generateParseException() {
- Token errortok = token.next;
- int line = errortok.beginLine, column = errortok.beginColumn;
- String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image;
- return new ParseException("Parse error at line " + line + ", column " + column + ". Encountered: " + mess);
+ Token errortok = token.next;
+ int line = errortok.beginLine, column = errortok.beginColumn;
+ String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image;
+ return new ParseException("Parse error at line " + line + ", column " + column + ". Encountered: " + mess);
+ }
+
+ private boolean trace_enabled;
+
+/** Trace enabled. */
+ final public boolean trace_enabled() {
+ return trace_enabled;
}
/** Enable tracing. */
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParserTokenManager.java b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParserTokenManager.java
index 73e0db2152..633a760aa5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParserTokenManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParserTokenManager.java
@@ -1,3 +1,4 @@
+/* SelectorParserTokenManager.java */
/* Generated By:JavaCC: Do not edit this line. SelectorParserTokenManager.java */
/*
*
@@ -34,8 +35,8 @@ import org.apache.qpid.server.filter.PropertyExpressionFactory;
import org.apache.qpid.server.filter.UnaryExpression;
/** Token Manager. */
-public class SelectorParserTokenManager implements SelectorParserConstants
-{
+@SuppressWarnings ("unused")
+public class SelectorParserTokenManager implements SelectorParserConstants {
/** Debug output. */
public java.io.PrintStream debugStream = System.out;
@@ -47,8 +48,7 @@ private int jjStopAtPos(int pos, int kind)
jjmatchedPos = pos;
return pos + 1;
}
-private int jjMoveStringLiteralDfa0_0()
-{
+private int jjMoveStringLiteralDfa0_0(){
switch(curChar)
{
case 9:
@@ -139,8 +139,7 @@ private int jjMoveStringLiteralDfa0_0()
return jjMoveNfa_0(5, 0);
}
}
-private int jjMoveStringLiteralDfa1_0(long active0)
-{
+private int jjMoveStringLiteralDfa1_0(long active0){
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
return jjMoveNfa_0(5, 0);
@@ -233,8 +232,7 @@ private int jjMoveStringLiteralDfa1_0(long active0)
}
return jjMoveNfa_0(5, 1);
}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa2_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 1);
try { curChar = input_stream.readChar(); }
@@ -292,8 +290,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0)
}
return jjMoveNfa_0(5, 2);
}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa3_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 2);
try { curChar = input_stream.readChar(); }
@@ -357,8 +354,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0)
}
return jjMoveNfa_0(5, 3);
}
-private int jjMoveStringLiteralDfa4_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa4_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 3);
try { curChar = input_stream.readChar(); }
@@ -390,8 +386,7 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0)
}
return jjMoveNfa_0(5, 4);
}
-private int jjMoveStringLiteralDfa5_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa5_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 4);
try { curChar = input_stream.readChar(); }
@@ -419,8 +414,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0)
}
return jjMoveNfa_0(5, 5);
}
-private int jjMoveStringLiteralDfa6_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa6_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 5);
try { curChar = input_stream.readChar(); }
@@ -481,19 +475,19 @@ private int jjMoveNfa_0(int startState, int curPos)
{
case 5:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(0, 3);
+ { jjCheckNAddStates(0, 3); }
else if (curChar == 34)
- jjCheckNAddStates(4, 6);
+ { jjCheckNAddStates(4, 6); }
else if (curChar == 36)
{
if (kind > 25)
kind = 25;
- jjCheckNAdd(27);
+ { jjCheckNAdd(27); }
}
else if (curChar == 39)
- jjCheckNAddStates(7, 9);
+ { jjCheckNAddStates(7, 9); }
else if (curChar == 46)
- jjCheckNAdd(17);
+ { jjCheckNAdd(17); }
else if (curChar == 47)
jjstateSet[jjnewStateCnt++] = 6;
else if (curChar == 45)
@@ -502,22 +496,22 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 19)
kind = 19;
- jjCheckNAddTwoStates(14, 15);
+ { jjCheckNAddTwoStates(14, 15); }
}
else if (curChar == 48)
{
if (kind > 21)
kind = 21;
- jjCheckNAddTwoStates(45, 47);
+ { jjCheckNAddTwoStates(45, 47); }
}
break;
case 0:
if (curChar == 45)
- jjCheckNAddStates(10, 12);
+ { jjCheckNAddStates(10, 12); }
break;
case 1:
if ((0xffffffffffffdbffL & l) != 0L)
- jjCheckNAddStates(10, 12);
+ { jjCheckNAddStates(10, 12); }
break;
case 2:
if ((0x2400L & l) != 0L && kind > 6)
@@ -533,23 +527,23 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 6:
if (curChar == 42)
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 7:
if ((0xfffffbffffffffffL & l) != 0L)
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 8:
if (curChar == 42)
- jjCheckNAddStates(13, 15);
+ { jjCheckNAddStates(13, 15); }
break;
case 9:
if ((0xffff7bffffffffffL & l) != 0L)
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 10:
if ((0xfffffbffffffffffL & l) != 0L)
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 11:
if (curChar == 47 && kind > 7)
@@ -564,41 +558,41 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 19)
kind = 19;
- jjCheckNAddTwoStates(14, 15);
+ { jjCheckNAddTwoStates(14, 15); }
break;
case 14:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 19)
kind = 19;
- jjCheckNAddTwoStates(14, 15);
+ { jjCheckNAddTwoStates(14, 15); }
break;
case 16:
if (curChar == 46)
- jjCheckNAdd(17);
+ { jjCheckNAdd(17); }
break;
case 17:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 22)
kind = 22;
- jjCheckNAddTwoStates(17, 18);
+ { jjCheckNAddTwoStates(17, 18); }
break;
case 19:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(20);
+ { jjCheckNAdd(20); }
break;
case 20:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 22)
kind = 22;
- jjCheckNAdd(20);
+ { jjCheckNAdd(20); }
break;
case 21:
case 22:
if (curChar == 39)
- jjCheckNAddStates(7, 9);
+ { jjCheckNAddStates(7, 9); }
break;
case 23:
if (curChar == 39)
@@ -606,7 +600,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 24:
if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(7, 9);
+ { jjCheckNAddStates(7, 9); }
break;
case 25:
if (curChar == 39 && kind > 24)
@@ -617,19 +611,19 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 25)
kind = 25;
- jjCheckNAdd(27);
+ { jjCheckNAdd(27); }
break;
case 27:
if ((0x3ff001000000000L & l) == 0L)
break;
if (kind > 25)
kind = 25;
- jjCheckNAdd(27);
+ { jjCheckNAdd(27); }
break;
case 28:
case 29:
if (curChar == 34)
- jjCheckNAddStates(4, 6);
+ { jjCheckNAddStates(4, 6); }
break;
case 30:
if (curChar == 34)
@@ -637,7 +631,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 31:
if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(4, 6);
+ { jjCheckNAddStates(4, 6); }
break;
case 32:
if (curChar == 34 && kind > 26)
@@ -645,58 +639,58 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 33:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(0, 3);
+ { jjCheckNAddStates(0, 3); }
break;
case 34:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(34, 35);
+ { jjCheckNAddTwoStates(34, 35); }
break;
case 35:
if (curChar != 46)
break;
if (kind > 22)
kind = 22;
- jjCheckNAddTwoStates(36, 37);
+ { jjCheckNAddTwoStates(36, 37); }
break;
case 36:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 22)
kind = 22;
- jjCheckNAddTwoStates(36, 37);
+ { jjCheckNAddTwoStates(36, 37); }
break;
case 38:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(39);
+ { jjCheckNAdd(39); }
break;
case 39:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 22)
kind = 22;
- jjCheckNAdd(39);
+ { jjCheckNAdd(39); }
break;
case 40:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(40, 41);
+ { jjCheckNAddTwoStates(40, 41); }
break;
case 42:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(43);
+ { jjCheckNAdd(43); }
break;
case 43:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 22)
kind = 22;
- jjCheckNAdd(43);
+ { jjCheckNAdd(43); }
break;
case 44:
if (curChar != 48)
break;
if (kind > 21)
kind = 21;
- jjCheckNAddTwoStates(45, 47);
+ { jjCheckNAddTwoStates(45, 47); }
break;
case 46:
if ((0x3ff000000000000L & l) == 0L)
@@ -710,7 +704,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 21)
kind = 21;
- jjCheckNAdd(47);
+ { jjCheckNAdd(47); }
break;
default : break;
}
@@ -729,17 +723,17 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 25)
kind = 25;
- jjCheckNAdd(27);
+ { jjCheckNAdd(27); }
break;
case 1:
- jjAddStates(10, 12);
+ { jjAddStates(10, 12); }
break;
case 7:
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 9:
case 10:
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 15:
if ((0x100000001000L & l) != 0L && kind > 19)
@@ -747,32 +741,32 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 18:
if ((0x2000000020L & l) != 0L)
- jjAddStates(16, 17);
+ { jjAddStates(16, 17); }
break;
case 24:
- jjAddStates(7, 9);
+ { jjAddStates(7, 9); }
break;
case 31:
- jjAddStates(4, 6);
+ { jjAddStates(4, 6); }
break;
case 37:
if ((0x2000000020L & l) != 0L)
- jjAddStates(18, 19);
+ { jjAddStates(18, 19); }
break;
case 41:
if ((0x2000000020L & l) != 0L)
- jjAddStates(20, 21);
+ { jjAddStates(20, 21); }
break;
case 45:
if ((0x100000001000000L & l) != 0L)
- jjCheckNAdd(46);
+ { jjCheckNAdd(46); }
break;
case 46:
if ((0x7e0000007eL & l) == 0L)
break;
if (kind > 20)
kind = 20;
- jjCheckNAdd(46);
+ { jjCheckNAdd(46); }
break;
default : break;
}
@@ -780,7 +774,7 @@ private int jjMoveNfa_0(int startState, int curPos)
}
else
{
- int hiByte = (int)(curChar >> 8);
+ int hiByte = (curChar >> 8);
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
@@ -791,26 +785,26 @@ private int jjMoveNfa_0(int startState, int curPos)
{
case 1:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(10, 12);
+ { jjAddStates(10, 12); }
break;
case 7:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 9:
case 10:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 24:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(7, 9);
+ { jjAddStates(7, 9); }
break;
case 31:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(4, 6);
+ { jjAddStates(4, 6); }
break;
- default : break;
+ default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;
}
} while(i != startsAt);
}
@@ -846,22 +840,6 @@ private int jjMoveNfa_0(int startState, int curPos)
return toRet;
}
-static final int[] jjnextStates = {
- 34, 35, 40, 41, 30, 31, 32, 23, 24, 25, 1, 2, 4, 8, 9, 11,
- 19, 20, 38, 39, 42, 43,
-};
-private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
-{
- switch(hiByte)
- {
- case 0:
- return ((jjbitVec2[i2] & l2) != 0L);
- default :
- if ((jjbitVec0[i1] & l1) != 0L)
- return true;
- return false;
- }
-}
/** Token literal values. */
public static final String[] jjstrLiteralImages = {
@@ -869,69 +847,6 @@ public static final String[] jjstrLiteralImages = {
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
"\75", "\74\76", "\76", "\76\75", "\74", "\74\75", "\50", "\54", "\51", "\53", "\55",
"\52", "\57", "\45", };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
- "DEFAULT",
-};
-static final long[] jjtoToken = {
- 0x1ffff7fff01L,
-};
-static final long[] jjtoSkip = {
- 0xfeL,
-};
-static final long[] jjtoSpecial = {
- 0x3eL,
-};
-protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[48];
-private final int[] jjstateSet = new int[96];
-protected char curChar;
-/** Constructor. */
-public SelectorParserTokenManager(SimpleCharStream stream){
- if (SimpleCharStream.staticFlag)
- throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
- input_stream = stream;
-}
-
-/** Constructor. */
-public SelectorParserTokenManager(SimpleCharStream stream, int lexState){
- this(stream);
- SwitchTo(lexState);
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream)
-{
- jjmatchedPos = jjnewStateCnt = 0;
- curLexState = defaultLexState;
- input_stream = stream;
- ReInitRounds();
-}
-private void ReInitRounds()
-{
- int i;
- jjround = 0x80000001;
- for (i = 48; i-- > 0;)
- jjrounds[i] = 0x80000000;
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream, int lexState)
-{
- ReInit(stream);
- SwitchTo(lexState);
-}
-
-/** Switch to specified lex state. */
-public void SwitchTo(int lexState)
-{
- if (lexState >= 1 || lexState < 0)
- throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
- else
- curLexState = lexState;
-}
-
protected Token jjFillToken()
{
final Token t;
@@ -955,6 +870,22 @@ protected Token jjFillToken()
return t;
}
+static final int[] jjnextStates = {
+ 34, 35, 40, 41, 30, 31, 32, 23, 24, 25, 1, 2, 4, 8, 9, 11,
+ 19, 20, 38, 39, 42, 43,
+};
+private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
+{
+ switch(hiByte)
+ {
+ case 0:
+ return ((jjbitVec2[i2] & l2) != 0L);
+ default :
+ if ((jjbitVec0[i1] & l1) != 0L)
+ return true;
+ return false;
+ }
+}
int curLexState = 0;
int defaultLexState = 0;
@@ -977,9 +908,10 @@ public Token getNextToken()
{
curChar = input_stream.BeginToken();
}
- catch(java.io.IOException e)
+ catch(Exception e)
{
jjmatchedKind = 0;
+ jjmatchedPos = -1;
matchedToken = jjFillToken();
matchedToken.specialToken = specialToken;
return matchedToken;
@@ -1037,6 +969,31 @@ public Token getNextToken()
}
}
+void SkipLexicalActions(Token matchedToken)
+{
+ switch(jjmatchedKind)
+ {
+ default :
+ break;
+ }
+}
+void MoreLexicalActions()
+{
+ jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
+ switch(jjmatchedKind)
+ {
+ default :
+ break;
+ }
+}
+void TokenLexicalActions(Token matchedToken)
+{
+ switch(jjmatchedKind)
+ {
+ default :
+ break;
+ }
+}
private void jjCheckNAdd(int state)
{
if (jjrounds[state] != jjround)
@@ -1064,4 +1021,90 @@ private void jjCheckNAddStates(int start, int end)
} while (start++ != end);
}
+ /** Constructor. */
+ public SelectorParserTokenManager(SimpleCharStream stream){
+
+ if (SimpleCharStream.staticFlag)
+ throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+
+ input_stream = stream;
+ }
+
+ /** Constructor. */
+ public SelectorParserTokenManager (SimpleCharStream stream, int lexState){
+ ReInit(stream);
+ SwitchTo(lexState);
+ }
+
+ /** Reinitialise parser. */
+
+ public void ReInit(SimpleCharStream stream)
+ {
+
+
+ jjmatchedPos =
+ jjnewStateCnt =
+ 0;
+ curLexState = defaultLexState;
+ input_stream = stream;
+ ReInitRounds();
+ }
+
+ private void ReInitRounds()
+ {
+ int i;
+ jjround = 0x80000001;
+ for (i = 48; i-- > 0;)
+ jjrounds[i] = 0x80000000;
+ }
+
+ /** Reinitialise parser. */
+ public void ReInit(SimpleCharStream stream, int lexState)
+
+ {
+ ReInit(stream);
+ SwitchTo(lexState);
+ }
+
+ /** Switch to specified lex state. */
+ public void SwitchTo(int lexState)
+ {
+ if (lexState >= 1 || lexState < 0)
+ throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+ else
+ curLexState = lexState;
+ }
+
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+ "DEFAULT",
+};
+
+/** Lex State array. */
+public static final int[] jjnewLexState = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+};
+static final long[] jjtoToken = {
+ 0x1ffff7fff01L,
+};
+static final long[] jjtoSkip = {
+ 0xfeL,
+};
+static final long[] jjtoSpecial = {
+ 0x3eL,
+};
+static final long[] jjtoMore = {
+ 0x0L,
+};
+ protected SimpleCharStream input_stream;
+
+ private final int[] jjrounds = new int[48];
+ private final int[] jjstateSet = new int[2 * 48];
+ private final StringBuilder jjimage = new StringBuilder();
+ private StringBuilder image = jjimage;
+ private int jjimageLen;
+ private int lengthOfMatch;
+ protected int curChar;
}
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SimpleCharStream.java b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SimpleCharStream.java
index 7e41554f43..55a2814679 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SimpleCharStream.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/SimpleCharStream.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */
/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
/*
*
@@ -51,10 +51,12 @@ public class SimpleCharStream
protected char[] buffer;
protected int maxNextCharInd = 0;
protected int inBuf = 0;
- protected int tabSize = 8;
+ protected int tabSize = 1;
+ protected boolean trackLineColumn = true;
+
+ public void setTabSize(int i) { tabSize = i; }
+ public int getTabSize() { return tabSize; }
- protected void setTabSize(int i) { tabSize = i; }
- protected int getTabSize(int i) { return tabSize; }
protected void ExpandBuff(boolean wrapAround)
@@ -222,22 +224,20 @@ public class SimpleCharStream
return c;
}
- @Deprecated
/**
* @deprecated
* @see #getEndColumn
*/
-
+ @Deprecated
public int getColumn() {
return bufcolumn[bufpos];
}
- @Deprecated
/**
* @deprecated
* @see #getEndLine
*/
-
+ @Deprecated
public int getLine() {
return bufline[bufpos];
}
@@ -487,6 +487,7 @@ public class SimpleCharStream
line = bufline[j];
column = bufcolumn[j];
}
-
+ boolean getTrackLineColumn() { return trackLineColumn; }
+ void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
}
-/* JavaCC - OriginalChecksum=dd31548eee2e798f7cd0fab4448f1d95 (do not edit this line) */
+/* JavaCC - OriginalChecksum=37fccad1d5df1ac03da59ee8886c8f85 (do not edit this line) */
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java
index 5a4d5681e7..0f9b8e4125 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
-/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */
+/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -118,6 +118,7 @@ public class Token implements java.io.Serializable {
/**
* Returns the image.
*/
+ @Override
public String toString()
{
return image;
@@ -149,4 +150,4 @@ public class Token implements java.io.Serializable {
}
}
-/* JavaCC - OriginalChecksum=181874db027eea8b35f565d8393a0afa (do not edit this line) */
+/* JavaCC - OriginalChecksum=f5a5cc8cddbbe0c1b41d76cf3db9c050 (do not edit this line) */
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
index f85eec77e7..4c4a41096c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
/* JavaCCOptions: */
/*
*
@@ -24,6 +24,7 @@
package org.apache.qpid.server.filter.selector;
/** Token Manager Error. */
+@SuppressWarnings("all")
public class TokenMgrError extends Error
{
@@ -41,22 +42,22 @@ public class TokenMgrError extends Error
/**
* Lexical error occurred.
*/
- static final int LEXICAL_ERROR = 0;
+ public static final int LEXICAL_ERROR = 0;
/**
* An attempt was made to create a second instance of a static token manager.
*/
- static final int STATIC_LEXER_ERROR = 1;
+ public static final int STATIC_LEXER_ERROR = 1;
/**
* Tried to change to an invalid lexical state.
*/
- static final int INVALID_LEXICAL_STATE = 2;
+ public static final int INVALID_LEXICAL_STATE = 2;
/**
* Detected (and bailed out of) an infinite loop in the token manager.
*/
- static final int LOOP_DETECTED = 3;
+ public static final int LOOP_DETECTED = 3;
/**
* Indicates the reason why the exception is thrown. It will have
@@ -69,13 +70,11 @@ public class TokenMgrError extends Error
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
{
- case 0 :
- continue;
case '\b':
retval.append("\\b");
continue;
@@ -118,19 +117,20 @@ public class TokenMgrError extends Error
* token manager to indicate a lexical error.
* Parameters :
* EOFSeen : indicates if EOF caused the lexical error
- * curLexState : lexical state in which this error occurred
+ * lexState : lexical state in which this error occurred
* errorLine : line number when the error occurred
* errorColumn : column number when the error occurred
* errorAfter : prefix that was seen before this error occurred
* curchar : the offending character
* Note: You can customize the lexical error message by modifying this method.
*/
- protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
- return("Lexical error at line " +
- errorLine + ", column " +
- errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
- "after : \"" + addEscapes(errorAfter) + "\"");
+ protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
+ return("Lexical error at line " + //
+ errorLine + ", column " + //
+ errorColumn + ". Encountered: " + //
+ (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //
+ (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
+ (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
}
/**
@@ -142,6 +142,7 @@ public class TokenMgrError extends Error
*
* from this method for such cases in the release version of your parser.
*/
+ @Override
public String getMessage() {
return super.getMessage();
}
@@ -161,8 +162,8 @@ public class TokenMgrError extends Error
}
/** Full Constructor. */
- public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
- this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+ public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
+ this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
-/* JavaCC - OriginalChecksum=dbdd2965cdf45ffc1a6fe0e4cb1331df (do not edit this line) */
+/* JavaCC - OriginalChecksum=999b179c0fe686ad3c99e52382adb7a4 (do not edit this line) */
diff --git a/broker-plugins/management-http/pom.xml b/broker-plugins/management-http/pom.xml
index 7a94066431..0f38a4aa8f 100644
--- a/broker-plugins/management-http/pom.xml
+++ b/broker-plugins/management-http/pom.xml
@@ -196,6 +196,7 @@
<includes>
<include>ConfiguredObjectFilterParser.jj</include>
</includes>
+ <jdkVersion>17</jdkVersion>
</configuration>
</execution>
</executions>
diff --git a/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj b/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
index d8e7536ac8..2a8210d6d2 100644
--- a/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
+++ b/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
@@ -69,15 +69,15 @@ import java.util.List;
import java.util.Map;
import java.util.Collections;
-import org.apache.qpid.filter.ArithmeticExpression;
-import org.apache.qpid.filter.BooleanExpression;
-import org.apache.qpid.filter.ComparisonExpression;
-import org.apache.qpid.filter.ConstantExpression;
-import org.apache.qpid.filter.Expression;
-import org.apache.qpid.filter.OrderByExpression;
-import org.apache.qpid.filter.LogicExpression;
-import org.apache.qpid.filter.UnaryExpression;
-import org.apache.qpid.filter.NamedExpression;
+import org.apache.qpid.server.filter.ArithmeticExpression;
+import org.apache.qpid.server.filter.BooleanExpression;
+import org.apache.qpid.server.filter.ComparisonExpression;
+import org.apache.qpid.server.filter.ConstantExpression;
+import org.apache.qpid.server.filter.Expression;
+import org.apache.qpid.server.filter.OrderByExpression;
+import org.apache.qpid.server.filter.LogicExpression;
+import org.apache.qpid.server.filter.UnaryExpression;
+import org.apache.qpid.server.filter.NamedExpression;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -86,7 +86,7 @@ import org.apache.qpid.server.model.ConfiguredObject;
*
* Do not edit this .java file directly - it is autogenerated from ConfiguredObjectFilterParser.jj
*/
-public class ConfiguredObjectFilterParser
+public class ConfiguredObjectFilterParser<E extends ConfiguredObject<?>>
{
private ConfiguredObjectExpressionFactory _factory;
@@ -100,7 +100,7 @@ public class ConfiguredObjectFilterParser
_factory = factory;
}
- public BooleanExpression<ConfiguredObject> parseWhere(String sql) throws ParseException
+ public BooleanExpression<E> parseWhere(String sql) throws ParseException
{
this.ReInit(new StringReader(sql));
@@ -117,22 +117,22 @@ public class ConfiguredObjectFilterParser
}
- public List<OrderByExpression> parseOrderBy(String sql) throws ParseException
+ public List<OrderByExpression<E>> parseOrderBy(String sql) throws ParseException
{
this.ReInit(new StringReader(sql));
return orderByClause();
}
- private BooleanExpression<ConfiguredObject<?>> asBooleanExpression(Expression<ConfiguredObject<?>> value) throws ParseException
+ private BooleanExpression<E> asBooleanExpression(Expression<E> value) throws ParseException
{
if (value instanceof BooleanExpression)
{
- return (BooleanExpression<ConfiguredObject<?>>) value;
+ return (BooleanExpression<E>) value;
}
if (value instanceof ConfiguredObjectExpression)
{
- return UnaryExpression.createBooleanCast( (Expression<ConfiguredObject<?>>) value );
+ return UnaryExpression.createBooleanCast(value);
}
throw new ParseException("Expression will not result in a boolean value: " + value);
}
@@ -209,9 +209,9 @@ TOKEN [IGNORE_CASE] :
// ----------------------------------------------------------------------------
// Grammar
// ----------------------------------------------------------------------------
-BooleanExpression filter() :
+BooleanExpression<E> filter() :
{
- Expression left=null;
+ Expression<E> left=null;
}
{
(
@@ -223,10 +223,10 @@ BooleanExpression filter() :
}
-Expression orExpression() :
+Expression<E> orExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
(
@@ -245,10 +245,10 @@ Expression orExpression() :
}
-Expression andExpression() :
+Expression<E> andExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
(
@@ -265,10 +265,10 @@ Expression andExpression() :
}
}
-Expression equalityExpression() :
+Expression<E> equalityExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
(
@@ -302,15 +302,15 @@ Expression equalityExpression() :
}
}
-Expression comparisonExpression() :
+Expression<E> comparisonExpression() :
{
- Expression left;
- Expression right;
- Expression low;
- Expression high;
+ Expression<E> left;
+ Expression<E> right;
+ Expression<E> low;
+ Expression<E> high;
String t, u;
boolean not;
- ArrayList list;
+ ArrayList<Expression> list;
}
{
(
@@ -370,7 +370,7 @@ Expression comparisonExpression() :
"("
right = primaryExpr()
{
- list = new ArrayList();
+ list = new ArrayList<>();
list.add( right );
}
(
@@ -391,7 +391,7 @@ Expression comparisonExpression() :
"("
right = primaryExpr()
{
- list = new ArrayList();
+ list = new ArrayList<>();
list.add( right );
}
(
@@ -414,10 +414,10 @@ Expression comparisonExpression() :
}
}
-Expression addExpression() :
+Expression<E> addExpression() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
left = multExpr()
@@ -441,10 +441,10 @@ Expression addExpression() :
}
}
-Expression multExpr() :
+Expression<E> multExpr() :
{
- Expression left;
- Expression right;
+ Expression<E> left;
+ Expression<E> right;
}
{
left = unaryExpr()
@@ -471,10 +471,10 @@ Expression multExpr() :
}
-Expression unaryExpr() :
+Expression<E> unaryExpr() :
{
String s=null;
- Expression left=null;
+ Expression<E> left=null;
}
{
(
@@ -499,9 +499,9 @@ Expression unaryExpr() :
}
-Expression primaryExpr() :
+Expression<E> primaryExpr() :
{
- Expression left=null;
+ Expression<E> left=null;
}
{
(
@@ -521,18 +521,18 @@ Expression primaryExpr() :
-ConstantExpression literal() :
+ConstantExpression<E> literal() :
{
Token t;
String s;
- ConstantExpression left=null;
+ ConstantExpression<E> left=null;
}
{
(
(
s = stringLiteral()
{
- left = new ConstantExpression(s);
+ left = new ConstantExpression<>(s);
}
)
|
@@ -645,12 +645,12 @@ ConfiguredObjectExpression variable() :
}
-Expression functionExpression() :
+Expression<E> functionExpression() :
{
String s;
Token t;
- List<Expression> args = new ArrayList<Expression>();
- Expression expr;
+ List<Expression> args = new ArrayList<>();
+ Expression<E> expr;
}
{
(
@@ -698,7 +698,7 @@ String identifier() :
List<Map<String, Expression>> selectClause() :
{
- List<Map<String, Expression>> returnVal = new ArrayList<Map<String, Expression>>();
+ List<Map<String, Expression>> returnVal = new ArrayList<>();
Map<String, Expression> element;
}
{
@@ -712,7 +712,7 @@ List<Map<String, Expression>> selectClause() :
Map<String, Expression> selectClauseElement() :
{
String name = null;
- Expression expr;
+ Expression<E> expr;
}
{
@@ -727,10 +727,10 @@ Map<String, Expression> selectClauseElement() :
)
}
-List<OrderByExpression> orderByClause() :
+List<OrderByExpression<E>> orderByClause() :
{
- List<OrderByExpression> returnVal = new ArrayList<OrderByExpression>();
- OrderByExpression element;
+ List<OrderByExpression<E>> returnVal = new ArrayList<>();
+ OrderByExpression<E> element;
}
{
( element = orderByClauseElement() { returnVal.add( element ); }
@@ -740,16 +740,16 @@ List<OrderByExpression> orderByClause() :
}
}
-OrderByExpression orderByClauseElement() :
+OrderByExpression<E> orderByClauseElement() :
{
- Expression expr;
- OrderByExpression orderByExpr;
+ Expression<E> expr;
+ OrderByExpression<E> orderByExpr;
OrderByExpression.Order order = OrderByExpression.Order.ASC;
}
{
( expr = addExpression() ( <ASC> | <DESC> { order = OrderByExpression.Order.DESC; } )?
{
- return new OrderByExpression(expr, order);
+ return new OrderByExpression<>(expr, order);
}
)
}
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpression.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpression.java
index dd5d63b115..d7573fd10d 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpression.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpression.java
@@ -23,6 +23,6 @@ package org.apache.qpid.server.management.plugin.servlet.query;
import org.apache.qpid.server.filter.Expression;
import org.apache.qpid.server.model.ConfiguredObject;
-public interface ConfiguredObjectExpression extends Expression<ConfiguredObject<?>>
+public interface ConfiguredObjectExpression<E extends ConfiguredObject<?>> extends Expression<E>
{
}
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
index e52f84dd45..e3c97418c8 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
@@ -126,7 +126,7 @@ public class ConfiguredObjectExpressionFactory
throw new IllegalArgumentException(TO_DATE.name() + " requires a single argument.");
}
- return new ConfiguredObjectExpression()
+ return new ConfiguredObjectExpression<>()
{
@Override
public Object evaluate(final ConfiguredObject<?> object)
@@ -286,11 +286,12 @@ public class ConfiguredObjectExpressionFactory
}
catch(IllegalArgumentException e)
{
- throw new ParseException("Function parameter mismatch : '" + functionName + "'", e);
+ throw new ParseException("Function parameter mismatch : '" + functionName + "': " + e);
}
}
- private static class ConfiguredObjectPropertyExpression implements ConfiguredObjectExpression, NamedExpression<ConfiguredObject<?>>
+ private static class ConfiguredObjectPropertyExpression<E extends ConfiguredObject<?>>
+ implements ConfiguredObjectExpression<E>, NamedExpression<E>
{
private final String _propertyName;
@@ -303,7 +304,7 @@ public class ConfiguredObjectExpressionFactory
}
@Override
- public Object evaluate(final ConfiguredObject<?> object)
+ public Object evaluate(final E object)
{
return object == null ? null : getValue(object);
}
@@ -337,7 +338,7 @@ public class ConfiguredObjectExpressionFactory
}
}
- private static class ChainedConfiguredObjectExpression implements ConfiguredObjectExpression
+ private static class ChainedConfiguredObjectExpression<E extends ConfiguredObject<?>> implements ConfiguredObjectExpression<E>
{
private final ConfiguredObjectPropertyExpression _first;
private final ConfiguredObjectExpression _chainedExpression;
@@ -349,12 +350,12 @@ public class ConfiguredObjectExpressionFactory
}
@Override
- public Object evaluate(final ConfiguredObject<?> object)
+ public Object evaluate(final E object)
{
Object propertyValue = _first.evaluate(object);
if(propertyValue instanceof ConfiguredObject)
{
- return _chainedExpression.evaluate((ConfiguredObject)propertyValue);
+ return _chainedExpression.evaluate(propertyValue);
}
else if(propertyValue instanceof Map && _chainedExpression instanceof ConfiguredObjectPropertyExpression)
{
@@ -364,7 +365,7 @@ public class ConfiguredObjectExpressionFactory
}
}
- private static class IndexedConfiguredObjectExpression implements ConfiguredObjectExpression
+ private static class IndexedConfiguredObjectExpression<E extends ConfiguredObject<?>> implements ConfiguredObjectExpression<E>
{
private final String _propertyName;
private final int _index;
@@ -376,7 +377,7 @@ public class ConfiguredObjectExpressionFactory
}
@Override
- public Object evaluate(final ConfiguredObject<?> object)
+ public Object evaluate(final E object)
{
Object propertyValue = object == null ? null : object.getAttribute(_propertyName);
if(propertyValue instanceof Collection)
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParser.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParser.java
index 3e4e57e720..7229ee51fe 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParser.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParser.java
@@ -1,3 +1,4 @@
+/* ConfiguredObjectFilterParser.java */
/* Generated By:JavaCC: Do not edit this line. ConfiguredObjectFilterParser.java */
/*
*
@@ -33,10 +34,10 @@ import org.apache.qpid.server.filter.BooleanExpression;
import org.apache.qpid.server.filter.ComparisonExpression;
import org.apache.qpid.server.filter.ConstantExpression;
import org.apache.qpid.server.filter.Expression;
-import org.apache.qpid.server.filter.NamedExpression;
import org.apache.qpid.server.filter.OrderByExpression;
import org.apache.qpid.server.filter.LogicExpression;
import org.apache.qpid.server.filter.UnaryExpression;
+import org.apache.qpid.server.filter.NamedExpression;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -45,7 +46,7 @@ import org.apache.qpid.server.model.ConfiguredObject;
*
* Do not edit this .java file directly - it is autogenerated from ConfiguredObjectFilterParser.jj
*/
-public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParserConstants {
+public class ConfiguredObjectFilterParser<E extends ConfiguredObject<?>> implements ConfiguredObjectFilterParserConstants {
private ConfiguredObjectExpressionFactory _factory;
public ConfiguredObjectFilterParser()
@@ -58,7 +59,7 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
_factory = factory;
}
- public BooleanExpression<ConfiguredObject> parseWhere(String sql) throws ParseException
+ public BooleanExpression<E> parseWhere(String sql) throws ParseException
{
this.ReInit(new StringReader(sql));
@@ -75,22 +76,22 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
}
- public List<OrderByExpression> parseOrderBy(String sql) throws ParseException
+ public List<OrderByExpression<E>> parseOrderBy(String sql) throws ParseException
{
this.ReInit(new StringReader(sql));
return orderByClause();
}
- private BooleanExpression<ConfiguredObject<?>> asBooleanExpression(Expression<ConfiguredObject<?>> value) throws ParseException
+ private BooleanExpression<E> asBooleanExpression(Expression<E> value) throws ParseException
{
if (value instanceof BooleanExpression)
{
- return (BooleanExpression<ConfiguredObject<?>>) value;
+ return (BooleanExpression<E>) value;
}
if (value instanceof ConfiguredObjectExpression)
{
- return UnaryExpression.createBooleanCast( (Expression<ConfiguredObject<?>>) value );
+ return UnaryExpression.createBooleanCast(value);
}
throw new ParseException("Expression will not result in a boolean value: " + value);
}
@@ -98,95 +99,97 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
// ----------------------------------------------------------------------------
// Grammar
// ----------------------------------------------------------------------------
- final public BooleanExpression filter() throws ParseException {
- Expression left=null;
+ final public BooleanExpression<E> filter() throws ParseException {Expression<E> left=null;
left = orExpression();
jj_consume_token(0);
- {if (true) return asBooleanExpression(left);}
+{if ("" != null) return asBooleanExpression(left);}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression orExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> orExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = andExpression();
label_1:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case OR:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case OR:{
;
break;
+ }
default:
break label_1;
}
jj_consume_token(OR);
right = andExpression();
- left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
+left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression andExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> andExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = equalityExpression();
label_2:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case AND:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case AND:{
;
break;
+ }
default:
break label_2;
}
jj_consume_token(AND);
right = equalityExpression();
- left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
+left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression equalityExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> equalityExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = comparisonExpression();
label_3:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case IS:
case 31:
- case 32:
+ case 32:{
;
break;
+ }
default:
break label_3;
}
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 31:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 31:{
jj_consume_token(31);
right = comparisonExpression();
- left = ComparisonExpression.createEqual(left, right);
+left = ComparisonExpression.createEqual(left, right);
break;
- case 32:
+ }
+ case 32:{
jj_consume_token(32);
right = comparisonExpression();
- left = ComparisonExpression.createNotEqual(left, right);
+left = ComparisonExpression.createNotEqual(left, right);
break;
+ }
default:
if (jj_2_1(2)) {
jj_consume_token(IS);
jj_consume_token(NULL);
- left = ComparisonExpression.createIsNull(left);
+left = ComparisonExpression.createIsNull(left);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IS:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case IS:{
jj_consume_token(IS);
jj_consume_token(NOT);
jj_consume_token(NULL);
- left = ComparisonExpression.createIsNotNull(left);
+left = ComparisonExpression.createIsNotNull(left);
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
@@ -194,22 +197,21 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
}
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression comparisonExpression() throws ParseException {
- Expression left;
- Expression right;
- Expression low;
- Expression high;
+ final public Expression<E> comparisonExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
+ Expression<E> low;
+ Expression<E> high;
String t, u;
boolean not;
- ArrayList list;
+ ArrayList<Expression> list;
left = addExpression();
label_4:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case NOT:
case BETWEEN:
case LIKE:
@@ -217,71 +219,80 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
case 33:
case 34:
case 35:
- case 36:
+ case 36:{
;
break;
+ }
default:
break label_4;
}
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 33:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 33:{
jj_consume_token(33);
right = addExpression();
- left = ComparisonExpression.createGreaterThan(left, right);
+left = ComparisonExpression.createGreaterThan(left, right);
break;
- case 34:
+ }
+ case 34:{
jj_consume_token(34);
right = addExpression();
- left = ComparisonExpression.createGreaterThanEqual(left, right);
+left = ComparisonExpression.createGreaterThanEqual(left, right);
break;
- case 35:
+ }
+ case 35:{
jj_consume_token(35);
right = addExpression();
- left = ComparisonExpression.createLessThan(left, right);
+left = ComparisonExpression.createLessThan(left, right);
break;
- case 36:
+ }
+ case 36:{
jj_consume_token(36);
right = addExpression();
- left = ComparisonExpression.createLessThanEqual(left, right);
+left = ComparisonExpression.createLessThanEqual(left, right);
break;
- case LIKE:
- u=null;
+ }
+ case LIKE:{
+u=null;
jj_consume_token(LIKE);
t = stringLiteral();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ESCAPE:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case ESCAPE:{
jj_consume_token(ESCAPE);
u = stringLiteral();
break;
+ }
default:
;
}
- left = ComparisonExpression.createLike(left, t, u);
+left = ComparisonExpression.createLike(left, t, u);
break;
+ }
default:
if (jj_2_2(2)) {
- u=null;
+u=null;
jj_consume_token(NOT);
jj_consume_token(LIKE);
t = stringLiteral();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ESCAPE:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case ESCAPE:{
jj_consume_token(ESCAPE);
u = stringLiteral();
break;
+ }
default:
;
}
- left = ComparisonExpression.createNotLike(left, t, u);
+left = ComparisonExpression.createNotLike(left, t, u);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BETWEEN:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case BETWEEN:{
jj_consume_token(BETWEEN);
low = addExpression();
jj_consume_token(AND);
high = addExpression();
- left = ComparisonExpression.createBetween(left, low, high);
+left = ComparisonExpression.createBetween(left, low, high);
break;
+ }
default:
if (jj_2_3(2)) {
jj_consume_token(NOT);
@@ -289,54 +300,57 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
low = addExpression();
jj_consume_token(AND);
high = addExpression();
- left = ComparisonExpression.createNotBetween(left, low, high);
+left = ComparisonExpression.createNotBetween(left, low, high);
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IN:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case IN:{
jj_consume_token(IN);
jj_consume_token(37);
right = primaryExpr();
- list = new ArrayList();
+list = new ArrayList<>();
list.add( right );
label_5:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 38:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 38:{
;
break;
+ }
default:
break label_5;
}
jj_consume_token(38);
right = primaryExpr();
- list.add( right );
+list.add( right );
}
jj_consume_token(39);
- left = ComparisonExpression.createInFilter(left, list, true );
+left = ComparisonExpression.createInFilter(left, list, true );
break;
+ }
default:
if (jj_2_4(2)) {
jj_consume_token(NOT);
jj_consume_token(IN);
jj_consume_token(37);
right = primaryExpr();
- list = new ArrayList();
+list = new ArrayList<>();
list.add( right );
label_6:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 38:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 38:{
;
break;
+ }
default:
break label_6;
}
jj_consume_token(38);
right = primaryExpr();
- list.add( right );
+list.add( right );
}
jj_consume_token(39);
- left = ComparisonExpression.createNotInFilter(left, list, true);
+left = ComparisonExpression.createNotInFilter(left, list, true);
} else {
jj_consume_token(-1);
throw new ParseException();
@@ -347,13 +361,12 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
}
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression addExpression() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> addExpression() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = multExpr();
label_7:
while (true) {
@@ -362,84 +375,90 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
} else {
break label_7;
}
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 40:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 40:{
jj_consume_token(40);
right = multExpr();
- left = ArithmeticExpression.createPlus(left, right);
+left = ArithmeticExpression.createPlus(left, right);
break;
- case 41:
+ }
+ case 41:{
jj_consume_token(41);
right = multExpr();
- left = ArithmeticExpression.createMinus(left, right);
+left = ArithmeticExpression.createMinus(left, right);
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression multExpr() throws ParseException {
- Expression left;
- Expression right;
+ final public Expression<E> multExpr() throws ParseException {Expression<E> left;
+ Expression<E> right;
left = unaryExpr();
label_8:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case 42:
case 43:
- case 44:
+ case 44:{
;
break;
+ }
default:
break label_8;
}
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 42:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 42:{
jj_consume_token(42);
right = unaryExpr();
- left = ArithmeticExpression.createMultiply(left, right);
+left = ArithmeticExpression.createMultiply(left, right);
break;
- case 43:
+ }
+ case 43:{
jj_consume_token(43);
right = unaryExpr();
- left = ArithmeticExpression.createDivide(left, right);
+left = ArithmeticExpression.createDivide(left, right);
break;
- case 44:
+ }
+ case 44:{
jj_consume_token(44);
right = unaryExpr();
- left = ArithmeticExpression.createMod(left, right);
+left = ArithmeticExpression.createMod(left, right);
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression unaryExpr() throws ParseException {
- String s=null;
- Expression left=null;
+ final public Expression<E> unaryExpr() throws ParseException {String s=null;
+ Expression<E> left=null;
if (jj_2_6(2147483647)) {
jj_consume_token(40);
left = unaryExpr();
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 41:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 41:{
jj_consume_token(41);
left = unaryExpr();
- left = UnaryExpression.createNegate(left);
+left = UnaryExpression.createNegate(left);
break;
- case NOT:
+ }
+ case NOT:{
jj_consume_token(NOT);
left = unaryExpr();
- left = UnaryExpression.createNOT( asBooleanExpression(left) );
+left = UnaryExpression.createNOT( asBooleanExpression(left) );
break;
+ }
case TRUE:
case FALSE:
case NULL:
@@ -451,24 +470,25 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
case FUNCTIONNAME:
case ID:
case QUOTED_ID:
- case 37:
+ case 37:{
left = primaryExpr();
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression primaryExpr() throws ParseException {
- Expression left=null;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case FUNCTIONNAME:
+ final public Expression<E> primaryExpr() throws ParseException {Expression<E> left=null;
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case FUNCTIONNAME:{
left = functionExpression();
break;
+ }
case TRUE:
case FALSE:
case NULL:
@@ -476,77 +496,86 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
case HEX_LITERAL:
case OCTAL_LITERAL:
case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
+ case STRING_LITERAL:{
left = literal();
break;
+ }
case ID:
- case QUOTED_ID:
+ case QUOTED_ID:{
left = variable();
break;
- case 37:
+ }
+ case 37:{
jj_consume_token(37);
left = orExpression();
jj_consume_token(39);
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public ConstantExpression literal() throws ParseException {
- Token t;
+ final public ConstantExpression<E> literal() throws ParseException {Token t;
String s;
- ConstantExpression left=null;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STRING_LITERAL:
+ ConstantExpression<E> left=null;
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case STRING_LITERAL:{
s = stringLiteral();
- left = new ConstantExpression(s);
+left = new ConstantExpression<>(s);
break;
- case DECIMAL_LITERAL:
+ }
+ case DECIMAL_LITERAL:{
t = jj_consume_token(DECIMAL_LITERAL);
- left = ConstantExpression.createFromDecimal(t.image);
+left = ConstantExpression.createFromDecimal(t.image);
break;
- case HEX_LITERAL:
+ }
+ case HEX_LITERAL:{
t = jj_consume_token(HEX_LITERAL);
- left = ConstantExpression.createFromHex(t.image);
+left = ConstantExpression.createFromHex(t.image);
break;
- case OCTAL_LITERAL:
+ }
+ case OCTAL_LITERAL:{
t = jj_consume_token(OCTAL_LITERAL);
- left = ConstantExpression.createFromOctal(t.image);
+left = ConstantExpression.createFromOctal(t.image);
break;
- case FLOATING_POINT_LITERAL:
+ }
+ case FLOATING_POINT_LITERAL:{
t = jj_consume_token(FLOATING_POINT_LITERAL);
- left = ConstantExpression.createFloat(t.image);
+left = ConstantExpression.createFloat(t.image);
break;
- case TRUE:
+ }
+ case TRUE:{
jj_consume_token(TRUE);
- left = ConstantExpression.TRUE;
+left = ConstantExpression.TRUE;
break;
- case FALSE:
+ }
+ case FALSE:{
jj_consume_token(FALSE);
- left = ConstantExpression.FALSE;
+left = ConstantExpression.FALSE;
break;
- case NULL:
+ }
+ case NULL:{
jj_consume_token(NULL);
- left = ConstantExpression.NULL;
+left = ConstantExpression.NULL;
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return left;}
+{if ("" != null) return left;}
throw new Error("Missing return statement in function");
- }
+}
- final public String stringLiteral() throws ParseException {
- Token t;
+ final public String stringLiteral() throws ParseException {Token t;
StringBuffer rc = new StringBuffer();
boolean first=true;
t = jj_consume_token(STRING_LITERAL);
- // Decode the sting value.
+// Decode the sting value.
String image = t.image;
for( int i=1; i < image.length()-1; i++ ) {
char c = image.charAt(i);
@@ -556,47 +585,46 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
}
rc.append(c);
}
- {if (true) return rc.toString();}
+ {if ("" != null) return rc.toString();}
throw new Error("Missing return statement in function");
- }
+}
- final public ConfiguredObjectExpression variable() throws ParseException {
- String s;
+ final public ConfiguredObjectExpression variable() throws ParseException {String s;
Token t;
ConfiguredObjectExpression right;
if (jj_2_7(2)) {
s = identifier();
jj_consume_token(45);
right = variable();
- {if (true) return _factory.createConfiguredObjectExpression( s, right );}
+{if ("" != null) return _factory.createConfiguredObjectExpression( s, right );}
} else if (jj_2_8(2)) {
s = identifier();
jj_consume_token(46);
t = jj_consume_token(DECIMAL_LITERAL);
jj_consume_token(47);
- {if (true) return _factory.createConfiguredObjectExpression( s, Integer.valueOf( t.image ) );}
+{if ("" != null) return _factory.createConfiguredObjectExpression( s, Integer.valueOf( t.image ) );}
} else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case ID:
- case QUOTED_ID:
+ case QUOTED_ID:{
s = identifier();
- {if (true) return _factory.createConfiguredObjectExpression( s );}
+{if ("" != null) return _factory.createConfiguredObjectExpression( s );}
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
}
throw new Error("Missing return statement in function");
- }
+}
- final public Expression functionExpression() throws ParseException {
- String s;
+ final public Expression<E> functionExpression() throws ParseException {String s;
Token t;
- List<Expression> args = new ArrayList<Expression>();
- Expression expr;
+ List<Expression> args = new ArrayList<>();
+ Expression<E> expr;
t = jj_consume_token(FUNCTIONNAME);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case NOT:
case TRUE:
case FALSE:
@@ -611,43 +639,45 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
case QUOTED_ID:
case 37:
case 40:
- case 41:
+ case 41:{
expr = addExpression();
- args.add(expr);
+args.add(expr);
label_9:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 38:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 38:{
;
break;
+ }
default:
break label_9;
}
jj_consume_token(38);
expr = addExpression();
- args.add(expr);
+args.add(expr);
}
break;
+ }
default:
;
}
jj_consume_token(39);
- {if (true) return _factory.createFunctionExpression( t.image.substring(0, t.image.length() - 1), args );}
+{if ("" != null) return _factory.createFunctionExpression( t.image.substring(0, t.image.length() - 1), args );}
throw new Error("Missing return statement in function");
- }
+}
- final public String identifier() throws ParseException {
- Token t;
+ final public String identifier() throws ParseException {Token t;
StringBuffer rc = new StringBuffer();
String s;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ID:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case ID:{
t = jj_consume_token(ID);
- s = t.image;
+s = t.image;
break;
- case QUOTED_ID:
+ }
+ case QUOTED_ID:{
t = jj_consume_token(QUOTED_ID);
- // Decode the sting value.
+// Decode the sting value.
String image = t.image;
for( int i=1; i < image.length()-1; i++ ) {
char c = image.charAt(i);
@@ -659,354 +689,391 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
}
s = rc.toString();
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return s;}
+{if ("" != null) return s;}
throw new Error("Missing return statement in function");
- }
+}
- final public List<Map<String, Expression>> selectClause() throws ParseException {
- List<Map<String, Expression>> returnVal = new ArrayList<Map<String, Expression>>();
+ final public List<Map<String, Expression>> selectClause() throws ParseException {List<Map<String, Expression>> returnVal = new ArrayList<>();
Map<String, Expression> element;
element = selectClauseElement();
- returnVal.add( element );
+returnVal.add( element );
label_10:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 38:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 38:{
;
break;
+ }
default:
break label_10;
}
jj_consume_token(38);
element = selectClauseElement();
- returnVal.add( element );
+returnVal.add( element );
}
jj_consume_token(0);
- {if (true) return returnVal;}
+{if ("" != null) return returnVal;}
throw new Error("Missing return statement in function");
- }
+}
- final public Map<String, Expression> selectClauseElement() throws ParseException {
- String name = null;
- Expression expr;
+ final public Map<String, Expression> selectClauseElement() throws ParseException {String name = null;
+ Expression<E> expr;
expr = addExpression();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case AS:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case AS:{
jj_consume_token(AS);
name = identifier();
break;
+ }
default:
;
}
- if(name == null)
+if(name == null)
{
name = ( expr instanceof NamedExpression ) ? ((NamedExpression) expr).getName() : "";
}
- {if (true) return Collections.singletonMap( name, expr );}
+ {if ("" != null) return Collections.singletonMap( name, expr );}
throw new Error("Missing return statement in function");
- }
+}
- final public List<OrderByExpression> orderByClause() throws ParseException {
- List<OrderByExpression> returnVal = new ArrayList<OrderByExpression>();
- OrderByExpression element;
+ final public List<OrderByExpression<E>> orderByClause() throws ParseException {List<OrderByExpression<E>> returnVal = new ArrayList<>();
+ OrderByExpression<E> element;
element = orderByClauseElement();
- returnVal.add( element );
+returnVal.add( element );
label_11:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 38:
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case 38:{
;
break;
+ }
default:
break label_11;
}
jj_consume_token(38);
element = orderByClauseElement();
- returnVal.add( element );
+returnVal.add( element );
}
jj_consume_token(0);
- {if (true) return returnVal;}
+{if ("" != null) return returnVal;}
throw new Error("Missing return statement in function");
- }
+}
- final public OrderByExpression orderByClauseElement() throws ParseException {
- Expression expr;
- OrderByExpression orderByExpr;
+ final public OrderByExpression<E> orderByClauseElement() throws ParseException {Expression<E> expr;
+ OrderByExpression<E> orderByExpr;
OrderByExpression.Order order = OrderByExpression.Order.ASC;
expr = addExpression();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case ASC:
- case DESC:
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ASC:
+ case DESC:{
+ switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+ case ASC:{
jj_consume_token(ASC);
break;
- case DESC:
+ }
+ case DESC:{
jj_consume_token(DESC);
- order = OrderByExpression.Order.DESC;
+order = OrderByExpression.Order.DESC;
break;
+ }
default:
jj_consume_token(-1);
throw new ParseException();
}
break;
+ }
default:
;
}
- {if (true) return new OrderByExpression(expr, order);}
+{if ("" != null) return new OrderByExpression<>(expr, order);}
throw new Error("Missing return statement in function");
- }
+}
- private boolean jj_2_1(int xla) {
+ private boolean jj_2_1(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_1(); }
+ try { return (!jj_3_1()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_2(int xla) {
+ private boolean jj_2_2(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_2(); }
+ try { return (!jj_3_2()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_3(int xla) {
+ private boolean jj_2_3(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_3(); }
+ try { return (!jj_3_3()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_4(int xla) {
+ private boolean jj_2_4(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_4(); }
+ try { return (!jj_3_4()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_5(int xla) {
+ private boolean jj_2_5(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_5(); }
+ try { return (!jj_3_5()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_6(int xla) {
+ private boolean jj_2_6(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_6(); }
+ try { return (!jj_3_6()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_7(int xla) {
+ private boolean jj_2_7(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_7(); }
+ try { return (!jj_3_7()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_2_8(int xla) {
+ private boolean jj_2_8(int xla)
+ {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- try { return !jj_3_8(); }
+ try { return (!jj_3_8()); }
catch(LookaheadSuccess ls) { return true; }
}
- private boolean jj_3R_67() {
+ private boolean jj_3R_comparisonExpression_344_35_67()
+ {
if (jj_scan_token(ESCAPE)) return true;
- if (jj_3R_48()) return true;
+ if (jj_3R_stringLiteral_600_5_48()) return true;
return false;
}
- private boolean jj_3R_39() {
+ private boolean jj_3R_literal_560_9_39()
+ {
if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
return false;
}
- private boolean jj_3R_24() {
+ private boolean jj_3R_multExpr_462_9_24()
+ {
if (jj_scan_token(44)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_unaryExpr_480_9_13()) return true;
return false;
}
- private boolean jj_3R_30() {
+ private boolean jj_3R_functionExpression_656_5_30()
+ {
if (jj_scan_token(FUNCTIONNAME)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_34()) jj_scanpos = xsp;
+ if (jj_3R_functionExpression_657_30_34()) jj_scanpos = xsp;
if (jj_scan_token(39)) return true;
return false;
}
- private boolean jj_3R_49() {
- if (jj_3R_52()) return true;
+ private boolean jj_3R_equalityExpression_274_5_49()
+ {
+ if (jj_3R_comparisonExpression_316_5_52()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_53()) { jj_scanpos = xsp; break; }
+ if (jj_3R_equalityExpression_278_13_53()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3_2() {
+ private boolean jj_3_2()
+ {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(LIKE)) return true;
- if (jj_3R_48()) return true;
+ if (jj_3R_stringLiteral_600_5_48()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_68()) jj_scanpos = xsp;
+ if (jj_3R_comparisonExpression_353_60_68()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3R_64() {
+ private boolean jj_3R_comparisonExpression_340_33_64()
+ {
if (jj_scan_token(LIKE)) return true;
- if (jj_3R_48()) return true;
+ if (jj_3R_stringLiteral_600_5_48()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_67()) jj_scanpos = xsp;
+ if (jj_3R_comparisonExpression_344_35_67()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3R_38() {
+ private boolean jj_3R_literal_553_9_38()
+ {
if (jj_scan_token(OCTAL_LITERAL)) return true;
return false;
}
- private boolean jj_3R_23() {
+ private boolean jj_3R_multExpr_457_9_23()
+ {
if (jj_scan_token(43)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_unaryExpr_480_9_13()) return true;
return false;
}
- private boolean jj_3R_15() {
+ private boolean jj_3R_multExpr_452_9_15()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_22()) {
+ if (jj_3R_multExpr_452_9_22()) {
jj_scanpos = xsp;
- if (jj_3R_23()) {
+ if (jj_3R_multExpr_457_9_23()) {
jj_scanpos = xsp;
- if (jj_3R_24()) return true;
+ if (jj_3R_multExpr_462_9_24()) return true;
}
}
return false;
}
- private boolean jj_3R_22() {
+ private boolean jj_3R_multExpr_452_9_22()
+ {
if (jj_scan_token(42)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_unaryExpr_480_9_13()) return true;
return false;
}
- private boolean jj_3R_50() {
+ private boolean jj_3R_andExpression_257_13_50()
+ {
if (jj_scan_token(AND)) return true;
- if (jj_3R_49()) return true;
+ if (jj_3R_equalityExpression_274_5_49()) return true;
return false;
}
- private boolean jj_3R_37() {
+ private boolean jj_3R_literal_546_9_37()
+ {
if (jj_scan_token(HEX_LITERAL)) return true;
return false;
}
- private boolean jj_3R_12() {
- if (jj_3R_13()) return true;
+ private boolean jj_3R_multExpr_450_5_12()
+ {
+ if (jj_3R_unaryExpr_480_9_13()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_15()) { jj_scanpos = xsp; break; }
+ if (jj_3R_multExpr_452_9_15()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_43() {
- if (jj_3R_14()) return true;
+ private boolean jj_3R_variable_639_5_43()
+ {
+ if (jj_3R_identifier_671_5_14()) return true;
return false;
}
- private boolean jj_3R_36() {
+ private boolean jj_3R_literal_539_9_36()
+ {
if (jj_scan_token(DECIMAL_LITERAL)) return true;
return false;
}
- private boolean jj_3R_55() {
+ private boolean jj_3R_addExpression_432_17_55()
+ {
if (jj_scan_token(41)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_multExpr_450_5_12()) return true;
return false;
}
- private boolean jj_3R_44() {
- if (jj_3R_49()) return true;
+ private boolean jj_3R_andExpression_254_5_44()
+ {
+ if (jj_3R_equalityExpression_274_5_49()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_50()) { jj_scanpos = xsp; break; }
+ if (jj_3R_andExpression_257_13_50()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3_5() {
+ private boolean jj_3_5()
+ {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(40)) {
jj_scanpos = xsp;
if (jj_scan_token(41)) return true;
}
- if (jj_3R_12()) return true;
+ if (jj_3R_multExpr_450_5_12()) return true;
return false;
}
- private boolean jj_3R_63() {
+ private boolean jj_3R_comparisonExpression_335_17_63()
+ {
if (jj_scan_token(36)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
return false;
}
- private boolean jj_3R_47() {
+ private boolean jj_3R_functionExpression_657_75_47()
+ {
if (jj_scan_token(38)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
return false;
}
- private boolean jj_3R_35() {
- if (jj_3R_48()) return true;
+ private boolean jj_3R_literal_532_9_35()
+ {
+ if (jj_3R_stringLiteral_600_5_48()) return true;
return false;
}
- private boolean jj_3_8() {
- if (jj_3R_14()) return true;
+ private boolean jj_3_8()
+ {
+ if (jj_3R_identifier_671_5_14()) return true;
if (jj_scan_token(46)) return true;
if (jj_scan_token(DECIMAL_LITERAL)) return true;
if (jj_scan_token(47)) return true;
return false;
}
- private boolean jj_3R_54() {
+ private boolean jj_3R_addExpression_427_17_54()
+ {
if (jj_scan_token(40)) return true;
- if (jj_3R_12()) return true;
+ if (jj_3R_multExpr_450_5_12()) return true;
return false;
}
- private boolean jj_3R_62() {
+ private boolean jj_3R_comparisonExpression_330_17_62()
+ {
if (jj_scan_token(35)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
return false;
}
- private boolean jj_3R_31() {
+ private boolean jj_3R_literal_531_5_31()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_35()) {
+ if (jj_3R_literal_532_9_35()) {
jj_scanpos = xsp;
- if (jj_3R_36()) {
+ if (jj_3R_literal_539_9_36()) {
jj_scanpos = xsp;
- if (jj_3R_37()) {
+ if (jj_3R_literal_546_9_37()) {
jj_scanpos = xsp;
- if (jj_3R_38()) {
+ if (jj_3R_literal_553_9_38()) {
jj_scanpos = xsp;
- if (jj_3R_39()) {
+ if (jj_3R_literal_560_9_39()) {
jj_scanpos = xsp;
- if (jj_3R_40()) {
+ if (jj_3R_literal_567_9_40()) {
jj_scanpos = xsp;
- if (jj_3R_41()) {
+ if (jj_3R_literal_574_9_41()) {
jj_scanpos = xsp;
- if (jj_3R_42()) return true;
+ if (jj_3R_literal_581_9_42()) return true;
}
}
}
@@ -1017,80 +1084,88 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
return false;
}
- private boolean jj_3R_70() {
+ private boolean jj_3R_comparisonExpression_398_41_70()
+ {
if (jj_scan_token(38)) return true;
- if (jj_3R_25()) return true;
+ if (jj_3R_primaryExpr_507_5_25()) return true;
return false;
}
- private boolean jj_3R_51() {
+ private boolean jj_3R_addExpression_425_13_51()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_54()) {
+ if (jj_3R_addExpression_427_17_54()) {
jj_scanpos = xsp;
- if (jj_3R_55()) return true;
+ if (jj_3R_addExpression_432_17_55()) return true;
}
return false;
}
- private boolean jj_3R_45() {
+ private boolean jj_3R_orExpression_235_13_45()
+ {
if (jj_scan_token(OR)) return true;
- if (jj_3R_44()) return true;
+ if (jj_3R_andExpression_254_5_44()) return true;
return false;
}
- private boolean jj_3_7() {
- if (jj_3R_14()) return true;
+ private boolean jj_3_7()
+ {
+ if (jj_3R_identifier_671_5_14()) return true;
if (jj_scan_token(45)) return true;
- if (jj_3R_32()) return true;
+ if (jj_3R_variable_623_5_32()) return true;
return false;
}
- private boolean jj_3R_32() {
+ private boolean jj_3R_variable_623_5_32()
+ {
Token xsp;
xsp = jj_scanpos;
if (jj_3_7()) {
jj_scanpos = xsp;
if (jj_3_8()) {
jj_scanpos = xsp;
- if (jj_3R_43()) return true;
+ if (jj_3R_variable_639_5_43()) return true;
}
}
return false;
}
- private boolean jj_3R_61() {
+ private boolean jj_3R_comparisonExpression_325_17_61()
+ {
if (jj_scan_token(34)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
return false;
}
- private boolean jj_3R_60() {
+ private boolean jj_3R_comparisonExpression_320_17_60()
+ {
if (jj_scan_token(33)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
return false;
}
- private boolean jj_3R_56() {
+ private boolean jj_3R_comparisonExpression_320_17_56()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_60()) {
+ if (jj_3R_comparisonExpression_320_17_60()) {
jj_scanpos = xsp;
- if (jj_3R_61()) {
+ if (jj_3R_comparisonExpression_325_17_61()) {
jj_scanpos = xsp;
- if (jj_3R_62()) {
+ if (jj_3R_comparisonExpression_330_17_62()) {
jj_scanpos = xsp;
- if (jj_3R_63()) {
+ if (jj_3R_comparisonExpression_335_17_63()) {
jj_scanpos = xsp;
- if (jj_3R_64()) {
+ if (jj_3R_comparisonExpression_340_33_64()) {
jj_scanpos = xsp;
if (jj_3_2()) {
jj_scanpos = xsp;
- if (jj_3R_65()) {
+ if (jj_3R_comparisonExpression_358_25_65()) {
jj_scanpos = xsp;
if (jj_3_3()) {
jj_scanpos = xsp;
- if (jj_3R_66()) {
+ if (jj_3R_comparisonExpression_369_33_66()) {
jj_scanpos = xsp;
if (jj_3_4()) return true;
}
@@ -1105,263 +1180,296 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
return false;
}
- private boolean jj_3R_46() {
- if (jj_3R_12()) return true;
+ private boolean jj_3R_addExpression_423_5_46()
+ {
+ if (jj_3R_multExpr_450_5_12()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_51()) { jj_scanpos = xsp; break; }
+ if (jj_3R_addExpression_425_13_51()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_29() {
+ private boolean jj_3R_primaryExpr_514_9_29()
+ {
if (jj_scan_token(37)) return true;
- if (jj_3R_33()) return true;
+ if (jj_3R_orExpression_232_5_33()) return true;
if (jj_scan_token(39)) return true;
return false;
}
- private boolean jj_3R_33() {
- if (jj_3R_44()) return true;
+ private boolean jj_3R_orExpression_232_5_33()
+ {
+ if (jj_3R_andExpression_254_5_44()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_45()) { jj_scanpos = xsp; break; }
+ if (jj_3R_orExpression_235_13_45()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_28() {
- if (jj_3R_32()) return true;
+ private boolean jj_3R_primaryExpr_512_9_28()
+ {
+ if (jj_3R_variable_623_5_32()) return true;
return false;
}
- private boolean jj_3R_27() {
- if (jj_3R_31()) return true;
+ private boolean jj_3R_primaryExpr_510_9_27()
+ {
+ if (jj_3R_literal_531_5_31()) return true;
return false;
}
- private boolean jj_3R_26() {
- if (jj_3R_30()) return true;
+ private boolean jj_3R_primaryExpr_508_9_26()
+ {
+ if (jj_3R_functionExpression_656_5_30()) return true;
return false;
}
- private boolean jj_3R_69() {
+ private boolean jj_3R_comparisonExpression_377_41_69()
+ {
if (jj_scan_token(38)) return true;
- if (jj_3R_25()) return true;
+ if (jj_3R_primaryExpr_507_5_25()) return true;
return false;
}
- private boolean jj_3R_25() {
+ private boolean jj_3R_primaryExpr_507_5_25()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_26()) {
+ if (jj_3R_primaryExpr_508_9_26()) {
jj_scanpos = xsp;
- if (jj_3R_27()) {
+ if (jj_3R_primaryExpr_510_9_27()) {
jj_scanpos = xsp;
- if (jj_3R_28()) {
+ if (jj_3R_primaryExpr_512_9_28()) {
jj_scanpos = xsp;
- if (jj_3R_29()) return true;
+ if (jj_3R_primaryExpr_514_9_29()) return true;
}
}
}
return false;
}
- private boolean jj_3R_52() {
- if (jj_3R_46()) return true;
+ private boolean jj_3R_comparisonExpression_316_5_52()
+ {
+ if (jj_3R_addExpression_423_5_46()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_56()) { jj_scanpos = xsp; break; }
+ if (jj_3R_comparisonExpression_320_17_56()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_48() {
+ private boolean jj_3R_stringLiteral_600_5_48()
+ {
if (jj_scan_token(STRING_LITERAL)) return true;
return false;
}
- private boolean jj_3_4() {
+ private boolean jj_3_4()
+ {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(IN)) return true;
if (jj_scan_token(37)) return true;
- if (jj_3R_25()) return true;
+ if (jj_3R_primaryExpr_507_5_25()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_70()) { jj_scanpos = xsp; break; }
+ if (jj_3R_comparisonExpression_398_41_70()) { jj_scanpos = xsp; break; }
}
if (jj_scan_token(39)) return true;
return false;
}
- private boolean jj_3_6() {
+ private boolean jj_3_6()
+ {
if (jj_scan_token(40)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_unaryExpr_480_9_13()) return true;
return false;
}
- private boolean jj_3R_68() {
+ private boolean jj_3R_comparisonExpression_353_60_68()
+ {
if (jj_scan_token(ESCAPE)) return true;
- if (jj_3R_48()) return true;
+ if (jj_3R_stringLiteral_600_5_48()) return true;
return false;
}
- private boolean jj_3R_19() {
- if (jj_3R_25()) return true;
+ private boolean jj_3R_unaryExpr_494_13_19()
+ {
+ if (jj_3R_primaryExpr_507_5_25()) return true;
return false;
}
- private boolean jj_3R_18() {
+ private boolean jj_3R_unaryExpr_489_13_18()
+ {
if (jj_scan_token(NOT)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_unaryExpr_480_9_13()) return true;
return false;
}
- private boolean jj_3R_16() {
+ private boolean jj_3R_unaryExpr_481_17_16()
+ {
if (jj_scan_token(40)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_unaryExpr_480_9_13()) return true;
return false;
}
- private boolean jj_3R_66() {
+ private boolean jj_3R_comparisonExpression_369_33_66()
+ {
if (jj_scan_token(IN)) return true;
if (jj_scan_token(37)) return true;
- if (jj_3R_25()) return true;
+ if (jj_3R_primaryExpr_507_5_25()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_69()) { jj_scanpos = xsp; break; }
+ if (jj_3R_comparisonExpression_377_41_69()) { jj_scanpos = xsp; break; }
}
if (jj_scan_token(39)) return true;
return false;
}
- private boolean jj_3R_59() {
+ private boolean jj_3R_equalityExpression_294_13_59()
+ {
if (jj_scan_token(IS)) return true;
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(NULL)) return true;
return false;
}
- private boolean jj_3R_17() {
+ private boolean jj_3R_unaryExpr_484_13_17()
+ {
if (jj_scan_token(41)) return true;
- if (jj_3R_13()) return true;
+ if (jj_3R_unaryExpr_480_9_13()) return true;
return false;
}
- private boolean jj_3R_34() {
- if (jj_3R_46()) return true;
+ private boolean jj_3R_functionExpression_657_30_34()
+ {
+ if (jj_3R_addExpression_423_5_46()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_47()) { jj_scanpos = xsp; break; }
+ if (jj_3R_functionExpression_657_75_47()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_21() {
+ private boolean jj_3R_identifier_677_9_21()
+ {
if (jj_scan_token(QUOTED_ID)) return true;
return false;
}
- private boolean jj_3R_42() {
+ private boolean jj_3R_literal_581_9_42()
+ {
if (jj_scan_token(NULL)) return true;
return false;
}
- private boolean jj_3_1() {
+ private boolean jj_3_1()
+ {
if (jj_scan_token(IS)) return true;
if (jj_scan_token(NULL)) return true;
return false;
}
- private boolean jj_3R_20() {
+ private boolean jj_3R_identifier_672_9_20()
+ {
if (jj_scan_token(ID)) return true;
return false;
}
- private boolean jj_3R_13() {
+ private boolean jj_3R_unaryExpr_480_9_13()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_16()) {
+ if (jj_3R_unaryExpr_481_17_16()) {
jj_scanpos = xsp;
- if (jj_3R_17()) {
+ if (jj_3R_unaryExpr_484_13_17()) {
jj_scanpos = xsp;
- if (jj_3R_18()) {
+ if (jj_3R_unaryExpr_489_13_18()) {
jj_scanpos = xsp;
- if (jj_3R_19()) return true;
+ if (jj_3R_unaryExpr_494_13_19()) return true;
}
}
}
return false;
}
- private boolean jj_3R_41() {
+ private boolean jj_3R_literal_574_9_41()
+ {
if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_58() {
+ private boolean jj_3R_equalityExpression_283_13_58()
+ {
if (jj_scan_token(32)) return true;
- if (jj_3R_52()) return true;
+ if (jj_3R_comparisonExpression_316_5_52()) return true;
return false;
}
- private boolean jj_3R_14() {
+ private boolean jj_3R_identifier_671_5_14()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_20()) {
+ if (jj_3R_identifier_672_9_20()) {
jj_scanpos = xsp;
- if (jj_3R_21()) return true;
+ if (jj_3R_identifier_677_9_21()) return true;
}
return false;
}
- private boolean jj_3_3() {
+ private boolean jj_3_3()
+ {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(BETWEEN)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
if (jj_scan_token(AND)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
return false;
}
- private boolean jj_3R_57() {
+ private boolean jj_3R_equalityExpression_278_13_57()
+ {
if (jj_scan_token(31)) return true;
- if (jj_3R_52()) return true;
+ if (jj_3R_comparisonExpression_316_5_52()) return true;
return false;
}
- private boolean jj_3R_53() {
+ private boolean jj_3R_equalityExpression_278_13_53()
+ {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_57()) {
+ if (jj_3R_equalityExpression_278_13_57()) {
jj_scanpos = xsp;
- if (jj_3R_58()) {
+ if (jj_3R_equalityExpression_283_13_58()) {
jj_scanpos = xsp;
if (jj_3_1()) {
jj_scanpos = xsp;
- if (jj_3R_59()) return true;
+ if (jj_3R_equalityExpression_294_13_59()) return true;
}
}
}
return false;
}
- private boolean jj_3R_40() {
+ private boolean jj_3R_literal_567_9_40()
+ {
if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_65() {
+ private boolean jj_3R_comparisonExpression_358_25_65()
+ {
if (jj_scan_token(BETWEEN)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
if (jj_scan_token(AND)) return true;
- if (jj_3R_46()) return true;
+ if (jj_3R_addExpression_423_5_46()) return true;
return false;
}
@@ -1378,120 +1486,141 @@ public class ConfiguredObjectFilterParser implements ConfiguredObjectFilterParse
/** Constructor with InputStream. */
public ConfiguredObjectFilterParser(java.io.InputStream stream) {
- this(stream, null);
+ this(stream, null);
}
/** Constructor with InputStream and supplied encoding */
public ConfiguredObjectFilterParser(java.io.InputStream stream, String encoding) {
- try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
- token_source = new ConfiguredObjectFilterParserTokenManager(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+ token_source = new ConfiguredObjectFilterParserTokenManager(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Reinitialise. */
public void ReInit(java.io.InputStream stream) {
- ReInit(stream, null);
+ ReInit(stream, null);
}
/** Reinitialise. */
public void ReInit(java.io.InputStream stream, String encoding) {
- try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
- token_source.ReInit(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+ token_source.ReInit(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Constructor. */
public ConfiguredObjectFilterParser(java.io.Reader stream) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
- token_source = new ConfiguredObjectFilterParserTokenManager(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ token_source = new ConfiguredObjectFilterParserTokenManager(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Reinitialise. */
public void ReInit(java.io.Reader stream) {
- jj_input_stream.ReInit(stream, 1, 1);
- token_source.ReInit(jj_input_stream);
- token = new Token();
- jj_ntk = -1;
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ } else {
+ jj_input_stream.ReInit(stream, 1, 1);
+ }
+ if (token_source == null) {
+ token_source = new ConfiguredObjectFilterParserTokenManager(jj_input_stream);
+ }
+
+ token_source.ReInit(jj_input_stream);
+ token = new Token();
+ jj_ntk = -1;
}
/** Constructor with generated Token Manager. */
public ConfiguredObjectFilterParser(ConfiguredObjectFilterParserTokenManager tm) {
- token_source = tm;
- token = new Token();
- jj_ntk = -1;
+ token_source = tm;
+ token = new Token();
+ jj_ntk = -1;
}
/** Reinitialise. */
public void ReInit(ConfiguredObjectFilterParserTokenManager tm) {
- token_source = tm;
- token = new Token();
- jj_ntk = -1;
+ token_source = tm;
+ token = new Token();
+ jj_ntk = -1;
}
private Token jj_consume_token(int kind) throws ParseException {
- Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
- jj_ntk = -1;
- if (token.kind == kind) {
- return token;
- }
- token = oldToken;
- throw generateParseException();
+ Token oldToken;
+ if ((oldToken = token).next != null) token = token.next;
+ else token = token.next = token_source.getNextToken();
+ jj_ntk = -1;
+ if (token.kind == kind) {
+ return token;
+ }
+ token = oldToken;
+ throw generateParseException();
}
- static private final class LookaheadSuccess extends java.lang.Error { }
- final private LookaheadSuccess jj_ls = new LookaheadSuccess();
- private boolean jj_scan_token(int kind) {
- if (jj_scanpos == jj_lastpos) {
- jj_la--;
- if (jj_scanpos.next == null) {
- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
- } else {
- jj_lastpos = jj_scanpos = jj_scanpos.next;
- }
- } else {
- jj_scanpos = jj_scanpos.next;
+ @SuppressWarnings("serial")
+ static private final class LookaheadSuccess extends java.lang.Error {
+ @Override
+ public Throwable fillInStackTrace() {
+ return this;
}
- if (jj_scanpos.kind != kind) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
- return false;
+ }
+ static private final LookaheadSuccess jj_ls = new LookaheadSuccess();
+ private boolean jj_scan_token(int kind) {
+ if (jj_scanpos == jj_lastpos) {
+ jj_la--;
+ if (jj_scanpos.next == null) {
+ jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+ } else {
+ jj_lastpos = jj_scanpos = jj_scanpos.next;
+ }
+ } else {
+ jj_scanpos = jj_scanpos.next;
+ }
+ if (jj_scanpos.kind != kind) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
+ return false;
}
/** Get the next Token. */
final public Token getNextToken() {
- if (token.next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
- jj_ntk = -1;
- return token;
+ if (token.next != null) token = token.next;
+ else token = token.next = token_source.getNextToken();
+ jj_ntk = -1;
+ return token;
}
/** Get the specific Token. */
final public Token getToken(int index) {
- Token t = token;
- for (int i = 0; i < index; i++) {
- if (t.next != null) t = t.next;
- else t = t.next = token_source.getNextToken();
- }
- return t;
+ Token t = token;
+ for (int i = 0; i < index; i++) {
+ if (t.next != null) t = t.next;
+ else t = t.next = token_source.getNextToken();
+ }
+ return t;
}
- private int jj_ntk() {
- if ((jj_nt=token.next) == null)
- return (jj_ntk = (token.next=token_source.getNextToken()).kind);
- else
- return (jj_ntk = jj_nt.kind);
+ private int jj_ntk_f() {
+ if ((jj_nt=token.next) == null)
+ return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+ else
+ return (jj_ntk = jj_nt.kind);
}
/** Generate ParseException. */
public ParseException generateParseException() {
- Token errortok = token.next;
- int line = errortok.beginLine, column = errortok.beginColumn;
- String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image;
- return new ParseException("Parse error at line " + line + ", column " + column + ". Encountered: " + mess);
+ Token errortok = token.next;
+ int line = errortok.beginLine, column = errortok.beginColumn;
+ String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image;
+ return new ParseException("Parse error at line " + line + ", column " + column + ". Encountered: " + mess);
+ }
+
+ private boolean trace_enabled;
+
+/** Trace enabled. */
+ final public boolean trace_enabled() {
+ return trace_enabled;
}
/** Enable tracing. */
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java
index f080ba9e6f..ec38e35d19 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java
@@ -1,3 +1,4 @@
+/* ConfiguredObjectFilterParserTokenManager.java */
/* Generated By:JavaCC: Do not edit this line. ConfiguredObjectFilterParserTokenManager.java */
/*
*
@@ -21,10 +22,25 @@
*/
package org.apache.qpid.server.management.plugin.servlet.query;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Collections;
+import org.apache.qpid.server.filter.ArithmeticExpression;
+import org.apache.qpid.server.filter.BooleanExpression;
+import org.apache.qpid.server.filter.ComparisonExpression;
+import org.apache.qpid.server.filter.ConstantExpression;
+import org.apache.qpid.server.filter.Expression;
+import org.apache.qpid.server.filter.OrderByExpression;
+import org.apache.qpid.server.filter.LogicExpression;
+import org.apache.qpid.server.filter.UnaryExpression;
+import org.apache.qpid.server.filter.NamedExpression;
+import org.apache.qpid.server.model.ConfiguredObject;
/** Token Manager. */
-public class ConfiguredObjectFilterParserTokenManager implements ConfiguredObjectFilterParserConstants
-{
+@SuppressWarnings ("unused")
+public class ConfiguredObjectFilterParserTokenManager implements ConfiguredObjectFilterParserConstants {
/** Debug output. */
public java.io.PrintStream debugStream = System.out;
@@ -36,8 +52,7 @@ private int jjStopAtPos(int pos, int kind)
jjmatchedPos = pos;
return pos + 1;
}
-private int jjMoveStringLiteralDfa0_0()
-{
+private int jjMoveStringLiteralDfa0_0(){
switch(curChar)
{
case 9:
@@ -141,8 +156,7 @@ private int jjMoveStringLiteralDfa0_0()
return jjMoveNfa_0(5, 0);
}
}
-private int jjMoveStringLiteralDfa1_0(long active0)
-{
+private int jjMoveStringLiteralDfa1_0(long active0){
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
return jjMoveNfa_0(5, 0);
@@ -245,8 +259,7 @@ private int jjMoveStringLiteralDfa1_0(long active0)
}
return jjMoveNfa_0(5, 1);
}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa2_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 1);
try { curChar = input_stream.readChar(); }
@@ -318,8 +331,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0)
}
return jjMoveNfa_0(5, 2);
}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa3_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 2);
try { curChar = input_stream.readChar(); }
@@ -397,8 +409,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0)
}
return jjMoveNfa_0(5, 3);
}
-private int jjMoveStringLiteralDfa4_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa4_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 3);
try { curChar = input_stream.readChar(); }
@@ -430,8 +441,7 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0)
}
return jjMoveNfa_0(5, 4);
}
-private int jjMoveStringLiteralDfa5_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa5_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 4);
try { curChar = input_stream.readChar(); }
@@ -459,8 +469,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0)
}
return jjMoveNfa_0(5, 5);
}
-private int jjMoveStringLiteralDfa6_0(long old0, long active0)
-{
+private int jjMoveStringLiteralDfa6_0(long old0, long active0){
if (((active0 &= old0)) == 0L)
return jjMoveNfa_0(5, 5);
try { curChar = input_stream.readChar(); }
@@ -521,19 +530,19 @@ private int jjMoveNfa_0(int startState, int curPos)
{
case 5:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(0, 3);
+ { jjCheckNAddStates(0, 3); }
else if (curChar == 34)
- jjCheckNAddStates(4, 6);
+ { jjCheckNAddStates(4, 6); }
else if (curChar == 36)
{
if (kind > 29)
kind = 29;
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
}
else if (curChar == 39)
- jjCheckNAddStates(7, 9);
+ { jjCheckNAddStates(7, 9); }
else if (curChar == 46)
- jjCheckNAdd(17);
+ { jjCheckNAdd(17); }
else if (curChar == 47)
jjstateSet[jjnewStateCnt++] = 6;
else if (curChar == 45)
@@ -542,22 +551,22 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 22)
kind = 22;
- jjCheckNAddTwoStates(14, 15);
+ { jjCheckNAddTwoStates(14, 15); }
}
else if (curChar == 48)
{
if (kind > 24)
kind = 24;
- jjCheckNAddTwoStates(48, 50);
+ { jjCheckNAddTwoStates(48, 50); }
}
break;
case 0:
if (curChar == 45)
- jjCheckNAddStates(10, 12);
+ { jjCheckNAddStates(10, 12); }
break;
case 1:
if ((0xffffffffffffdbffL & l) != 0L)
- jjCheckNAddStates(10, 12);
+ { jjCheckNAddStates(10, 12); }
break;
case 2:
if ((0x2400L & l) != 0L && kind > 6)
@@ -573,23 +582,23 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 6:
if (curChar == 42)
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 7:
if ((0xfffffbffffffffffL & l) != 0L)
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 8:
if (curChar == 42)
- jjCheckNAddStates(13, 15);
+ { jjCheckNAddStates(13, 15); }
break;
case 9:
if ((0xffff7bffffffffffL & l) != 0L)
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 10:
if ((0xfffffbffffffffffL & l) != 0L)
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 11:
if (curChar == 47 && kind > 7)
@@ -604,41 +613,41 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 22)
kind = 22;
- jjCheckNAddTwoStates(14, 15);
+ { jjCheckNAddTwoStates(14, 15); }
break;
case 14:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 22)
kind = 22;
- jjCheckNAddTwoStates(14, 15);
+ { jjCheckNAddTwoStates(14, 15); }
break;
case 16:
if (curChar == 46)
- jjCheckNAdd(17);
+ { jjCheckNAdd(17); }
break;
case 17:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 25)
kind = 25;
- jjCheckNAddTwoStates(17, 18);
+ { jjCheckNAddTwoStates(17, 18); }
break;
case 19:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(20);
+ { jjCheckNAdd(20); }
break;
case 20:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 25)
kind = 25;
- jjCheckNAdd(20);
+ { jjCheckNAdd(20); }
break;
case 21:
case 22:
if (curChar == 39)
- jjCheckNAddStates(7, 9);
+ { jjCheckNAddStates(7, 9); }
break;
case 23:
if (curChar == 39)
@@ -646,7 +655,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 24:
if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(7, 9);
+ { jjCheckNAddStates(7, 9); }
break;
case 25:
if (curChar == 39 && kind > 27)
@@ -654,7 +663,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 27:
if ((0x3ff000000000000L & l) != 0L)
- jjAddStates(16, 17);
+ { jjAddStates(16, 17); }
break;
case 28:
if (curChar == 40 && kind > 28)
@@ -665,19 +674,19 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 29)
kind = 29;
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 30:
if ((0x3ff001000000000L & l) == 0L)
break;
if (kind > 29)
kind = 29;
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 31:
case 32:
if (curChar == 34)
- jjCheckNAddStates(4, 6);
+ { jjCheckNAddStates(4, 6); }
break;
case 33:
if (curChar == 34)
@@ -685,7 +694,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 34:
if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(4, 6);
+ { jjCheckNAddStates(4, 6); }
break;
case 35:
if (curChar == 34 && kind > 30)
@@ -693,58 +702,58 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 36:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(0, 3);
+ { jjCheckNAddStates(0, 3); }
break;
case 37:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(37, 38);
+ { jjCheckNAddTwoStates(37, 38); }
break;
case 38:
if (curChar != 46)
break;
if (kind > 25)
kind = 25;
- jjCheckNAddTwoStates(39, 40);
+ { jjCheckNAddTwoStates(39, 40); }
break;
case 39:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 25)
kind = 25;
- jjCheckNAddTwoStates(39, 40);
+ { jjCheckNAddTwoStates(39, 40); }
break;
case 41:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(42);
+ { jjCheckNAdd(42); }
break;
case 42:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 25)
kind = 25;
- jjCheckNAdd(42);
+ { jjCheckNAdd(42); }
break;
case 43:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(43, 44);
+ { jjCheckNAddTwoStates(43, 44); }
break;
case 45:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(46);
+ { jjCheckNAdd(46); }
break;
case 46:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 25)
kind = 25;
- jjCheckNAdd(46);
+ { jjCheckNAdd(46); }
break;
case 47:
if (curChar != 48)
break;
if (kind > 24)
kind = 24;
- jjCheckNAddTwoStates(48, 50);
+ { jjCheckNAddTwoStates(48, 50); }
break;
case 49:
if ((0x3ff000000000000L & l) == 0L)
@@ -758,7 +767,7 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 24)
kind = 24;
- jjCheckNAdd(50);
+ { jjCheckNAdd(50); }
break;
default : break;
}
@@ -776,20 +785,20 @@ private int jjMoveNfa_0(int startState, int curPos)
{
if (kind > 29)
kind = 29;
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
}
if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
break;
case 1:
- jjAddStates(10, 12);
+ { jjAddStates(10, 12); }
break;
case 7:
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 9:
case 10:
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 15:
if ((0x100000001000L & l) != 0L && kind > 22)
@@ -797,15 +806,15 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
case 18:
if ((0x2000000020L & l) != 0L)
- jjAddStates(18, 19);
+ { jjAddStates(18, 19); }
break;
case 24:
- jjAddStates(7, 9);
+ { jjAddStates(7, 9); }
break;
case 26:
case 27:
if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddTwoStates(27, 28);
+ { jjCheckNAddTwoStates(27, 28); }
break;
case 29:
case 30:
@@ -813,29 +822,29 @@ private int jjMoveNfa_0(int startState, int curPos)
break;
if (kind > 29)
kind = 29;
- jjCheckNAdd(30);
+ { jjCheckNAdd(30); }
break;
case 34:
- jjAddStates(4, 6);
+ { jjAddStates(4, 6); }
break;
case 40:
if ((0x2000000020L & l) != 0L)
- jjAddStates(20, 21);
+ { jjAddStates(20, 21); }
break;
case 44:
if ((0x2000000020L & l) != 0L)
- jjAddStates(22, 23);
+ { jjAddStates(22, 23); }
break;
case 48:
if ((0x100000001000000L & l) != 0L)
- jjCheckNAdd(49);
+ { jjCheckNAdd(49); }
break;
case 49:
if ((0x7e0000007eL & l) == 0L)
break;
if (kind > 23)
kind = 23;
- jjCheckNAdd(49);
+ { jjCheckNAdd(49); }
break;
default : break;
}
@@ -843,7 +852,7 @@ private int jjMoveNfa_0(int startState, int curPos)
}
else
{
- int hiByte = (int)(curChar >> 8);
+ int hiByte = (curChar >> 8);
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
@@ -854,26 +863,26 @@ private int jjMoveNfa_0(int startState, int curPos)
{
case 1:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(10, 12);
+ { jjAddStates(10, 12); }
break;
case 7:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjCheckNAddTwoStates(7, 8);
+ { jjCheckNAddTwoStates(7, 8); }
break;
case 9:
case 10:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjCheckNAddTwoStates(10, 8);
+ { jjCheckNAddTwoStates(10, 8); }
break;
case 24:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(7, 9);
+ { jjAddStates(7, 9); }
break;
case 34:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(4, 6);
+ { jjAddStates(4, 6); }
break;
- default : break;
+ default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;
}
} while(i != startsAt);
}
@@ -909,22 +918,6 @@ private int jjMoveNfa_0(int startState, int curPos)
return toRet;
}
-static final int[] jjnextStates = {
- 37, 38, 43, 44, 33, 34, 35, 23, 24, 25, 1, 2, 4, 8, 9, 11,
- 27, 28, 19, 20, 41, 42, 45, 46,
-};
-private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
-{
- switch(hiByte)
- {
- case 0:
- return ((jjbitVec2[i2] & l2) != 0L);
- default :
- if ((jjbitVec0[i1] & l1) != 0L)
- return true;
- return false;
- }
-}
/** Token literal values. */
public static final String[] jjstrLiteralImages = {
@@ -932,69 +925,6 @@ public static final String[] jjstrLiteralImages = {
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, "\75", "\74\76", "\76", "\76\75", "\74", "\74\75", "\50",
"\54", "\51", "\53", "\55", "\52", "\57", "\45", "\56", "\133", "\135", };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
- "DEFAULT",
-};
-static final long[] jjtoToken = {
- 0xfffffbffff01L,
-};
-static final long[] jjtoSkip = {
- 0xfeL,
-};
-static final long[] jjtoSpecial = {
- 0x3eL,
-};
-protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[51];
-private final int[] jjstateSet = new int[102];
-protected char curChar;
-/** Constructor. */
-public ConfiguredObjectFilterParserTokenManager(SimpleCharStream stream){
- if (SimpleCharStream.staticFlag)
- throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
- input_stream = stream;
-}
-
-/** Constructor. */
-public ConfiguredObjectFilterParserTokenManager(SimpleCharStream stream, int lexState){
- this(stream);
- SwitchTo(lexState);
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream)
-{
- jjmatchedPos = jjnewStateCnt = 0;
- curLexState = defaultLexState;
- input_stream = stream;
- ReInitRounds();
-}
-private void ReInitRounds()
-{
- int i;
- jjround = 0x80000001;
- for (i = 51; i-- > 0;)
- jjrounds[i] = 0x80000000;
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream, int lexState)
-{
- ReInit(stream);
- SwitchTo(lexState);
-}
-
-/** Switch to specified lex state. */
-public void SwitchTo(int lexState)
-{
- if (lexState >= 1 || lexState < 0)
- throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
- else
- curLexState = lexState;
-}
-
protected Token jjFillToken()
{
final Token t;
@@ -1018,6 +948,22 @@ protected Token jjFillToken()
return t;
}
+static final int[] jjnextStates = {
+ 37, 38, 43, 44, 33, 34, 35, 23, 24, 25, 1, 2, 4, 8, 9, 11,
+ 27, 28, 19, 20, 41, 42, 45, 46,
+};
+private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
+{
+ switch(hiByte)
+ {
+ case 0:
+ return ((jjbitVec2[i2] & l2) != 0L);
+ default :
+ if ((jjbitVec0[i1] & l1) != 0L)
+ return true;
+ return false;
+ }
+}
int curLexState = 0;
int defaultLexState = 0;
@@ -1040,9 +986,10 @@ public Token getNextToken()
{
curChar = input_stream.BeginToken();
}
- catch(java.io.IOException e)
+ catch(Exception e)
{
jjmatchedKind = 0;
+ jjmatchedPos = -1;
matchedToken = jjFillToken();
matchedToken.specialToken = specialToken;
return matchedToken;
@@ -1100,6 +1047,31 @@ public Token getNextToken()
}
}
+void SkipLexicalActions(Token matchedToken)
+{
+ switch(jjmatchedKind)
+ {
+ default :
+ break;
+ }
+}
+void MoreLexicalActions()
+{
+ jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
+ switch(jjmatchedKind)
+ {
+ default :
+ break;
+ }
+}
+void TokenLexicalActions(Token matchedToken)
+{
+ switch(jjmatchedKind)
+ {
+ default :
+ break;
+ }
+}
private void jjCheckNAdd(int state)
{
if (jjrounds[state] != jjround)
@@ -1127,4 +1099,90 @@ private void jjCheckNAddStates(int start, int end)
} while (start++ != end);
}
+ /** Constructor. */
+ public ConfiguredObjectFilterParserTokenManager(SimpleCharStream stream){
+
+ if (SimpleCharStream.staticFlag)
+ throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+
+ input_stream = stream;
+ }
+
+ /** Constructor. */
+ public ConfiguredObjectFilterParserTokenManager (SimpleCharStream stream, int lexState){
+ ReInit(stream);
+ SwitchTo(lexState);
+ }
+
+ /** Reinitialise parser. */
+
+ public void ReInit(SimpleCharStream stream)
+ {
+
+
+ jjmatchedPos =
+ jjnewStateCnt =
+ 0;
+ curLexState = defaultLexState;
+ input_stream = stream;
+ ReInitRounds();
+ }
+
+ private void ReInitRounds()
+ {
+ int i;
+ jjround = 0x80000001;
+ for (i = 51; i-- > 0;)
+ jjrounds[i] = 0x80000000;
+ }
+
+ /** Reinitialise parser. */
+ public void ReInit(SimpleCharStream stream, int lexState)
+
+ {
+ ReInit(stream);
+ SwitchTo(lexState);
+ }
+
+ /** Switch to specified lex state. */
+ public void SwitchTo(int lexState)
+ {
+ if (lexState >= 1 || lexState < 0)
+ throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+ else
+ curLexState = lexState;
+ }
+
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+ "DEFAULT",
+};
+
+/** Lex State array. */
+public static final int[] jjnewLexState = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+};
+static final long[] jjtoToken = {
+ 0xfffffbffff01L,
+};
+static final long[] jjtoSkip = {
+ 0xfeL,
+};
+static final long[] jjtoSpecial = {
+ 0x3eL,
+};
+static final long[] jjtoMore = {
+ 0x0L,
+};
+ protected SimpleCharStream input_stream;
+
+ private final int[] jjrounds = new int[51];
+ private final int[] jjstateSet = new int[2 * 51];
+ private final StringBuilder jjimage = new StringBuilder();
+ private StringBuilder image = jjimage;
+ private int jjimageLen;
+ private int lengthOfMatch;
+ protected int curChar;
}
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ParseException.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ParseException.java
index f6d8cf3aab..765a247a6c 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ParseException.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ParseException.java
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
-/* JavaCCOptions:KEEP_LINE_COL=null */
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
+/* JavaCCOptions:KEEP_LINE_COLUMN=true */
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -41,6 +41,11 @@ public class ParseException extends Exception {
*/
private static final long serialVersionUID = 1L;
+ /**
+ * The end of line string for this machine.
+ */
+ protected static String EOL = System.getProperty("line.separator", "\n");
+
/**
* This constructor is used by the method "generateParseException"
* in the generated parser. Calling this constructor generates
@@ -77,15 +82,11 @@ public class ParseException extends Exception {
super(message);
}
- public ParseException(String message, Throwable t) {
- super(message, t);
- }
-
/**
* This is the last token that has been consumed successfully. If
* this object has been created due to a parse error, the token
- * followng this token will (therefore) be the first error token.
+ * following this token will (therefore) be the first error token.
*/
public Token currentToken;
@@ -113,8 +114,8 @@ public class ParseException extends Exception {
private static String initialise(Token currentToken,
int[][] expectedTokenSequences,
String[] tokenImage) {
- String eol = System.getProperty("line.separator", "\n");
- StringBuffer expected = new StringBuffer();
+
+ StringBuilder expected = new StringBuilder();
int maxSize = 0;
for (int i = 0; i < expectedTokenSequences.length; i++) {
if (maxSize < expectedTokenSequences[i].length) {
@@ -126,7 +127,7 @@ public class ParseException extends Exception {
if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
expected.append("...");
}
- expected.append(eol).append(" ");
+ expected.append(EOL).append(" ");
}
String retval = "Encountered \"";
Token tok = currentToken.next;
@@ -142,21 +143,26 @@ public class ParseException extends Exception {
retval += " \"";
tok = tok.next;
}
- retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
- retval += "." + eol;
- if (expectedTokenSequences.length == 1) {
- retval += "Was expecting:" + eol + " ";
+ if (currentToken.next != null) {
+ retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+ }
+ retval += "." + EOL;
+
+
+ if (expectedTokenSequences.length == 0) {
+ // Nothing to add here
} else {
- retval += "Was expecting one of:" + eol + " ";
+ if (expectedTokenSequences.length == 1) {
+ retval += "Was expecting:" + EOL + " ";
+ } else {
+ retval += "Was expecting one of:" + EOL + " ";
+ }
+ retval += expected.toString();
}
- retval += expected.toString();
+
return retval;
}
- /**
- * The end of line string for this machine.
- */
- protected String eol = System.getProperty("line.separator", "\n");
/**
* Used to convert raw characters to their escaped version
@@ -164,13 +170,11 @@ public class ParseException extends Exception {
* string literal.
*/
static String add_escapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
{
- case 0 :
- continue;
case '\b':
retval.append("\\b");
continue;
@@ -209,4 +213,4 @@ public class ParseException extends Exception {
}
}
-/* JavaCC - OriginalChecksum=86e302402b3556fd1dd7c906c3eb0f4e (do not edit this line) */
+/* JavaCC - OriginalChecksum=108d969fc2da2460096363ef2ed5cf83 (do not edit this line) */
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/SimpleCharStream.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/SimpleCharStream.java
index ec71f9a6a2..50a94b07d9 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/SimpleCharStream.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/SimpleCharStream.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */
/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
/*
*
@@ -51,10 +51,12 @@ public class SimpleCharStream
protected char[] buffer;
protected int maxNextCharInd = 0;
protected int inBuf = 0;
- protected int tabSize = 8;
+ protected int tabSize = 1;
+ protected boolean trackLineColumn = true;
+
+ public void setTabSize(int i) { tabSize = i; }
+ public int getTabSize() { return tabSize; }
- protected void setTabSize(int i) { tabSize = i; }
- protected int getTabSize(int i) { return tabSize; }
protected void ExpandBuff(boolean wrapAround)
@@ -222,22 +224,20 @@ public class SimpleCharStream
return c;
}
- @Deprecated
/**
* @deprecated
* @see #getEndColumn
*/
-
+ @Deprecated
public int getColumn() {
return bufcolumn[bufpos];
}
- @Deprecated
/**
* @deprecated
* @see #getEndLine
*/
-
+ @Deprecated
public int getLine() {
return bufline[bufpos];
}
@@ -487,6 +487,7 @@ public class SimpleCharStream
line = bufline[j];
column = bufcolumn[j];
}
-
+ boolean getTrackLineColumn() { return trackLineColumn; }
+ void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
}
-/* JavaCC - OriginalChecksum=3efb9c848771368fa0394898d2522f7d (do not edit this line) */
+/* JavaCC - OriginalChecksum=86919fd4ede01c26ee7c9b4be3b4b375 (do not edit this line) */
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
index ac8503abef..0671dd24c3 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
-/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */
+/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -150,4 +150,4 @@ public class Token implements java.io.Serializable {
}
}
-/* JavaCC - OriginalChecksum=b8d428e8524dc3fc51037ed1ae1dda29 (do not edit this line) */
+/* JavaCC - OriginalChecksum=7ced342f84792f450d5b7ffa77f45ecf (do not edit this line) */
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
index 2d4fa14fae..6132219a93 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
/* JavaCCOptions: */
/*
*
@@ -24,6 +24,7 @@
package org.apache.qpid.server.management.plugin.servlet.query;
/** Token Manager Error. */
+@SuppressWarnings("all")
public class TokenMgrError extends Error
{
@@ -41,22 +42,22 @@ public class TokenMgrError extends Error
/**
* Lexical error occurred.
*/
- static final int LEXICAL_ERROR = 0;
+ public static final int LEXICAL_ERROR = 0;
/**
* An attempt was made to create a second instance of a static token manager.
*/
- static final int STATIC_LEXER_ERROR = 1;
+ public static final int STATIC_LEXER_ERROR = 1;
/**
* Tried to change to an invalid lexical state.
*/
- static final int INVALID_LEXICAL_STATE = 2;
+ public static final int INVALID_LEXICAL_STATE = 2;
/**
* Detected (and bailed out of) an infinite loop in the token manager.
*/
- static final int LOOP_DETECTED = 3;
+ public static final int LOOP_DETECTED = 3;
/**
* Indicates the reason why the exception is thrown. It will have
@@ -69,13 +70,11 @@ public class TokenMgrError extends Error
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
{
- case 0 :
- continue;
case '\b':
retval.append("\\b");
continue;
@@ -118,19 +117,20 @@ public class TokenMgrError extends Error
* token manager to indicate a lexical error.
* Parameters :
* EOFSeen : indicates if EOF caused the lexical error
- * curLexState : lexical state in which this error occurred
+ * lexState : lexical state in which this error occurred
* errorLine : line number when the error occurred
* errorColumn : column number when the error occurred
* errorAfter : prefix that was seen before this error occurred
* curchar : the offending character
* Note: You can customize the lexical error message by modifying this method.
*/
- protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
- return("Lexical error at line " +
- errorLine + ", column " +
- errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
- "after : \"" + addEscapes(errorAfter) + "\"");
+ protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
+ return("Lexical error at line " + //
+ errorLine + ", column " + //
+ errorColumn + ". Encountered: " + //
+ (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //
+ (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
+ (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
}
/**
@@ -162,8 +162,8 @@ public class TokenMgrError extends Error
}
/** Full Constructor. */
- public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
- this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+ public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
+ this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
-/* JavaCC - OriginalChecksum=b22a24e3549082356c13d44cf7d91a29 (do not edit this line) */
+/* JavaCC - OriginalChecksum=6c420c52f2646c7fda025533a3a2401e (do not edit this line) */
diff --git a/broker-plugins/query-engine/pom.xml b/broker-plugins/query-engine/pom.xml
index ee2d0533dc..6dd0779213 100644
--- a/broker-plugins/query-engine/pom.xml
+++ b/broker-plugins/query-engine/pom.xml
@@ -73,8 +73,8 @@
<plugins>
<plugin>
- <groupId>com.helger.maven</groupId>
- <artifactId>ph-javacc-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
<executions>
<execution>
<id>expression-parser-generated</id>
diff --git a/broker-plugins/query-engine/src/main/grammar/ExpressionParser.jj b/broker-plugins/query-engine/src/main/grammar/ExpressionParser.jj
index ee9cc09665..9233693735 100644
--- a/broker-plugins/query-engine/src/main/grammar/ExpressionParser.jj
+++ b/broker-plugins/query-engine/src/main/grammar/ExpressionParser.jj
@@ -25,6 +25,8 @@
// ----------------------------------------------------------------------------
options {
+ STATIC = false;
+
UNICODE_INPUT = true;
ERROR_REPORTING = true;
diff --git a/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java
index 12b3c09a76..e6133f268e 100644
--- a/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java
+++ b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java
@@ -32,7 +32,7 @@ public class QueryParsingException extends QueryEngineException
{
private String message;
- private final static String INVALID_DATEPART_MARKER = " Was expecting one of: \"DAY\" ... \"HOUR\" ... "
+ private static final String INVALID_DATEPART_MARKER = " Was expecting one of: \"DAY\" ... \"HOUR\" ... "
+ "\"MILLISECOND\" ... \"MINUTE\" ... \"MONTH\" ... \"SECOND\" ... \"WEEK\" ... \"YEAR\"";
protected QueryParsingException()
@@ -77,7 +77,7 @@ public class QueryParsingException extends QueryEngineException
final Matcher matcher = Pattern.compile("(?<=[^\\s][\"|>]\\s\")(.*?)(?=\"\")").matcher(errorMessage);
if (matcher.find())
{
- final String datepart = matcher.group(0);
+ final String datepart = matcher.group(0).trim();
message = "Datepart '" + datepart + "' not supported";
}
}
diff --git a/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java
index 1bb3c4810c..18c34aa40f 100644
--- a/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java
+++ b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java
@@ -312,7 +312,7 @@ public class ExtractExpressionTest
catch (Exception e)
{
assertEquals(QueryParsingException.class, e.getClass());
- assertEquals("Encountered \" \",\" \",\"\" at line 1, column 20. Was expecting: \"FROM\" ...", e.getMessage());
+ assertEquals("Encountered \" \",\" \", \"\" at line 1, column 20. Was expecting: \"FROM\" ...", e.getMessage());
}
}
}
diff --git a/pom.xml b/pom.xml
index 634889c6ce..e05c00e061 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,6 @@
<exec-maven-plugin-version>3.5.0</exec-maven-plugin-version>
<javacc-maven-plugin-version>3.1.1</javacc-maven-plugin-version>
- <ph-javacc-maven-plugin-version>4.1.5</ph-javacc-maven-plugin-version>
<maven-enforcer-plugin-version>3.5.0</maven-enforcer-plugin-version>
<maven-rar-plugin-version>3.0.0</maven-rar-plugin-version>
<license-maven-plugin-version>2.5.0</license-maven-plugin-version>
@@ -1047,11 +1046,6 @@
<artifactId>javacc-maven-plugin</artifactId>
<version>${javacc-maven-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>com.helger.maven</groupId>
- <artifactId>ph-javacc-maven-plugin</artifactId>
- <version>${ph-javacc-maven-plugin-version}</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org