#217 - ENH: Restore findFutureList() removing its previous deprecated status. Change implementation to use its own PersistenceContext (aka PersistenceContextScope.QUERY)

This commit is contained in:
rbygrave committed 2014-12-01 23:09:25 +13:00
1 parent dd30b43d59
commit 8237072f5b
9 files changed
+399 -141

No files matched your search

@@ -59,6 +59,7 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
this.exprList = new DefaultExpressionList<T>(query, parent);
}
@Override
public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
List<SpiExpression> list = exprList.internalList();
@@ -79,17 +80,20 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
}
}
@Override
public Junction<T> add(Expression item) {
SpiExpression i = (SpiExpression) item;
exprList.add(i);
return this;
}
@Override
public Junction<T> addAll(ExpressionList<T> addList) {
exprList.addAll(addList);
return this;
}
@Override
public void addBindValues(SpiExpressionRequest request) {
List<SpiExpression> list = exprList.internalList();
@@ -100,6 +104,7 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
}
}
@Override
public void addSql(SpiExpressionRequest request) {
List<SpiExpression> list = exprList.internalList();
@@ -122,6 +127,7 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
/**
* Based on Junction type and all the expression contained.
*/
@Override
public void queryAutoFetchHash(HashQueryPlanBuilder builder) {
builder.add(JunctionExpression.class).add(joinType);
List<SpiExpression> list = exprList.internalList();
@@ -130,6 +136,7 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
}
}
@Override
public void queryPlanHash(BeanQueryRequest<?> request, HashQueryPlanBuilder builder) {
builder.add(JunctionExpression.class).add(joinType);
List<SpiExpression> list = exprList.internalList();
@@ -138,6 +145,7 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
}
}
@Override
public int queryBindHash() {
int hc = JunctionExpression.class.getName().hashCode();
@@ -149,50 +157,62 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
return hc;
}
@Override
public ExpressionList<T> endJunction() {
return exprList.endJunction();
}
@Override
public ExpressionList<T> allEq(Map<String, Object> propertyMap) {
return exprList.allEq(propertyMap);
}
@Override
public ExpressionList<T> and(Expression expOne, Expression expTwo) {
return exprList.and(expOne, expTwo);
}
@Override
public ExpressionList<T> between(String propertyName, Object value1, Object value2) {
return exprList.between(propertyName, value1, value2);
}
@Override
public ExpressionList<T> betweenProperties(String lowProperty, String highProperty, Object value) {
return exprList.betweenProperties(lowProperty, highProperty, value);
}
@Override
public Junction<T> conjunction() {
return exprList.conjunction();
}
@Override
public ExpressionList<T> contains(String propertyName, String value) {
return exprList.contains(propertyName, value);
}
@Override
public Junction<T> disjunction() {
return exprList.disjunction();
}
@Override
public ExpressionList<T> endsWith(String propertyName, String value) {
return exprList.endsWith(propertyName, value);
}
@Override
public ExpressionList<T> eq(String propertyName, Object value) {
return exprList.eq(propertyName, value);
}
@Override
public ExpressionList<T> exampleLike(Object example) {
return exprList.exampleLike(example);
}
@Override
public ExpressionList<T> filterMany(String prop) {
throw new RuntimeException("filterMany not allowed on Junction expression list");
}
@@ -202,18 +222,22 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
return exprList.apply(pathProperties);
}
@Override
public FutureIds<T> findFutureIds() {
return exprList.findFutureIds();
}
@Override
public FutureList<T> findFutureList() {
return exprList.findFutureList();
}
@Override
public FutureRowCount<T> findFutureRowCount() {
return exprList.findFutureRowCount();
}
@Override
public List<Object> findIds() {
return exprList.findIds();
}
@@ -228,22 +252,27 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
exprList.findEachWhile(consumer);
}
@Override
public void findVisit(QueryResultVisitor<T> visitor) {
exprList.findVisit(visitor);
}
@Override
public QueryIterator<T> findIterate() {
return exprList.findIterate();
}
@Override
public List<T> findList() {
return exprList.findList();
}
@Override
public Map<?, T> findMap() {
return exprList.findMap();
}
@Override
public <K> Map<K, T> findMap(String keyProperty, Class<K> keyType) {
return exprList.findMap(keyProperty, keyType);
}
@@ -253,166 +282,207 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
return exprList.findPagedList(pageIndex, pageSize);
}
@Override
public int findRowCount() {
return exprList.findRowCount();
}
@Override
public Set<T> findSet() {
return exprList.findSet();
}
@Override
public T findUnique() {
return exprList.findUnique();
}
@Override
public ExpressionList<T> ge(String propertyName, Object value) {
return exprList.ge(propertyName, value);
}
@Override
public ExpressionList<T> gt(String propertyName, Object value) {
return exprList.gt(propertyName, value);
}
@Override
public ExpressionList<T> having() {
throw new RuntimeException("having() not allowed on Junction expression list");
}
@Override
public ExpressionList<T> icontains(String propertyName, String value) {
return exprList.icontains(propertyName, value);
}
@Override
public ExpressionList<T> idEq(Object value) {
return exprList.idEq(value);
}
@Override
public ExpressionList<T> idIn(List<?> idValues) {
return exprList.idIn(idValues);
}
@Override
public ExpressionList<T> iendsWith(String propertyName, String value) {
return exprList.iendsWith(propertyName, value);
}
@Override
public ExpressionList<T> ieq(String propertyName, String value) {
return exprList.ieq(propertyName, value);
}
@Override
public ExpressionList<T> iexampleLike(Object example) {
return exprList.iexampleLike(example);
}
@Override
public ExpressionList<T> ilike(String propertyName, String value) {
return exprList.ilike(propertyName, value);
}
@Override
public ExpressionList<T> in(String propertyName, Collection<?> values) {
return exprList.in(propertyName, values);
}
@Override
public ExpressionList<T> in(String propertyName, Object... values) {
return exprList.in(propertyName, values);
}
@Override
public ExpressionList<T> in(String propertyName, com.avaje.ebean.Query<?> subQuery) {
return exprList.in(propertyName, subQuery);
}
@Override
public ExpressionList<T> isNotNull(String propertyName) {
return exprList.isNotNull(propertyName);
}
@Override
public ExpressionList<T> isNull(String propertyName) {
return exprList.isNull(propertyName);
}
@Override
public ExpressionList<T> istartsWith(String propertyName, String value) {
return exprList.istartsWith(propertyName, value);
}
@Override
public ExpressionList<T> le(String propertyName, Object value) {
return exprList.le(propertyName, value);
}
@Override
public ExpressionList<T> like(String propertyName, String value) {
return exprList.like(propertyName, value);
}
@Override
public ExpressionList<T> lt(String propertyName, Object value) {
return exprList.lt(propertyName, value);
}
@Override
public ExpressionList<T> ne(String propertyName, Object value) {
return exprList.ne(propertyName, value);
}
@Override
public ExpressionList<T> not(Expression exp) {
return exprList.not(exp);
}
@Override
public ExpressionList<T> or(Expression expOne, Expression expTwo) {
return exprList.or(expOne, expTwo);
}
@Override
public OrderBy<T> order() {
return exprList.order();
}
@Override
public com.avaje.ebean.Query<T> order(String orderByClause) {
return exprList.order(orderByClause);
}
@Override
public OrderBy<T> orderBy() {
return exprList.orderBy();
}
@Override
public com.avaje.ebean.Query<T> orderBy(String orderBy) {
return exprList.orderBy(orderBy);
}
@Override
public com.avaje.ebean.Query<T> query() {
return exprList.query();
}
@Override
public ExpressionList<T> raw(String raw, Object value) {
return exprList.raw(raw, value);
}
@Override
public ExpressionList<T> raw(String raw, Object[] values) {
return exprList.raw(raw, values);
}
@Override
public ExpressionList<T> raw(String raw) {
return exprList.raw(raw);
}
@Override
public com.avaje.ebean.Query<T> select(String properties) {
return exprList.select(properties);
}
@Override
public com.avaje.ebean.Query<T> setFirstRow(int firstRow) {
return exprList.setFirstRow(firstRow);
}
@Override
public com.avaje.ebean.Query<T> setMapKey(String mapKey) {
return exprList.setMapKey(mapKey);
}
@Override
public com.avaje.ebean.Query<T> setMaxRows(int maxRows) {
return exprList.setMaxRows(maxRows);
}
@Override
public com.avaje.ebean.Query<T> setOrderBy(String orderBy) {
return exprList.setOrderBy(orderBy);
}
@Override
public com.avaje.ebean.Query<T> setUseCache(boolean useCache) {
return exprList.setUseCache(useCache);
}
@Override
public ExpressionList<T> startsWith(String propertyName, String value) {
return exprList.startsWith(propertyName, value);
}
@Override
public ExpressionList<T> where() {
return exprList.where();
}