Reorganisation

Fraunhofer-AISEC · Dec 17, 2024 · f1bd9ef · f1bd9ef
1 parent 923eba8
commit f1bd9ef
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 24 deletions.
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/OverlayNode.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/OverlayNode.kt
@@ -25,7 +25,7 @@
  */
 package de.fraunhofer.aisec.cpg.graph
 
-import de.fraunhofer.aisec.cpg.graph.concepts.OverlaySingleEdge
+import de.fraunhofer.aisec.cpg.graph.edges.overlay.OverlaySingleEdge
 import de.fraunhofer.aisec.cpg.graph.edges.unwrapping
 import org.neo4j.ogm.annotation.Relationship
 
@@ -45,3 +45,4 @@ abstract class OverlayNode() : Node() {
         )
     var underlyingNode by unwrapping(OverlayNode::underlyingNodeEdge)
 }
+
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/concepts/Concept.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/concepts/Concept.kt
@@ -25,12 +25,7 @@
  */
 package de.fraunhofer.aisec.cpg.graph.concepts
 
-import de.fraunhofer.aisec.cpg.graph.Node
 import de.fraunhofer.aisec.cpg.graph.OverlayNode
-import de.fraunhofer.aisec.cpg.graph.edges.Edge
-import de.fraunhofer.aisec.cpg.graph.edges.collections.EdgeSingletonList
-import de.fraunhofer.aisec.cpg.graph.edges.collections.MirroredEdgeCollection
-import kotlin.reflect.KProperty
 
 /**
  * Represents a new concept added to the CPG. This is intended for modelling "concepts" like
@@ -41,21 +36,3 @@ abstract class Concept<T : Operation>() : OverlayNode() {
     /** All [Operation]s belonging to this concept. */
     val ops: Set<T> = setOf()
 }
-
-class OverlayEdge(start: Node, end: Node) : Edge<Node>(start, end) {
-    override var labels: Set<String> = setOf("OVERLAY")
-}
-
-class OverlaySingleEdge(
-    thisRef: Node,
-    of: Node?,
-    override var mirrorProperty: KProperty<MutableCollection<OverlayEdge>>,
-    outgoing: Boolean = true,
-) :
-    EdgeSingletonList<Node, Node?, OverlayEdge>(
-        thisRef = thisRef,
-        init = ::OverlayEdge,
-        outgoing = outgoing,
-        of = of,
-    ),
-    MirroredEdgeCollection<Node, OverlayEdge>
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/edges/overlay/Overlay.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/edges/overlay/Overlay.kt
@@ -0,0 +1,26 @@
+package de.fraunhofer.aisec.cpg.graph.edges.overlay
+
+import de.fraunhofer.aisec.cpg.graph.Node
+import de.fraunhofer.aisec.cpg.graph.edges.Edge
+import de.fraunhofer.aisec.cpg.graph.edges.collections.EdgeSingletonList
+import de.fraunhofer.aisec.cpg.graph.edges.collections.MirroredEdgeCollection
+import kotlin.reflect.KProperty
+
+
+class OverlayEdge(start: Node, end: Node) : Edge<Node>(start, end) {
+    override var labels: Set<String> = setOf("OVERLAY")
+}
+
+class OverlaySingleEdge(
+    thisRef: Node,
+    of: Node?,
+    override var mirrorProperty: KProperty<MutableCollection<OverlayEdge>>,
+    outgoing: Boolean = true,
+) :
+    EdgeSingletonList<Node, Node?, OverlayEdge>(
+        thisRef = thisRef,
+        init = ::OverlayEdge,
+        outgoing = outgoing,
+        of = of,
+    ),
+    MirroredEdgeCollection<Node, OverlayEdge>
diff --git a/cpg-neo4j/src/test/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Neo4JTest.kt b/cpg-neo4j/src/test/kotlin/de/fraunhofer/aisec/cpg_vis_neo4j/Neo4JTest.kt
@@ -77,6 +77,7 @@ class Neo4JTest {
 
         val connect = Connect(concept = nw)
         connect.underlyingNode = connectCall
+        connect.name = Name("connect")
 
         assertEquals(connect, connectCall?.overlayNode)