Cleanup of expressions after FilterExprPath now only needed on FilterExpressionList

This commit is contained in:
Rob Bygrave committed 2014-01-31 00:48:59 +13:00
1 parent 456a1d8608
commit 8bfa331c61
16 files changed
+87 -147

No files matched your search

@@ -42,7 +42,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
protected transient ExpressionFactory expr;
private final String exprLang;
private final String listAndStart;
private final String listAndEnd;
private final String listAndJoin;
@@ -59,20 +58,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
this.list = list;
this.query = query;
this.expr = expr;
this.exprLang = expr.getLang();
this.parentExprList = parentExprList;
if ("ldap".equals(exprLang)) {
// Language is LDAP
listAndStart = "(&";
listAndEnd = ")";
listAndJoin = "";
} else {
listAndStart = "";
listAndEnd = "";
listAndJoin = " and ";
}
this.listAndStart = "";
this.listAndEnd = "";
this.listAndJoin = " and ";
}
public SpiExpressionList<?> trimPath(int prefixTrim) {
@@ -231,6 +221,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return query.setMapKey(mapKey);
}
@Deprecated
public Query<T> setListener(QueryListener<T> queryListener) {
return query.setListener(queryListener);
}
@@ -136,6 +136,7 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
return rootQuery.setFirstRow(firstRow);
}
@Deprecated
public Query<T> setListener(QueryListener<T> queryListener) {
return rootQuery.setListener(queryListener);
}