{Generic,Parameterized,Raw}Type: implement getAPrimaryQlClass

An aid to debugging

Author: smowton

java/ql/src/semmle/code/java/Generics.qll

@@ -75,13 +75,25 @@ class GenericType extends RefType {
    * Gets the number of type parameters of this generic type.
    */
   int getNumberOfTypeParameters() { result = strictcount(getATypeParameter()) }
+
+  override string getAPrimaryQlClass() { result = "GenericType" }
 }
 
 /** A generic type that is a class. */
-class GenericClass extends GenericType, Class { }
+class GenericClass extends GenericType, Class {
+  override string getAPrimaryQlClass() {
+    result = Class.super.getAPrimaryQlClass() or
+    result = GenericType.super.getAPrimaryQlClass()
+  }
+}
 
 /** A generic type that is an interface. */
-class GenericInterface extends GenericType, Interface { }
+class GenericInterface extends GenericType, Interface {
+  override string getAPrimaryQlClass() {
+    result = Interface.super.getAPrimaryQlClass() or
+    result = GenericType.super.getAPrimaryQlClass()
+  }
+}
 
 /**
  * A common super-class for Java types that may have a type bound.
@@ -115,6 +127,8 @@ abstract class BoundedType extends RefType, @boundedtype {
     or
     result = getUpperBoundType().(BoundedType).getAnUltimateUpperBoundType()
   }
+
+  override string getAPrimaryQlClass() { result = "BoundedType" }
 }
 
 /**
@@ -354,13 +368,25 @@ class ParameterizedType extends RefType {
 
   /** Holds if this type originates from source code. */
   override predicate fromSource() { typeVars(_, _, _, _, this) and RefType.super.fromSource() }
+
+  override string getAPrimaryQlClass() { result = "ParameterizedType" }
 }
 
 /** A parameterized type that is a class. */
-class ParameterizedClass extends Class, ParameterizedType { }
+class ParameterizedClass extends Class, ParameterizedType {
+  override string getAPrimaryQlClass() {
+    result = Class.super.getAPrimaryQlClass() or
+    result = ParameterizedType.super.getAPrimaryQlClass()
+  }
+}
 
 /** A parameterized type that is an interface. */
-class ParameterizedInterface extends Interface, ParameterizedType { }
+class ParameterizedInterface extends Interface, ParameterizedType {
+  override string getAPrimaryQlClass() {
+    result = Interface.super.getAPrimaryQlClass() or
+    result = ParameterizedType.super.getAPrimaryQlClass()
+  }
+}
 
 /**
  * The raw version of a generic type is the type that is formed by
@@ -384,13 +410,25 @@ class RawType extends RefType {
 
   /** Holds if this type originates from source code. */
   override predicate fromSource() { not any() }
+
+  override string getAPrimaryQlClass() { result = "RawType" }
 }
 
 /** A raw type that is a class. */
-class RawClass extends Class, RawType { }
+class RawClass extends Class, RawType {
+  override string getAPrimaryQlClass() {
+    result = Class.super.getAPrimaryQlClass() or
+    result = RawType.super.getAPrimaryQlClass()
+  }
+}
 
 /** A raw type that is an interface. */
-class RawInterface extends Interface, RawType { }
+class RawInterface extends Interface, RawType {
+  override string getAPrimaryQlClass() {
+    result = Interface.super.getAPrimaryQlClass() or
+    result = RawType.super.getAPrimaryQlClass()
+  }
+}
 
 // -------- Generic callables  --------
 /**

java/ql/test/library-tests/dependency-counts/PrintAst.expected

@@ -3,7 +3,7 @@ Example.java:
 #-----|   -1: (Imports)
 #    1|     1: [ImportType] import Set
 #    2|     2: [ImportType] import List
-#    4|   1: [Interface] Example
+#    4|   1: [GenericType,Interface,ParameterizedType] Example
 #-----|     -2: (Generic Parameters)
 #    4|       0: [TypeVariable] A
 #-----|     -1: (Base Types)

java/ql/test/library-tests/dependency/PrintAst.expected

@@ -1,6 +1,6 @@
 dependency/A.java:
 #    0| [CompilationUnit] A
-#    3|   1: [Class] A
+#    3|   1: [Class,GenericType,ParameterizedType] A
 #-----|     -2: (Generic Parameters)
 #    3|       0: [TypeVariable] T
 #    6|   2: [Class] B

java/ql/test/library-tests/generics/PrintAst.expected

@@ -3,7 +3,7 @@ generics/A.java:
 #-----|   -1: (Imports)
 #    3|     1: [ImportType] import HashMap
 #    4|     2: [ImportType] import Map
-#    6|   1: [Class] A
+#    6|   1: [Class,GenericType,ParameterizedType] A
 #-----|     -2: (Generic Parameters)
 #    6|       0: [TypeVariable] T
 #    7|     2: [Class] B
@@ -23,7 +23,7 @@ generics/A.java:
 #   13|         -3: [TypeAccess] HashMap<String,Object>
 #   13|           0: [TypeAccess] String
 #   13|           1: [TypeAccess] Object
-#   16|   3: [Class] D
+#   16|   3: [Class,GenericType,ParameterizedType] D
 #-----|     -2: (Generic Parameters)
 #   16|       0: [TypeVariable] V
 #   16|         0: [TypeAccess] Number

java/ql/test/library-tests/typeaccesses/PrintAst.expected

@@ -84,7 +84,7 @@ typeaccesses/TA.java:
 #   13|         0: [ExprStmt] <Expr>;
 #   13|           0: [MethodAccess] method3(...)
 #   13|             -1: [TypeAccess] TA
-#   14|     10: [Class] Inner
+#   14|     10: [Class,GenericType,ParameterizedType] Inner
 #-----|       -2: (Generic Parameters)
 #   14|         0: [TypeVariable] T
 #   14|           0: [TypeAccess] ArrayList<TA>