Java: Adjust the model generator queries to the new shared implementation.

Author: michaelnebel

java/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql

@@ -9,5 +9,5 @@
 import internal.CaptureModels
 
 from DataFlowSummaryTargetApi api, string noflow
-where noflow = captureNoFlow(api)
+where noflow = captureNeutral(api)
 select noflow order by noflow

java/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql

@@ -9,5 +9,5 @@
 import internal.CaptureModels
 
 from DataFlowSinkTargetApi api, string sink
-where sink = captureSink(api)
+where sink = Heuristic::captureSink(api)
 select sink order by sink

java/ql/src/utils/modelgenerator/CaptureNeutralModels.ql

@@ -9,5 +9,5 @@
 import internal.CaptureModels
 
 from DataFlowSourceTargetApi api, string source
-where source = captureSource(api)
+where source = Heuristic::captureSource(api)
 select source order by source

java/ql/src/utils/modelgenerator/CaptureSinkModels.ql

@@ -9,5 +9,5 @@
 import internal.CaptureModels
 
 from DataFlowSummaryTargetApi api, string flow
-where flow = captureMixedFlow(api, _)
+where flow = captureFlow(api, _)
 select flow order by flow

java/ql/src/utils/modelgenerator/CaptureSourceModels.ql

@@ -15,7 +15,7 @@ import PartialFlow::PartialPathGraph
 
 int explorationLimit() { result = 3 }
 
-module PartialFlow = PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
+module PartialFlow = Heuristic::PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
 
 from
   PartialFlow::PartialPathNode source, PartialFlow::PartialPathNode sink,

java/ql/src/utils/modelgenerator/CaptureSummaryModels.ql

@@ -11,6 +11,7 @@
 import java
 import semmle.code.java.dataflow.DataFlow
 import utils.modelgenerator.internal.CaptureModels
+import Heuristic
 import PropagateFlow::PathGraph
 
 from