don't generate Properties.scala - PropertyKeys are old school

joernio · Oct 20, 2023 · 7b02026 · 7b02026
1 parent 1126110
commit 7b02026
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 372 deletions.
diff --git a/domain-classes-generator/src/main/scala/io/joern/odb2/schemagen/DomainClassesGenerator.scala b/domain-classes-generator/src/main/scala/io/joern/odb2/schemagen/DomainClassesGenerator.scala
@@ -765,11 +765,8 @@ class DomainClassesGenerator(schema: Schema) {
            |""".stripMargin
       val file = outputDir/s"$className.java"
       os.write(file,
-        s"""package ${schema.basePackage};
+        s"""package ${schema.basePackage}.v2;
            |
-           |import overflowdb.*;
-           |
-           |import java.util.Collection;
            |import java.util.HashSet;
            |import java.util.Set;
            |
@@ -797,21 +794,6 @@ class DomainClassesGenerator(schema: Schema) {
       })
     }
 
-    writeConstantsFile("Properties", schema.properties.map { property =>
-      val src = {
-        val valueType = typeFor(property)
-        val cardinality = property.cardinality
-        import Property.Cardinality
-        val completeType = cardinality match {
-          case Cardinality.One(_) => valueType
-          case Cardinality.ZeroOrOne => valueType
-          case Cardinality.List => s"scala.collection.IndexedSeq<$valueType>"
-        }
-        s"""public static final overflowdb.PropertyKey<$completeType> ${property.name} = new overflowdb.PropertyKey<>("${property.name}");"""
-      }
-      ConstantContext(property.name, src, property.comment)
-    })
-
     results.result()
   }
 

diff --git a/joern-generated/src/main/scala/generated/ControlStructureTypes.java b/joern-generated/src/main/scala/generated/ControlStructureTypes.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/DispatchTypes.java b/joern-generated/src/main/scala/generated/DispatchTypes.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/EdgeTypes.java b/joern-generated/src/main/scala/generated/EdgeTypes.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/EvaluationStrategies.java b/joern-generated/src/main/scala/generated/EvaluationStrategies.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/Languages.java b/joern-generated/src/main/scala/generated/Languages.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/ModifierTypes.java b/joern-generated/src/main/scala/generated/ModifierTypes.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/NodeTypes.java b/joern-generated/src/main/scala/generated/NodeTypes.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/Operators.java b/joern-generated/src/main/scala/generated/Operators.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 

diff --git a/joern-generated/src/main/scala/generated/Properties.java b/joern-generated/src/main/scala/generated/Properties.java
diff --git a/joern-generated/src/main/scala/generated/PropertyNames.java b/joern-generated/src/main/scala/generated/PropertyNames.java
@@ -1,8 +1,5 @@
-package io.shiftleft.codepropertygraph.generated;
+package io.shiftleft.codepropertygraph.generated.v2;
 
-import overflowdb.*;
-
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;