Closes: epicosy#5. graph-for-funcs.sc script update

Author: epicosy

joern/graph-for-funcs.sc

@@ -30,15 +30,14 @@ import io.shiftleft.semanticcpg.language.types.expressions.generalizations.CfgNo
 import io.shiftleft.codepropertygraph.generated.EdgeTypes
 import io.shiftleft.codepropertygraph.generated.NodeTypes
 import io.shiftleft.codepropertygraph.generated.nodes
-import io.shiftleft.dataflowengine.language._
+import io.shiftleft.dataflowengineoss.language._
 import io.shiftleft.semanticcpg.language._
 import io.shiftleft.semanticcpg.language.types.expressions.Call
 import io.shiftleft.semanticcpg.language.types.structure.Local
 import io.shiftleft.codepropertygraph.generated.nodes.MethodParameterIn
 
-import gremlin.scala._
-import org.apache.tinkerpop.gremlin.structure.Edge
-import org.apache.tinkerpop.gremlin.structure.VertexProperty
+import overflowdb._
+import overflowdb.traversal._
 
 final case class GraphForFuncsFunction(function: String,
                                        file: String,
@@ -48,12 +47,12 @@ final case class GraphForFuncsFunction(function: String,
                                        PDG: List[nodes.AstNode])
 final case class GraphForFuncsResult(functions: List[GraphForFuncsFunction])
 
-implicit val encodeEdge: Encoder[Edge] =
-  (edge: Edge) =>
+implicit val encodeEdge: Encoder[OdbEdge] =
+  (edge: OdbEdge) =>
     Json.obj(
       ("id", Json.fromString(edge.toString)),
-      ("in", Json.fromString(edge.inVertex().toString)),
-      ("out", Json.fromString(edge.outVertex().toString))
+      ("in", Json.fromString(edge.inNode.toString)),
+      ("out", Json.fromString(edge.outNode.toString))
     )
 
 implicit val encodeNode: Encoder[nodes.AstNode] =
@@ -62,10 +61,10 @@ implicit val encodeNode: Encoder[nodes.AstNode] =
       ("id", Json.fromString(node.toString)),
       ("edges",
         Json.fromValues((node.inE("AST", "CFG").l ++ node.outE("AST", "CFG").l).map(_.asJson))),
-      ("properties", Json.fromValues(node.properties().asScala.toList.map { p: VertexProperty[_] =>
+      ("properties", Json.fromValues(node.propertyMap.asScala.toList.map { case (key, value) =>
         Json.obj(
-          ("key", Json.fromString(p.key())),
-          ("value", Json.fromString(p.value().toString))
+          ("key", Json.fromString(key)),
+          ("value", Json.fromString(value.toString))
         )
       }))
     )
@@ -77,24 +76,22 @@ implicit val encodeFuncResult: Encoder[GraphForFuncsResult] = deriveEncoder
   GraphForFuncsResult(
     cpg.method.map { method =>
       val methodName = method.fullName
-      val methodFile = method.location.filename
       val methodId = method.toString
+      val methodFile = method.location.filename
+      val methodVertex: Vertex = method //TODO MP drop as soon as we have the remainder of the below in ODB graph api
 
       val astChildren = method.astMinusRoot.l
-
-      val cfgChildren = new NodeSteps(
-        method.out(EdgeTypes.CONTAINS).filterOnEnd(_.isInstanceOf[nodes.CfgNode]).cast[nodes.CfgNode]
-      ).l
+      val cfgChildren = method.out(EdgeTypes.CONTAINS).asScala.collect { case node: nodes.CfgNode => node }.toList
 
       val local = new NodeSteps(
-        method
+        methodVertex
           .out(EdgeTypes.CONTAINS)
           .hasLabel(NodeTypes.BLOCK)
           .out(EdgeTypes.AST)
           .hasLabel(NodeTypes.LOCAL)
           .cast[nodes.Local])
       val sink = local.evalType(".*").referencingIdentifiers.dedup
-      val source = new NodeSteps(method.out(EdgeTypes.CONTAINS).hasLabel(NodeTypes.CALL).cast[nodes.Call]).nameNot("<operator>.*").dedup
+      val source = new NodeSteps(methodVertex.out(EdgeTypes.CONTAINS).hasLabel(NodeTypes.CALL).cast[nodes.Call]).nameNot("<operator>.*").dedup
 
       val pdgChildren = sink
         .reachableByFlows(source)