Merge pull request github#12111 from smowton/smowton/feature/java-merge-classes-and-interfaces

Java: merge the @Class and @interface database types and tables

Author: smowton

java/downgrades/934bf10b4bd34cf648893efcd1d0d7be9471d39f/classes.ql

@@ -0,0 +1,11 @@
+class ClassOrInterface extends @classorinterface {
+  string toString() { result = "class-or-interface" }
+}
+
+class Package extends @package {
+  string toString() { result = "package" }
+}
+
+from ClassOrInterface id, string nodeName, Package parentId, ClassOrInterface sourceId
+where classes_or_interfaces(id, nodeName, parentId, sourceId) and not isInterface(id)
+select id, nodeName, parentId, sourceId

java/downgrades/934bf10b4bd34cf648893efcd1d0d7be9471d39f/interfaces.ql

@@ -0,0 +1,11 @@
+class ClassOrInterface extends @classorinterface {
+  string toString() { result = "class-or-interface" }
+}
+
+class Package extends @package {
+  string toString() { result = "package" }
+}
+
+from ClassOrInterface id, string nodeName, Package parentId, ClassOrInterface sourceId
+where classes_or_interfaces(id, nodeName, parentId, sourceId) and isInterface(id)
+select id, nodeName, parentId, sourceId