Delete location and new location nodes from the CPG spec

Author: ashfordium

schema/src/main/scala/io/shiftleft/codepropertygraph/schema/CpgSchema.scala

@@ -24,11 +24,11 @@ class CpgSchema(builder: SchemaBuilder) {
   val shortcuts = Shortcuts(builder, base, method, ast, typeSchema, fs)
 
   val sourceSpecific  = Comment(builder, base, ast, fs)
-  val tagsAndLocation = TagsAndLocation(builder, base, typeSchema, method, ast, fs, callGraph)
+  val tags = Tags(builder, base, typeSchema, method, ast, fs, callGraph)
   val binding         = Binding(builder, base, typeSchema, method, callGraph)
   val annotation      = Annotation(builder, base, method, typeSchema, ast, shortcuts)
   val finding         = Finding(builder, base)
-  val hidden = Hidden(builder, base, method, typeSchema, ast, cfg, fs, callGraph, pdg, tagsAndLocation, shortcuts)
+  val hidden = Hidden(builder, base, method, typeSchema, ast, cfg, fs, callGraph, pdg, tags, shortcuts)
   val protoSerialize = ProtoSerialize(builder, ast)
 }
 

schema/src/main/scala/io/shiftleft/codepropertygraph/schema/Hidden.scala

@@ -24,7 +24,7 @@ object Hidden extends SchemaBase {
     fs: FileSystem.Schema,
     callGraph: CallGraph.Schema,
     pdg: Pdg.Schema,
-    tags: TagsAndLocation.Schema,
+    tags: Tags.Schema,
     shortcuts: Shortcuts.Schema
   ) = new Schema(builder, base, methodSchema, typeDecl, ast, cfg, fs, callGraph, pdg, tags, shortcuts)
 
@@ -38,7 +38,7 @@ object Hidden extends SchemaBase {
     fsSchema: FileSystem.Schema,
     callGraph: CallGraph.Schema,
     pdg: Pdg.Schema,
-    tags: TagsAndLocation.Schema,
+    tags: Tags.Schema,
     shortcuts: Shortcuts.Schema
   ) {
 

…opertygraph/schema/TagsAndLocation.scala …left/codepropertygraph/schema/Tags.scalaschema/src/main/scala/io/shiftleft/codepropertygraph/schema/TagsAndLocation.scala renamed to schema/src/main/scala/io/shiftleft/codepropertygraph/schema/Tags.scala schema/src/main/scala/io/shiftleft/codepropertygraph/schema/TagsAndLocation.scala renamed to schema/src/main/scala/io/shiftleft/codepropertygraph/schema/Tags.scala

@@ -4,7 +4,7 @@ import io.shiftleft.codepropertygraph.schema.CpgSchema.PropertyDefaults
 import flatgraph.schema.Property.ValueType
 import flatgraph.schema._
 
-object TagsAndLocation extends SchemaBase {
+object Tags extends SchemaBase {
 
   override def docIndex: Int = 17
 
@@ -87,34 +87,11 @@ object TagsAndLocation extends SchemaBase {
       .addProperties(name, value)
       .primaryKey(name)
 
-    val location: NodeType = builder
-      .addNodeType(
-        name = "LOCATION",
-        comment =
-          "Deprecated: Prefer the generated Loc node extension and .loc node step. A location node summarizes a source code location."
-      )
-      .protoId(ProtoIds.Location)
-      .addProperties(
-        symbol,
-        methodFullName,
-        methodShortName,
-        packageName,
-        lineNumber,
-        className,
-        classShortName,
-        nodeLabel,
-        filename,
-        columnNumber
-      )
-
     val tagNodePair: NodeType = builder
       .addNodeType(name = "TAG_NODE_PAIR", comment = "This node contains an arbitrary node and an associated tag node.")
       .protoId(ProtoIds.TagNodePair)
       .addProperties()
 
-// node relations
-    location.addContainedNode(builder.anyNode, "node", Property.Cardinality.ZeroOrOne)
-
     // TODO MP: provide dummy/empty node as default, to avoid null?
     tagNodePair
       .addContainedNode(tag, "tag", Property.Cardinality.One(Property.Default(null)))