#605 - Add and() and or() ... as synonyms for conjunction() and disjunction() ... to the "Query Criteria API"

This commit is contained in:
Robin Bygrave committed 2016-03-18 13:06:10 +13:00
1 parent 5d889790c2
commit 3ddd7099b5
5 files changed
+70 -9

No files matched your search

@@ -652,6 +652,16 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return junction;
}
@Override
public Junction<T> and() {
return conjunction();
}
@Override
public Junction<T> or() {
return disjunction();
}
@Override
public Junction<T> conjunction() {
Junction<T> conjunction = expr.conjunction(query, this);
@@ -320,6 +320,16 @@ abstract class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, E
return exprList.betweenProperties(lowProperty, highProperty, value);
}
@Override
public Junction<T> and() {
return conjunction();
}
@Override
public Junction<T> or() {
return disjunction();
}
@Override
public Junction<T> conjunction() {
return exprList.conjunction();