use scala primitives (e.g. Integer -> Int)

build.sbt

@@ -2,7 +2,7 @@ name := "codepropertygraph"
 
 // parsed by project/Versions.scala, updated by updateDependencies.sh
 val overflowdbVersion = "1.192"
-val overflowdbCodegenVersion = "2.107"
+val overflowdbCodegenVersion = "2.108"
 
 inThisBuild(
   List(

codepropertygraph/src/test/scala/io/shiftleft/passes/ParallelCpgPassNewTests.scala

@@ -33,7 +33,7 @@ class ParallelCpgPassNewTests extends AnyWordSpec with Matchers {
   "ConcurrentWriterCpgPass" should {
     "allow creating and applying result of pass" in Fixture() { (cpg, pass) =>
       pass.createAndApply()
-      cpg.graph.nodes.map(_.property(Properties.NAME)).toSetMutable shouldBe Set("foo", "bar")
+      cpg.graph.nodes.map(_.property(Properties.Name)).toSetMutable shouldBe Set("foo", "bar")
     }
 
     "produce a serialized CPG file" in Fixture() { (_, pass) =>

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Properties.scala

@@ -0,0 +1,117 @@
+package io.shiftleft.codepropertygraph.generated
+
+object Properties {
+  val AliasTypeFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("ALIAS_TYPE_FULL_NAME")
+
+  val ArgumentIndex: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("ARGUMENT_INDEX")
+
+  val ArgumentName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("ARGUMENT_NAME")
+
+  val AstParentFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("AST_PARENT_FULL_NAME")
+
+  val AstParentType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("AST_PARENT_TYPE")
+
+  val CanonicalName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CANONICAL_NAME")
+
+  val ClassName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLASS_NAME")
+
+  val ClassShortName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLASS_SHORT_NAME")
+
+  val ClosureBindingId: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLOSURE_BINDING_ID")
+
+  val ClosureOriginalName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CLOSURE_ORIGINAL_NAME")
+
+  val Code: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CODE")
+
+  val ColumnNumber: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("COLUMN_NUMBER")
+
+  val ColumnNumberEnd: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("COLUMN_NUMBER_END")
+
+  val ContainedRef: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CONTAINED_REF")
+
+  val Content: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CONTENT")
+
+  val ControlStructureType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("CONTROL_STRUCTURE_TYPE")
+
+  val DependencyGroupId: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("DEPENDENCY_GROUP_ID")
+
+  val DispatchType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("DISPATCH_TYPE")
+
+  val DynamicTypeHintFullName: overflowdb.PropertyKey[IndexedSeq[String]] =
+    new overflowdb.PropertyKey("DYNAMIC_TYPE_HINT_FULL_NAME")
+
+  val EvaluationStrategy: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("EVALUATION_STRATEGY")
+
+  val ExplicitAs: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("EXPLICIT_AS")
+
+  val Filename: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("FILENAME")
+
+  val FullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("FULL_NAME")
+
+  val Hash: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("HASH")
+
+  val ImportedAs: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("IMPORTED_AS")
+
+  val ImportedEntity: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("IMPORTED_ENTITY")
+
+  val Index: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("INDEX")
+
+  val InheritsFromTypeFullName: overflowdb.PropertyKey[IndexedSeq[String]] =
+    new overflowdb.PropertyKey("INHERITS_FROM_TYPE_FULL_NAME")
+
+  val IsExplicit: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_EXPLICIT")
+
+  val IsExternal: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_EXTERNAL")
+
+  val IsVariadic: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_VARIADIC")
+
+  val IsWildcard: overflowdb.PropertyKey[Boolean] = new overflowdb.PropertyKey("IS_WILDCARD")
+
+  val Key: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("KEY")
+
+  val Language: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("LANGUAGE")
+
+  val LineNumber: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("LINE_NUMBER")
+
+  val LineNumberEnd: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("LINE_NUMBER_END")
+
+  val MethodFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("METHOD_FULL_NAME")
+
+  val MethodShortName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("METHOD_SHORT_NAME")
+
+  val ModifierType: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("MODIFIER_TYPE")
+
+  val Name: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("NAME")
+
+  val NodeLabel: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("NODE_LABEL")
+
+  val Offset: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("OFFSET")
+
+  val OffsetEnd: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("OFFSET_END")
+
+  val Order: overflowdb.PropertyKey[scala.Int] = new overflowdb.PropertyKey("ORDER")
+
+  val Overlays: overflowdb.PropertyKey[IndexedSeq[String]] = new overflowdb.PropertyKey("OVERLAYS")
+
+  val PackageName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("PACKAGE_NAME")
+
+  val ParserTypeName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("PARSER_TYPE_NAME")
+
+  val PossibleTypes: overflowdb.PropertyKey[IndexedSeq[String]] = new overflowdb.PropertyKey("POSSIBLE_TYPES")
+
+  val Root: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("ROOT")
+
+  val Signature: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("SIGNATURE")
+
+  val Symbol: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("SYMBOL")
+
+  val TypeDeclFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("TYPE_DECL_FULL_NAME")
+
+  val TypeFullName: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("TYPE_FULL_NAME")
+
+  val Value: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("VALUE")
+
+  val Variable: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("VARIABLE")
+
+  val Version: overflowdb.PropertyKey[String] = new overflowdb.PropertyKey("VERSION")
+}

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala

@@ -25,9 +25,9 @@ object Annotation {
     val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX")
     val ArgumentName  = new overflowdb.PropertyKey[String]("ARGUMENT_NAME")
     val Code          = new overflowdb.PropertyKey[String]("CODE")
-    val ColumnNumber  = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER")
+    val ColumnNumber  = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER")
     val FullName      = new overflowdb.PropertyKey[String]("FULL_NAME")
-    val LineNumber    = new overflowdb.PropertyKey[Integer]("LINE_NUMBER")
+    val LineNumber    = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER")
     val Name          = new overflowdb.PropertyKey[String]("NAME")
     val Order         = new overflowdb.PropertyKey[scala.Int]("ORDER")
 
@@ -76,9 +76,9 @@ trait AnnotationBase extends AbstractNode with ExpressionBase {
   def argumentIndex: scala.Int
   def argumentName: Option[String]
   def code: String
-  def columnNumber: Option[Integer]
+  def columnNumber: Option[scala.Int]
   def fullName: String
-  def lineNumber: Option[Integer]
+  def lineNumber: Option[scala.Int]
   def name: String
   def order: scala.Int
 
@@ -89,14 +89,14 @@ class Annotation(graph_4762: Graph, id_4762: Long /*cf https://github.com/scala/
     with AnnotationBase
     with StoredNode
     with Expression {
-  override def argumentIndex: scala.Int      = get().argumentIndex
-  override def argumentName: Option[String]  = get().argumentName
-  override def code: String                  = get().code
-  override def columnNumber: Option[Integer] = get().columnNumber
-  override def fullName: String              = get().fullName
-  override def lineNumber: Option[Integer]   = get().lineNumber
-  override def name: String                  = get().name
-  override def order: scala.Int              = get().order
+  override def argumentIndex: scala.Int        = get().argumentIndex
+  override def argumentName: Option[String]    = get().argumentName
+  override def code: String                    = get().code
+  override def columnNumber: Option[scala.Int] = get().columnNumber
+  override def fullName: String                = get().fullName
+  override def lineNumber: Option[scala.Int]   = get().lineNumber
+  override def name: String                    = get().name
+  override def order: scala.Int                = get().order
   override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
       case "ARGUMENT_INDEX" => Annotation.PropertyDefaults.ArgumentIndex
@@ -215,22 +215,22 @@ class AnnotationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit
 
   override def layoutInformation: NodeLayoutInformation = Annotation.layoutInformation
 
-  private var _argumentIndex: scala.Int = Annotation.PropertyDefaults.ArgumentIndex
-  def argumentIndex: scala.Int          = _argumentIndex
-  private var _argumentName: String     = null
-  def argumentName: Option[String]      = Option(_argumentName)
-  private var _code: String             = Annotation.PropertyDefaults.Code
-  def code: String                      = _code
-  private var _columnNumber: Integer    = null
-  def columnNumber: Option[Integer]     = Option(_columnNumber)
-  private var _fullName: String         = Annotation.PropertyDefaults.FullName
-  def fullName: String                  = _fullName
-  private var _lineNumber: Integer      = null
-  def lineNumber: Option[Integer]       = Option(_lineNumber)
-  private var _name: String             = Annotation.PropertyDefaults.Name
-  def name: String                      = _name
-  private var _order: scala.Int         = Annotation.PropertyDefaults.Order
-  def order: scala.Int                  = _order
+  private var _argumentIndex: Integer = Annotation.PropertyDefaults.ArgumentIndex
+  def argumentIndex: scala.Int        = _argumentIndex
+  private var _argumentName: String   = null
+  def argumentName: Option[String]    = Option(_argumentName).asInstanceOf[Option[String]]
+  private var _code: String           = Annotation.PropertyDefaults.Code
+  def code: String                    = _code
+  private var _columnNumber: Integer  = null
+  def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]]
+  private var _fullName: String       = Annotation.PropertyDefaults.FullName
+  def fullName: String                = _fullName
+  private var _lineNumber: Integer    = null
+  def lineNumber: Option[scala.Int]   = Option(_lineNumber).asInstanceOf[Option[scala.Int]]
+  private var _name: String           = Annotation.PropertyDefaults.Name
+  def name: String                    = _name
+  private var _order: Integer         = Annotation.PropertyDefaults.Order
+  def order: scala.Int                = _order
 
   /** faster than the default implementation */
   override def propertiesMap: java.util.Map[String, Any] = {
@@ -347,9 +347,9 @@ class AnnotationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit
       case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int]
       case "ARGUMENT_NAME"  => this._argumentName = value.asInstanceOf[String]
       case "CODE"           => this._code = value.asInstanceOf[String]
-      case "COLUMN_NUMBER"  => this._columnNumber = value.asInstanceOf[Integer]
+      case "COLUMN_NUMBER"  => this._columnNumber = value.asInstanceOf[scala.Int]
       case "FULL_NAME"      => this._fullName = value.asInstanceOf[String]
-      case "LINE_NUMBER"    => this._lineNumber = value.asInstanceOf[Integer]
+      case "LINE_NUMBER"    => this._lineNumber = value.asInstanceOf[scala.Int]
       case "NAME"           => this._name = value.asInstanceOf[String]
       case "ORDER"          => this._order = value.asInstanceOf[scala.Int]
 
@@ -368,11 +368,17 @@ class AnnotationDb(ref: NodeRef[NodeDb]) extends NodeDb(ref) with StoredNode wit
 
   override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = {
     this._argumentIndex = newNode.asInstanceOf[NewAnnotation].argumentIndex
-    this._argumentName = newNode.asInstanceOf[NewAnnotation].argumentName.orNull
+    this._argumentName = newNode.asInstanceOf[NewAnnotation].argumentName match {
+      case None => null; case Some(value) => value
+    }
     this._code = newNode.asInstanceOf[NewAnnotation].code
-    this._columnNumber = newNode.asInstanceOf[NewAnnotation].columnNumber.orNull
+    this._columnNumber = newNode.asInstanceOf[NewAnnotation].columnNumber match {
+      case None => null; case Some(value) => value
+    }
     this._fullName = newNode.asInstanceOf[NewAnnotation].fullName
-    this._lineNumber = newNode.asInstanceOf[NewAnnotation].lineNumber.orNull
+    this._lineNumber = newNode.asInstanceOf[NewAnnotation].lineNumber match {
+      case None => null; case Some(value) => value
+    }
     this._name = newNode.asInstanceOf[NewAnnotation].name
     this._order = newNode.asInstanceOf[NewAnnotation].order
 

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala

@@ -24,8 +24,8 @@ object AnnotationLiteral {
     val ArgumentIndex = new overflowdb.PropertyKey[scala.Int]("ARGUMENT_INDEX")
     val ArgumentName  = new overflowdb.PropertyKey[String]("ARGUMENT_NAME")
     val Code          = new overflowdb.PropertyKey[String]("CODE")
-    val ColumnNumber  = new overflowdb.PropertyKey[Integer]("COLUMN_NUMBER")
-    val LineNumber    = new overflowdb.PropertyKey[Integer]("LINE_NUMBER")
+    val ColumnNumber  = new overflowdb.PropertyKey[scala.Int]("COLUMN_NUMBER")
+    val LineNumber    = new overflowdb.PropertyKey[scala.Int]("LINE_NUMBER")
     val Name          = new overflowdb.PropertyKey[String]("NAME")
     val Order         = new overflowdb.PropertyKey[scala.Int]("ORDER")
 
@@ -70,8 +70,8 @@ trait AnnotationLiteralBase extends AbstractNode with ExpressionBase {
   def argumentIndex: scala.Int
   def argumentName: Option[String]
   def code: String
-  def columnNumber: Option[Integer]
-  def lineNumber: Option[Integer]
+  def columnNumber: Option[scala.Int]
+  def lineNumber: Option[scala.Int]
   def name: String
   def order: scala.Int
 
@@ -82,13 +82,13 @@ class AnnotationLiteral(graph_4762: Graph, id_4762: Long /*cf https://github.com
     with AnnotationLiteralBase
     with StoredNode
     with Expression {
-  override def argumentIndex: scala.Int      = get().argumentIndex
-  override def argumentName: Option[String]  = get().argumentName
-  override def code: String                  = get().code
-  override def columnNumber: Option[Integer] = get().columnNumber
-  override def lineNumber: Option[Integer]   = get().lineNumber
-  override def name: String                  = get().name
-  override def order: scala.Int              = get().order
+  override def argumentIndex: scala.Int        = get().argumentIndex
+  override def argumentName: Option[String]    = get().argumentName
+  override def code: String                    = get().code
+  override def columnNumber: Option[scala.Int] = get().columnNumber
+  override def lineNumber: Option[scala.Int]   = get().lineNumber
+  override def name: String                    = get().name
+  override def order: scala.Int                = get().order
   override def propertyDefaultValue(propertyKey: String) = {
     propertyKey match {
       case "ARGUMENT_INDEX" => AnnotationLiteral.PropertyDefaults.ArgumentIndex
@@ -168,20 +168,20 @@ class AnnotationLiteralDb(ref: NodeRef[NodeDb])
 
   override def layoutInformation: NodeLayoutInformation = AnnotationLiteral.layoutInformation
 
-  private var _argumentIndex: scala.Int = AnnotationLiteral.PropertyDefaults.ArgumentIndex
-  def argumentIndex: scala.Int          = _argumentIndex
-  private var _argumentName: String     = null
-  def argumentName: Option[String]      = Option(_argumentName)
-  private var _code: String             = AnnotationLiteral.PropertyDefaults.Code
-  def code: String                      = _code
-  private var _columnNumber: Integer    = null
-  def columnNumber: Option[Integer]     = Option(_columnNumber)
-  private var _lineNumber: Integer      = null
-  def lineNumber: Option[Integer]       = Option(_lineNumber)
-  private var _name: String             = AnnotationLiteral.PropertyDefaults.Name
-  def name: String                      = _name
-  private var _order: scala.Int         = AnnotationLiteral.PropertyDefaults.Order
-  def order: scala.Int                  = _order
+  private var _argumentIndex: Integer = AnnotationLiteral.PropertyDefaults.ArgumentIndex
+  def argumentIndex: scala.Int        = _argumentIndex
+  private var _argumentName: String   = null
+  def argumentName: Option[String]    = Option(_argumentName).asInstanceOf[Option[String]]
+  private var _code: String           = AnnotationLiteral.PropertyDefaults.Code
+  def code: String                    = _code
+  private var _columnNumber: Integer  = null
+  def columnNumber: Option[scala.Int] = Option(_columnNumber).asInstanceOf[Option[scala.Int]]
+  private var _lineNumber: Integer    = null
+  def lineNumber: Option[scala.Int]   = Option(_lineNumber).asInstanceOf[Option[scala.Int]]
+  private var _name: String           = AnnotationLiteral.PropertyDefaults.Name
+  def name: String                    = _name
+  private var _order: Integer         = AnnotationLiteral.PropertyDefaults.Order
+  def order: scala.Int                = _order
 
   /** faster than the default implementation */
   override def propertiesMap: java.util.Map[String, Any] = {
@@ -278,8 +278,8 @@ class AnnotationLiteralDb(ref: NodeRef[NodeDb])
       case "ARGUMENT_INDEX" => this._argumentIndex = value.asInstanceOf[scala.Int]
       case "ARGUMENT_NAME"  => this._argumentName = value.asInstanceOf[String]
       case "CODE"           => this._code = value.asInstanceOf[String]
-      case "COLUMN_NUMBER"  => this._columnNumber = value.asInstanceOf[Integer]
-      case "LINE_NUMBER"    => this._lineNumber = value.asInstanceOf[Integer]
+      case "COLUMN_NUMBER"  => this._columnNumber = value.asInstanceOf[scala.Int]
+      case "LINE_NUMBER"    => this._lineNumber = value.asInstanceOf[scala.Int]
       case "NAME"           => this._name = value.asInstanceOf[String]
       case "ORDER"          => this._order = value.asInstanceOf[scala.Int]
 
@@ -298,10 +298,16 @@ class AnnotationLiteralDb(ref: NodeRef[NodeDb])
 
   override def fromNewNode(newNode: NewNode, mapping: NewNode => StoredNode): Unit = {
     this._argumentIndex = newNode.asInstanceOf[NewAnnotationLiteral].argumentIndex
-    this._argumentName = newNode.asInstanceOf[NewAnnotationLiteral].argumentName.orNull
+    this._argumentName = newNode.asInstanceOf[NewAnnotationLiteral].argumentName match {
+      case None => null; case Some(value) => value
+    }
     this._code = newNode.asInstanceOf[NewAnnotationLiteral].code
-    this._columnNumber = newNode.asInstanceOf[NewAnnotationLiteral].columnNumber.orNull
-    this._lineNumber = newNode.asInstanceOf[NewAnnotationLiteral].lineNumber.orNull
+    this._columnNumber = newNode.asInstanceOf[NewAnnotationLiteral].columnNumber match {
+      case None => null; case Some(value) => value
+    }
+    this._lineNumber = newNode.asInstanceOf[NewAnnotationLiteral].lineNumber match {
+      case None => null; case Some(value) => value
+    }
     this._name = newNode.asInstanceOf[NewAnnotationLiteral].name
     this._order = newNode.asInstanceOf[NewAnnotationLiteral].order