Merge pull request #11634 from michaelnebel/java/excludeinterfacemembers

Java: Exclude interface members from model generation.

Author: michaelnebel

java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll

@@ -72,7 +72,10 @@ private predicate isRelevantForModels(J::Callable api) {
 /**
  * Holds if it is relevant to generate models for `api` based on data flow analysis.
  */
-predicate isRelevantForDataFlowModels = isRelevantForModels/1;
+predicate isRelevantForDataFlowModels(J::Callable api) {
+  isRelevantForModels(api) and
+  (not api.getDeclaringType() instanceof J::Interface or exists(api.getBody()))
+}
 
 predicate isRelevantForTypeBasedFlowModels = isRelevantForModels/1;
 

java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.expected

@@ -3,7 +3,6 @@
 | p;FluentAPI$Inner;notThis;(String);generated |
 | p;ImmutablePojo;getX;();generated |
 | p;Joiner;length;();generated |
-| p;MultipleImpls$Strategy;doSomething;(String);generated |
 | p;ParamFlow;ignorePrimitiveReturnValue;(String);generated |
 | p;ParamFlow;mapType;(Class);generated |
 | p;Pojo;doNotSetValue;(String);generated |