Commit 1fdb381d authored by Matija Obreza's avatar Matija Obreza

Merge branch 'ui-582-wrong-counting-of-not-specify-datasets' into 'master'

Fixed generation of NULL/NOTNULL paths for collection paths

See merge request genesys-pgr/application-blocks!64
parents 8c959f39 2409f4e7
...@@ -200,6 +200,8 @@ public abstract class BasicModelFilter<T extends BasicModelFilter<T, R>, R exten ...@@ -200,6 +200,8 @@ public abstract class BasicModelFilter<T extends BasicModelFilter<T, R>, R exten
final Field prop = clazz.getField(nullProp); final Field prop = clazz.getField(nullProp);
if (SimpleExpression.class.isAssignableFrom(prop.getType())) { if (SimpleExpression.class.isAssignableFrom(prop.getType())) {
return (SimpleExpression<?>) prop.get(instance); return (SimpleExpression<?>) prop.get(instance);
} if (CollectionPathBase.class.isAssignableFrom(prop.getType())) {
return(CollectionPathBase<?, ?, ?>) prop.get(instance);
} else { } else {
throw new NoSuchFieldException("Property " + nullProp + " is not a SimpleExpression"); throw new NoSuchFieldException("Property " + nullProp + " is not a SimpleExpression");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment