File tree 1 file changed +3
-9
lines changed
entities/src/main/java/org/odk/collect/entities/javarosa/filter
1 file changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ class LocalEntitiesFilterStrategy(entitiesRepository: EntitiesRepository) :
41
41
val query = xPathExpressionToQuery(predicate, sourceInstance, evaluationContext)
42
42
43
43
return if (query != null ) {
44
- queryToTreeReferences(query, sourceInstance, next )
44
+ queryToTreeReferences(query, sourceInstance)
45
45
} else {
46
46
next.get()
47
47
}
@@ -99,20 +99,14 @@ class LocalEntitiesFilterStrategy(entitiesRepository: EntitiesRepository) :
99
99
}
100
100
}
101
101
102
- private fun queryToTreeReferences (
103
- query : Query ? ,
104
- sourceInstance : DataInstance <* >,
105
- next : Supplier <MutableList <TreeReference >>
106
- ): List <TreeReference > {
107
- return if (query != null ) {
102
+ private fun queryToTreeReferences (query : Query , sourceInstance : DataInstance <* >): List <TreeReference > {
103
+ return run {
108
104
val results = instanceAdapter.query(sourceInstance.instanceId, query)
109
105
sourceInstance.replacePartialElements(results)
110
106
results.map {
111
107
it.parent = sourceInstance.root
112
108
it.ref
113
109
}
114
- } else {
115
- next.get()
116
110
}
117
111
}
118
112
}
You can’t perform that action at this time.
0 commit comments