Remove unused logic (#1672)

Author: ursachec

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoader.scala

@@ -44,16 +44,6 @@ object CpgLoader {
   def createIndexes(cpg: Cpg): Unit =
     new CpgLoader().createIndexes(cpg)
 
-  /** Load and apply overlays from archives to the given CPG.
-    *
-    * @param overlayFilenames
-    *   filenames of proto archives
-    * @param cpg
-    *   The CPG to apply overlays to
-    */
-  def addOverlays(overlayFilenames: Seq[String], cpg: Cpg): Unit =
-    new CpgLoader().addOverlays(overlayFilenames, cpg)
-
   /** Determine whether the CPG is a legacy (proto) CPG
     *
     * @param filename
@@ -98,10 +88,4 @@ private class CpgLoader {
   def createIndexes(cpg: Cpg): Unit =
     cpg.graph.indexManager.createNodePropertyIndex(PropertyNames.FULL_NAME)
 
-  def addOverlays(overlayFilenames: Seq[String], cpg: Cpg): Unit = {
-    overlayFilenames.foreach { overlayFilename =>
-      CpgOverlayLoader.load(overlayFilename, cpg)
-    }
-  }
-
 }

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgOverlayLoader.scala

@@ -4,7 +4,7 @@ import com.google.protobuf.GeneratedMessageV3
 import io.shiftleft.codepropertygraph.Cpg
 import io.shiftleft.proto.cpg.Cpg.CpgStruct.Edge
 import io.shiftleft.proto.cpg.Cpg.CpgStruct.Edge.EdgeType
-import io.shiftleft.proto.cpg.Cpg.{CpgOverlay, CpgStruct, DiffGraph}
+import io.shiftleft.proto.cpg.Cpg.{CpgOverlay, CpgStruct}
 import org.slf4j.{Logger, LoggerFactory}
 import overflowdb.Config
 
@@ -69,9 +69,6 @@ object ProtoCpgLoader {
   def loadOverlays(fileName: String): Try[Iterator[CpgOverlay]] =
     loadOverlays(fileName, CpgOverlay.parseFrom)
 
-  def loadDiffGraphs(fileName: String): Try[Iterator[DiffGraph]] =
-    loadOverlays(fileName, DiffGraph.parseFrom)
-
   private def loadOverlays[T <: GeneratedMessageV3](fileName: String, f: InputStream => T): Try[Iterator[T]] =
     Using(new ZipArchive(fileName)) { zip =>
       zip.entries

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala

@@ -3,11 +3,9 @@ package io.shiftleft.passes
 import com.google.protobuf.GeneratedMessageV3
 import io.shiftleft.SerializedCpg
 import io.shiftleft.codepropertygraph.Cpg
-import io.shiftleft.codepropertygraph.generated.nodes.{NewNode, StoredNode}
 import org.slf4j.{Logger, LoggerFactory, MDC}
 import overflowdb.BatchedUpdate
 
-import java.lang.{Long => JLong}
 import java.util.function.{BiConsumer, Supplier}
 import scala.concurrent.duration.DurationLong
 import scala.util.{Failure, Success, Try}
@@ -244,14 +242,6 @@ trait CpgPassBase {
     }
   }
 
-  protected def serialize(appliedDiffGraph: AppliedDiffGraph, inverse: Boolean): GeneratedMessageV3 = {
-    if (inverse) {
-      new DiffGraphProtoSerializer().serialize(appliedDiffGraph.inverseDiffGraph.get)
-    } else {
-      new DiffGraphProtoSerializer().serialize(appliedDiffGraph)
-    }
-  }
-
   protected def generateOutFileName(prefix: String, outName: String, index: Int): String = {
     val outputName = {
       if (outName.isEmpty) {
@@ -283,19 +273,3 @@ trait CpgPassBase {
   }
 
 }
-
-/** Diff Graph that has been applied to a source graph. This is a wrapper around diff graph, which additionally provides
-  * a map from nodes to graph ids.
-  */
-case class AppliedDiffGraph(
-  diffGraph: DiffGraph,
-  inverseDiffGraph: Option[DiffGraph],
-  private val nodeToOdbNode: java.util.IdentityHashMap[NewNode, StoredNode]
-) {
-
-  /** Obtain the id this node has in the applied graph
-    */
-  def nodeToGraphId(node: NewNode): JLong = {
-    nodeToOdbNode.get(node).id
-  }
-}