Skip to content

Commit eb8b324

Browse files
committed
Removed redundant code
1 parent 08902bc commit eb8b324

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

entities/src/main/java/org/odk/collect/entities/javarosa/filter/LocalEntitiesFilterStrategy.kt

+7-15
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class LocalEntitiesFilterStrategy(entitiesRepository: EntitiesRepository) :
4141
val query = xPathExpressionToQuery(predicate, sourceInstance, evaluationContext)
4242

4343
return if (query != null) {
44-
queryToTreeReferences(query, sourceInstance, next)
44+
queryToTreeReferences(query, sourceInstance)
4545
} else {
4646
next.get()
4747
}
@@ -99,20 +99,12 @@ class LocalEntitiesFilterStrategy(entitiesRepository: EntitiesRepository) :
9999
}
100100
}
101101

102-
private fun queryToTreeReferences(
103-
query: Query?,
104-
sourceInstance: DataInstance<*>,
105-
next: Supplier<MutableList<TreeReference>>
106-
): List<TreeReference> {
107-
return if (query != null) {
108-
val results = instanceAdapter.query(sourceInstance.instanceId, query)
109-
sourceInstance.replacePartialElements(results)
110-
results.map {
111-
it.parent = sourceInstance.root
112-
it.ref
113-
}
114-
} else {
115-
next.get()
102+
private fun queryToTreeReferences(query: Query, sourceInstance: DataInstance<*>): List<TreeReference> {
103+
val results = instanceAdapter.query(sourceInstance.instanceId, query)
104+
sourceInstance.replacePartialElements(results)
105+
return results.map {
106+
it.parent = sourceInstance.root
107+
it.ref
116108
}
117109
}
118110
}

0 commit comments

Comments
 (0)