codegen: add some type aliases so that the domain-specific code can a…

…void referencing the `overflow` namespace (#275) * codegen: add some type aliases so that the domain-specific code can avoid referencing the `overflow` namespace equivalent of joernio/flatgraph#217 * DiffGraphBuilder doesn't need a type alias for odb already defined as subclass * adapt tests
ShiftLeftSecurity · Jul 3, 2024 · dae4872 · dae4872
1 parent 0b2fa88
commit dae4872
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 3 deletions.
diff --git a/codegen/src/main/scala/overflowdb/codegen/CodeGen.scala b/codegen/src/main/scala/overflowdb/codegen/CodeGen.scala
@@ -1259,6 +1259,28 @@ class CodeGen(schema: Schema) {
       val srcFile = nodeType.className + ".scala"
       results.append(baseDir.createChild(srcFile).write(src))
     }
+
+
+    val packageObject = {
+      val lastSeparatorIdx  = basePackage.lastIndexOf('.')
+      val packageParent     = basePackage.take(lastSeparatorIdx)
+      val packageSimpleName = basePackage.drop(lastSeparatorIdx + 1)
+
+      s"""package $packageParent
+         |
+         |package object $packageSimpleName {
+         |  // some type aliases so that the domain-specific code can avoid referencing the `overflowdb` namespace
+         |  
+         |  object help {
+         |    type Doc = _root_.overflowdb.traversal.help.Doc
+         |    type Traversal = _root_.overflowdb.traversal.help.Traversal
+         |    type TraversalSource = _root_.overflowdb.traversal.help.TraversalSource
+         |  }
+         |}
+         |""".stripMargin
+    }
+    results.append(baseDir.createChild("package.scala").write(packageObject))
+
     results.toSeq
   }
 

