Java: remove MadModeledCallable class and update predicate names

Jami Cogswell · Jami Cogswell · commit 2c3adb769b84 · 2022-12-08T23:32:07.000-05:00
diff --git a/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverage.ql b/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverage.ql
@@ -11,31 +11,24 @@ import semmle.code.java.dataflow.FlowSummary
 import utils.modelgenerator.internal.CaptureModels
 
 /**
- * A callable with a Summary MaD model. Specifically, this callable is
- * the intersection of DataFlowTargetApis and SummarizedCallables.
+ * Returns the number of `DataFlowTargetApi`s with Summary MaD models
+ * for a given package and provenance.
  */
-private class MadModeledCallable extends SummarizedCallableBase {
-  MadModeledCallable() {
-    this instanceof SummarizedCallable and
-    exists(DataFlowTargetApi dataFlowTargApi | this.asCallable() = dataFlowTargApi)
-  }
-}
-
-/** Returns the number of APIs with Summary MaD models for a given package and provenance. */
 bindingset[package]
-private float getNumApisWithMadModels(string package, string provenance) {
+private float getNumMadModeledApis(string package, string provenance) {
   provenance in ["generated", "manual", "both"] and
   result =
-    count(MadModeledCallable mc |
-      package = mc.asCallable().getDeclaringType().getPackage().toString() and
+    count(SummarizedCallable sc |
+      package = sc.asCallable().getDeclaringType().getPackage().toString() and
+      exists(DataFlowTargetApi dataFlowTargApi | sc.asCallable() = dataFlowTargApi) and
       (
-        mc.(SummarizedCallable).isAutoGenerated() and // "auto-only"
+        sc.isAutoGenerated() and // "auto-only"
         provenance = "generated"
         or
-        mc.(SummarizedCallable).isManuallyGenerated() and // "manual-only"
+        sc.isManuallyGenerated() and // "manual-only"
         provenance = "manual"
         or
-        mc.(SummarizedCallable).isBothAutoAndManuallyGenerated() and // "both"
+        sc.isBothAutoAndManuallyGenerated() and // "both"
         provenance = "both"
       )
     )
@@ -55,9 +48,9 @@ from
   float manualOnly, float non, float all, float generatedCoverage, float manualCoverage
 where
   package = dataFlowTargApi.getDeclaringType().getPackage().toString() and
-  generatedOnly = getNumApisWithMadModels(package, "generated") and
-  manualOnly = getNumApisWithMadModels(package, "manual") and
-  both = getNumApisWithMadModels(package, "both") and
+  generatedOnly = getNumMadModeledApis(package, "generated") and
+  manualOnly = getNumMadModeledApis(package, "manual") and
+  both = getNumMadModeledApis(package, "both") and
   all = getNumApis(package) and
   non = all - (generatedOnly + both + manualOnly) and
   generatedCoverage = (both / (both + manualOnly)) and // Proportion of manual models covered by generated ones
