Remove unused node properties and fix formatting

Author: johannescoetzee

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/PropertyNames.java

@@ -41,12 +41,6 @@ public class PropertyNames {
 and trade off between false negatives and false positives). */
 public static final String CANONICAL_NAME = "CANONICAL_NAME";
 
-
-public static final String CLASS_NAME = "CLASS_NAME";
-
-
-public static final String CLASS_SHORT_NAME = "CLASS_SHORT_NAME";
-
 /** Identifier which uniquely describes a CLOSURE_BINDING. This property is used to match captured LOCAL nodes with the corresponding CLOSURE_BINDING nodes */
 public static final String CLOSURE_BINDING_ID = "CLOSURE_BINDING_ID";
 
@@ -196,19 +190,13 @@ it is referenced but not defined in the code (applies both to insular
 to have exactly one METHOD node for each METHOD_FULL_NAME */
 public static final String METHOD_FULL_NAME = "METHOD_FULL_NAME";
 
-
-public static final String METHOD_SHORT_NAME = "METHOD_SHORT_NAME";
-
 /** The modifier type is a free-form string. The following are known modifier types:
 `STATIC`, `PUBLIC`, `PROTECTED`, `PRIVATE`, `ABSTRACT`, `NATIVE`, `CONSTRUCTOR`, `VIRTUAL`. */
 public static final String MODIFIER_TYPE = "MODIFIER_TYPE";
 
 /** Name of represented object, e.g., method name (e.g. "run") */
 public static final String NAME = "NAME";
 
-
-public static final String NODE_LABEL = "NODE_LABEL";
-
 /** Start offset into the CONTENT property of the corresponding FILE node.
 The offset is such that parts of the content can easily
 be accessed via `content.substring(offset, offsetEnd)`.
@@ -235,9 +223,6 @@ This means that the offset must be measured in utf16 encoding (i.e. neither in
 between each other. */
 public static final String OVERLAYS = "OVERLAYS";
 
-
-public static final String PACKAGE_NAME = "PACKAGE_NAME";
-
 /** AST node type name emitted by parser. */
 public static final String PARSER_TYPE_NAME = "PARSER_TYPE_NAME";
 
@@ -259,9 +244,6 @@ This means that the offset must be measured in utf16 encoding (i.e. neither in
 implementor to fit the source language. */
 public static final String SIGNATURE = "SIGNATURE";
 
-
-public static final String SYMBOL = "SYMBOL";
-
 /** The static type decl of a TYPE. This property is matched against the FULL_NAME
 of TYPE_DECL nodes. It is required to have exactly one TYPE_DECL for each
 different TYPE_DECL_FULL_NAME */
@@ -290,8 +272,6 @@ This means that the offset must be measured in utf16 encoding (i.e. neither in
 add(AST_PARENT_FULL_NAME);
 add(AST_PARENT_TYPE);
 add(CANONICAL_NAME);
-add(CLASS_NAME);
-add(CLASS_SHORT_NAME);
 add(CLOSURE_BINDING_ID);
 add(CLOSURE_ORIGINAL_NAME);
 add(CODE);
@@ -323,21 +303,17 @@ This means that the offset must be measured in utf16 encoding (i.e. neither in
 add(LINE_NUMBER);
 add(LINE_NUMBER_END);
 add(METHOD_FULL_NAME);
-add(METHOD_SHORT_NAME);
 add(MODIFIER_TYPE);
 add(NAME);
-add(NODE_LABEL);
 add(OFFSET);
 add(OFFSET_END);
 add(ORDER);
 add(OVERLAYS);
-add(PACKAGE_NAME);
 add(PARSER_TYPE_NAME);
 add(POSSIBLE_TYPES);
 add(ROOT);
 add(SECONDARY_ID);
 add(SIGNATURE);
-add(SYMBOL);
 add(TYPE_DECL_FULL_NAME);
 add(TYPE_FULL_NAME);
 add(VALUE);

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

@@ -23,12 +23,12 @@ class CpgSchema(builder: SchemaBuilder) {
 
   val shortcuts = Shortcuts(builder, base, method, ast, typeSchema, fs)
 
-  val sourceSpecific  = Comment(builder, base, ast, fs)
-  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, tags, shortcuts)
+  val sourceSpecific = Comment(builder, base, ast, fs)
+  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, tags, shortcuts)
   val protoSerialize = ProtoSerialize(builder, ast)
 }
 

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

@@ -1,7 +1,5 @@
 package io.shiftleft.codepropertygraph.schema
 
-import io.shiftleft.codepropertygraph.schema.CpgSchema.PropertyDefaults
-import flatgraph.schema.Property.ValueType
 import flatgraph.schema._
 
 object Tags extends SchemaBase {
@@ -44,36 +42,7 @@ object Tags extends SchemaBase {
     import callGraph._
     implicit private val schemaInfo: SchemaInfo = SchemaInfo.forClass(getClass)
 
-// node properties
-    val symbol = builder
-      .addProperty(name = "SYMBOL", valueType = ValueType.String, comment = "")
-      .mandatory(PropertyDefaults.String)
-      .protoId(ProtoIds.Symbol)
-
-    val methodShortName = builder
-      .addProperty(name = "METHOD_SHORT_NAME", valueType = ValueType.String, comment = "")
-      .mandatory(PropertyDefaults.String)
-      .protoId(ProtoIds.MethodShortName)
-
-    val packageName = builder
-      .addProperty(name = "PACKAGE_NAME", valueType = ValueType.String, comment = "")
-      .mandatory(PropertyDefaults.String)
-      .protoId(ProtoIds.PackageName)
-
-    val className = builder
-      .addProperty(name = "CLASS_NAME", valueType = ValueType.String, comment = "")
-      .mandatory(PropertyDefaults.String)
-      .protoId(ProtoIds.ClassName)
-
-    val classShortName = builder
-      .addProperty(name = "CLASS_SHORT_NAME", valueType = ValueType.String, comment = "")
-      .mandatory(PropertyDefaults.String)
-      .protoId(ProtoIds.ClassShortName)
-
-    val nodeLabel = builder
-      .addProperty(name = "NODE_LABEL", valueType = ValueType.String, comment = "")
-      .mandatory(PropertyDefaults.String)
-      .protoId(ProtoIds.NodeLabel)
+    // node properties
 
     val taggedBy = builder
       .addEdgeType(name = "TAGGED_BY", comment = "Edges from nodes to the tags they are tagged by.")