🔥 Code Cleanup (#52)

* 🔥 Removed unused query * ⚡ Improved schema violation check * 🔥 Removed EdgeLabel from drivers * 🔥 Removed the rest of the enums * 🔥 Removed some more code * 💚 Fixing build
plume-oss · Feb 3, 2021 · d8d84bc · d8d84bc
1 parent d069098
commit d8d84bc
Show file tree

Hide file tree

Showing 36 changed files with 531 additions and 925 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 ### Changed
+- Replaced Plume enums with `codepropertygraph` constants
 
 ### Fixed
 

diff --git a/cpgconv/src/main/scala/io/github/plume/oss/Traversals.scala b/cpgconv/src/main/scala/io/github/plume/oss/Traversals.scala
@@ -37,15 +37,6 @@ object Traversals {
       .asJava
   }
 
-  def getWholeGraph(graph: Graph): util.List[(StoredNode, util.List[Edge])] = {
-    Cpg(graph).all
-      .map { node =>
-        (node, node.outE.asScala.toList.asJava)
-      }
-      .l
-      .asJava
-  }
-
   import overflowdb.traversal._
   def getProgramStructure(graph: Graph): util.List[Edge] = {
     val edgesFromFile: List[Edge] = Cpg(graph).file

diff --git a/plume/src/main/kotlin/io/github/plume/oss/domain/enums/DispatchType.kt b/plume/src/main/kotlin/io/github/plume/oss/domain/enums/DispatchType.kt
diff --git a/plume/src/main/kotlin/io/github/plume/oss/domain/enums/EdgeLabel.kt b/plume/src/main/kotlin/io/github/plume/oss/domain/enums/EdgeLabel.kt
diff --git a/plume/src/main/kotlin/io/github/plume/oss/domain/enums/EvaluationStrategy.kt b/plume/src/main/kotlin/io/github/plume/oss/domain/enums/EvaluationStrategy.kt
diff --git a/plume/src/main/kotlin/io/github/plume/oss/domain/enums/ModifierType.kt b/plume/src/main/kotlin/io/github/plume/oss/domain/enums/ModifierType.kt
diff --git a/plume/src/main/kotlin/io/github/plume/oss/domain/enums/VertexBaseTrait.kt b/plume/src/main/kotlin/io/github/plume/oss/domain/enums/VertexBaseTrait.kt
diff --git a/plume/src/main/kotlin/io/github/plume/oss/domain/enums/VertexLabel.kt b/plume/src/main/kotlin/io/github/plume/oss/domain/enums/VertexLabel.kt
diff --git a/plume/src/main/kotlin/io/github/plume/oss/domain/exceptions/PlumeSchemaViolationException.kt b/plume/src/main/kotlin/io/github/plume/oss/domain/exceptions/PlumeSchemaViolationException.kt
@@ -1,10 +1,9 @@
 package io.github.plume.oss.domain.exceptions
 
-import io.github.plume.oss.domain.enums.EdgeLabel
 import io.shiftleft.codepropertygraph.generated.nodes.NewNodeBuilder
 
 /**
  * Thrown when an invalid edge connection is attempted to be created between two [NewNodeBuilder]s.
  */
-class PlumeSchemaViolationException(fromV: NewNodeBuilder, toV: NewNodeBuilder, edgeLabel: EdgeLabel) :
+class PlumeSchemaViolationException(fromV: NewNodeBuilder, toV: NewNodeBuilder, edgeLabel: String) :
     RuntimeException("CPG schema violation adding a $edgeLabel edge from ${fromV.javaClass.simpleName} to ${toV.javaClass.simpleName}")