chore: Simplify filter logic for VssNode.findSignal()

eclipse-kuksa · Mar 14, 2024 · 3579307 · 3579307
1 parent 4975b33
commit 3579307
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/vss-core/src/main/kotlin/org/eclipse/kuksa/vsscore/model/VssNode.kt b/vss-core/src/main/kotlin/org/eclipse/kuksa/vsscore/model/VssNode.kt
@@ -223,19 +223,17 @@ fun VssNode.findHeritageLine(
 /**
  * Finds the given [signal] inside the current [VssNode].
  */
-inline fun <reified T : VssSignal<V>, V : Any> VssNode.findSignal(signal: T): T {
+inline fun <reified T : VssSignal<V>, V : Any> VssNode.findSignal(signal: T): VssNode {
     return heritage
-        .filterIsInstance<T>()
         .first { it.uuid == signal.uuid }
 }
 
 /**
  * Finds all [VssSignal] which matches the given [KClass.simpleName]. This is useful when multiple nested objects
  * with the same Name exists but are pretty much the same besides the [VssNode.vssPath] etc.
  */
-inline fun <reified T : VssSignal<V>, V : Any> VssNode.findSignal(type: KClass<T>): Map<String, T> {
+inline fun <reified T : VssSignal<V>, V : Any> VssNode.findSignal(type: KClass<T>): Map<String, VssNode> {
     return heritage
-        .filterIsInstance<T>()
         .filter { it::class.simpleName == type.simpleName }
         .associateBy { it.vssPath }
 }