Java: update DataFlowTargetApi for funcexpr and paramless constructor exclusions

Jami Cogswell · Jami Cogswell · commit d558f9397221 · 2022-12-08T20:51:40.000-05:00
diff --git a/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverage.ql b/java/ql/src/Metrics/Summaries/GeneratedVsManualCoverage.ql
@@ -24,10 +24,7 @@ class MadModeledCallable extends SummarizedCallableBase {
       this instanceof SummarizedCallable or
       this instanceof FlowSummaryImpl::Public::NegativeSummarizedCallable
     ) and
-    exists(DataFlowTargetApi dataFlowTargApi |
-      this.asCallable() = dataFlowTargApi and
-      not exists(FunctionalExpr funcExpr | dataFlowTargApi = funcExpr.asMethod()) // ! remove this if DataFlowTargetApi itself is adjusted to exclude FunctionalExpr (see static-team slack thread)
-    )
+    exists(DataFlowTargetApi dataFlowTargApi | this.asCallable() = dataFlowTargApi)
   }
 }
 
@@ -84,13 +81,11 @@ float getNumMadModels(string package, string provenance, string posOrNeg) {
  */
 float getNumApisWithoutMadModel(string package) {
   exists(DataFlowTargetApi dataFlowTargApi |
-    package = dataFlowTargApi.getDeclaringType().getPackage().toString() and
-    not exists(FunctionalExpr fe | dataFlowTargApi = fe.asMethod()) // remove lambdas // ! remove this if DataFlowTargetApi itself is adjusted to exclude FunctionalExpr (see static-team slack thread)
+    package = dataFlowTargApi.getDeclaringType().getPackage().toString()
   |
     result =
       count(DataFlowTargetApi d |
         package = d.getDeclaringType().getPackage().toString() and
-        not exists(FunctionalExpr funcExpr | d = funcExpr.asMethod()) and // remove lambdas // ! remove this if DataFlowTargetApi itself is adjusted to exclude FunctionalExpr (see static-team slack thread)
         not exists(SummarizedCallable sc | d = sc.asCallable()) and
         not exists(FlowSummaryImpl::Public::NegativeSummarizedCallable nc | d = nc.asCallable())
       )
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
@@ -52,14 +52,21 @@ private predicate isJdkInternal(J::CompilationUnit cu) {
   cu.getPackage().getName() = ""
 }
 
+/** Holds if the given API is a constructor without parameters. */
+private predicate isParameterlessConstructor(J::Callable api) {
+  api instanceof J::Constructor and api.getNumberOfParameters() = 0
+} // ! merge with PR #11624
+
 /**
  * Holds if it is relevant to generate models for `api`.
  */
 private predicate isRelevantForModels(J::Callable api) {
   not isInTestFile(api.getCompilationUnit().getFile()) and
   not isJdkInternal(api.getCompilationUnit()) and
   not api instanceof J::MainMethod and
-  not api instanceof J::StaticInitializer
+  not api instanceof J::StaticInitializer and
+  not exists(J::FunctionalExpr funcExpr | api = funcExpr.asMethod()) and // ! merge with PR #11623
+  not isParameterlessConstructor(api) // ! merge with PR #11624
 }
 
 /**
