CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-30 21:08:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added better error reporting

Browse Source
This commit is contained in:
Timo Westkämper 2009-04-21 12:43:05 +00:00
parent 97e9564ad6
commit 8b8d2d39b2
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
querydsl-collections/src/main/java/com/mysema/query/collections/eval/JaninoEvaluator.java
View File

@ -24,14 +24,22 @@ public class JaninoEvaluator implements Evaluator{
private final ExpressionEvaluator ev;
public JaninoEvaluator(ExpressionEvaluator ev){
private final Expr<?> projection;
private final List<? extends Expr<?>> sources;
public JaninoEvaluator(ExpressionEvaluator ev, List<? extends Expr<?>> sources, Expr<?> projection){
this.ev = Assert.notNull(ev);
this.sources = sources;
this.projection = projection;
}
public JaninoEvaluator(JavaOps ops, List<? extends Expr<?>> sources, Expr<?> expr){
try {
Class<?> type = expr.getType() != null ? expr.getType() : Object.class;
ev = new JavaSerializer(ops).handle(expr).createExpressionEvaluator(sources, type);
this.ev = new JavaSerializer(ops).handle(expr).createExpressionEvaluator(sources, type);
this.sources = sources;
this.projection = expr;
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
@ -43,7 +51,12 @@ public class JaninoEvaluator implements Evaluator{
return (T)ev.evaluate(args);
} catch (InvocationTargetException e) {
if (e.getCause() instanceof NullPointerException){
throw new IllegalArgumentException("null path in expression");
for (int i=0; i < args.length; i++){
if (args[i] == null){
throw new IllegalArgumentException("null for " + sources.get(i));
}
}
throw new IllegalArgumentException("null in " + projection);
}else{
throw new RuntimeException(e.getMessage(), e);
}

2
querydsl-collections/src/main/java/com/mysema/query/collections/iterators/FilteringMultiIterator.java
View File

@ -81,7 +81,7 @@ public class FilteringMultiIterator extends MultiIterator implements IteratorSou
logger.info("Filtering iterator for source");
ExpressionEvaluator ev = serializer.createExpressionEvaluator(sources, boolean.class);
if (ev != null){
return new JaninoEvaluator(ev);
return new JaninoEvaluator(ev, sources, where);
}else{
return null;
}

2
querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java
View File

@ -151,7 +151,7 @@ public class AliasTest extends AbstractQueryTest{
from(cat,cats).where(cat.mate.alive).list(cat);
fail("expected RuntimeException");
}catch(RuntimeException e){
assertEquals("null path in expression", e.getMessage());
assertEquals("null in cat.mate.alive", e.getMessage());
}
// 12