#743 - Fix issue with ElasticSearch nested path query with multiple nested path expressions

This commit is contained in:
Robin Bygrave committed 2016-06-20 20:57:45 +12:00
1 parent 6bbf93aba8
commit 3477f590dd
23 files changed
+742 -6

No files matched your search

@@ -39,7 +39,7 @@ import java.util.Set;
*/
class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, ExpressionList<T> {
private final DefaultExpressionList<T> exprList;
protected final DefaultExpressionList<T> exprList;
protected final Junction.Type type;
@@ -790,4 +790,17 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
public ExpressionList<T> endNot() {
return endJunction();
}
@Override
public String nestedPath(BeanDescriptor<?> desc) {
PrepareDocNested.prepare(exprList, desc, type);
String nestedPath = exprList.allDocNestedPath;
if (nestedPath != null) {
// push the nestedPath up to parent
exprList.setAllDocNested(null);
return nestedPath;
}
return null;
}
}