diff --git a/integration-tests/schemas/build.sbt b/integration-tests/schemas/build.sbt
@@ -19,7 +19,7 @@ generateDomainClasses := Def.taskDyn {
     }
   } else {
     Def.task {
-      val invoked = (Compile/runMain).toTask(s" CodegenForAllSchemas").value
+      val invoked = (Compile/runMain).toTask(s" overflowdb.integrationtests.CodegenForAllSchemas").value
       lastSchemaMd5(currentSchemaMd5)
       FileUtils.listFilesRecursively(outputRoot)
     }

diff --git a/...src/main/scala/CodegenForAllSchemas.scala → ...tegrationtests/CodegenForAllSchemas.scala b/...src/main/scala/CodegenForAllSchemas.scala → ...tegrationtests/CodegenForAllSchemas.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 import overflowdb.codegen.CodeGen
 
 import java.io.File

diff --git a/...s/schemas/src/main/scala/TestSchema.scala → ...rflowdb/integrationtests/TestSchema.scala b/...s/schemas/src/main/scala/TestSchema.scala → ...rflowdb/integrationtests/TestSchema.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 import overflowdb.schema.SchemaBuilder
 
 trait TestSchema {

diff --git a/...schemas/src/main/scala/TestSchema01.scala → ...lowdb/integrationtests/TestSchema01.scala b/...schemas/src/main/scala/TestSchema01.scala → ...lowdb/integrationtests/TestSchema01.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 import overflowdb.schema.Property.ValueType
 import overflowdb.schema._
 

diff --git a/...schemas/src/main/scala/TestSchema02.scala → ...lowdb/integrationtests/TestSchema02.scala b/...schemas/src/main/scala/TestSchema02.scala → ...lowdb/integrationtests/TestSchema02.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 import overflowdb.schema.Property.ValueType
 import overflowdb.schema._
 

diff --git a/...schemas/src/main/scala/TestSchema03.scala → ...lowdb/integrationtests/TestSchema03.scala b/...schemas/src/main/scala/TestSchema03.scala → ...lowdb/integrationtests/TestSchema03.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 /** complex scenario with multiple layers of base nodes
   * similar to what we use in docker-ext schema extension
   */

diff --git a/...schemas/src/main/scala/TestSchema04.scala → ...lowdb/integrationtests/TestSchema04.scala b/...schemas/src/main/scala/TestSchema04.scala → ...lowdb/integrationtests/TestSchema04.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 import overflowdb.schema.Property._
 
 /** For testing default values on properties with Cardinality.One: we have type-dependent defaults,

diff --git a/...schemas/src/main/scala/TestSchema05.scala → ...lowdb/integrationtests/TestSchema05.scala b/...schemas/src/main/scala/TestSchema05.scala → ...lowdb/integrationtests/TestSchema05.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 import overflowdb.schema.Property._
 
 /** testing all property types with Cardinality.ZeroOrOne */

diff --git a/...schemas/src/main/scala/TestSchema06.scala → ...lowdb/integrationtests/TestSchema06.scala b/...schemas/src/main/scala/TestSchema06.scala → ...lowdb/integrationtests/TestSchema06.scala
@@ -1,3 +1,5 @@
+package overflowdb.integrationtests
+
 import overflowdb.schema.Property.ValueType
 import overflowdb.schema._
 

diff --git a/integration-tests/tests/src/test/scala/Schema01Test.scala b/integration-tests/tests/src/test/scala/Schema01Test.scala
@@ -1,14 +1,15 @@
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import overflowdb.{BatchedUpdate, Config, Graph}
+import overflowdb.integrationtests.testschema01
 import testschema01._
 import testschema01.nodes._
 import testschema01.edges._
 import testschema01.traversal._
 import scala.jdk.CollectionConverters.IteratorHasAsScala
 
 class Schema01Test extends AnyWordSpec with Matchers {
-  import testschema01.traversal._
+  import overflowdb.integrationtests.testschema01.traversal._
   "constants" in {
     PropertyNames.NAME shouldBe "NAME"
     Properties.Order.name shouldBe "ORDER"
@@ -109,7 +110,7 @@ class Schema01Test extends AnyWordSpec with Matchers {
     }
   }
   "work around scala bug 4762, ie generate no extraneous fields" in {
-    Class.forName("testschema01.nodes.Node1").getDeclaredFields.length shouldBe 0
+    Class.forName("overflowdb.integrationtests.testschema01.nodes.Node1").getDeclaredFields.length shouldBe 0
   }
 
 }
diff --git a/integration-tests/tests/src/test/scala/Schema02Test.scala b/integration-tests/tests/src/test/scala/Schema02Test.scala
@@ -1,6 +1,7 @@
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import overflowdb.SchemaViolationException
+import overflowdb.integrationtests.testschema02
 import testschema02._
 import testschema02.edges._
 import testschema02.nodes._

diff --git a/integration-tests/tests/src/test/scala/Schema03Test.scala b/integration-tests/tests/src/test/scala/Schema03Test.scala
@@ -1,4 +1,7 @@
 import overflowdb.traversal._
+import overflowdb.integrationtests.testschema03a
+import overflowdb.integrationtests.testschema03b
+import overflowdb.integrationtests.testschema03c
 
 class Schema03aTest {
   import testschema03a._

diff --git a/integration-tests/tests/src/test/scala/Schema04Test.scala b/integration-tests/tests/src/test/scala/Schema04Test.scala
@@ -1,6 +1,7 @@
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import overflowdb.Graph
+import overflowdb.integrationtests.testschema04
 import testschema04._
 import testschema04.edges._
 import testschema04.nodes._

diff --git a/integration-tests/tests/src/test/scala/Schema05Test.scala b/integration-tests/tests/src/test/scala/Schema05Test.scala
@@ -1,6 +1,7 @@
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import overflowdb.{Config, Graph}
+import overflowdb.integrationtests.testschema05
 import testschema05._
 import testschema05.edges._
 import testschema05.nodes._

diff --git a/integration-tests/tests/src/test/scala/Schema06Test.scala b/integration-tests/tests/src/test/scala/Schema06Test.scala
@@ -1,6 +1,7 @@
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import overflowdb.{BatchedUpdate, Config, Graph}
+import overflowdb.integrationtests.testschema06
 import testschema06._
 import testschema06.nodes._
 import testschema06.edges._