Moved ResolutionStartHolder from TryStatement directly to CatchClause

Fraunhofer-AISEC · Oct 9, 2023 · f87784b · f87784b
1 parent f2066a4
commit f87784b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/CatchClause.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/CatchClause.kt
@@ -28,18 +28,22 @@ package de.fraunhofer.aisec.cpg.graph.statements
 import de.fraunhofer.aisec.cpg.graph.AST
 import de.fraunhofer.aisec.cpg.graph.BranchingNode
 import de.fraunhofer.aisec.cpg.graph.Node
+import de.fraunhofer.aisec.cpg.graph.ResolutionStartHolder
 import de.fraunhofer.aisec.cpg.graph.declarations.VariableDeclaration
 import de.fraunhofer.aisec.cpg.graph.statements.expressions.Block
 import java.util.Objects
 
-class CatchClause : Statement(), BranchingNode {
+class CatchClause : Statement(), BranchingNode, ResolutionStartHolder {
     @AST var parameter: VariableDeclaration? = null
 
     @AST var body: Block? = null
 
     override val branchedBy: Node?
         get() = parameter
 
+    override val resolutionStartNodes: List<Node>
+        get() = listOf(this)
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is CatchClause) return false

diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/TryStatement.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/TryStatement.kt
@@ -26,8 +26,6 @@
 package de.fraunhofer.aisec.cpg.graph.statements
 
 import de.fraunhofer.aisec.cpg.graph.AST
-import de.fraunhofer.aisec.cpg.graph.Node
-import de.fraunhofer.aisec.cpg.graph.ResolutionStartHolder
 import de.fraunhofer.aisec.cpg.graph.edge.PropertyEdge
 import de.fraunhofer.aisec.cpg.graph.edge.PropertyEdge.Companion.propertyEqualsList
 import de.fraunhofer.aisec.cpg.graph.edge.PropertyEdgeDelegate
@@ -36,7 +34,7 @@ import java.util.*
 import org.neo4j.ogm.annotation.Relationship
 
 /** A [Statement] which represents a try/catch block, primarily used for exception handling. */
-class TryStatement : Statement(), ResolutionStartHolder {
+class TryStatement : Statement() {
     @Relationship(value = "RESOURCES", direction = Relationship.Direction.OUTGOING)
     @AST
     var resourceEdges = mutableListOf<PropertyEdge<Statement>>()
@@ -52,8 +50,6 @@ class TryStatement : Statement(), ResolutionStartHolder {
     var catchClauseEdges = mutableListOf<PropertyEdge<CatchClause>>()
 
     var catchClauses by PropertyEdgeDelegate(TryStatement::catchClauseEdges)
-    override val resolutionStartNodes: List<Node>
-        get() = catchClauses
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true