Merge pull request #10628 from michaelnebel/java/typebasedmodels

Java: Type based summary models.

Author: michaelnebel

config/identical-files.json

@@ -94,8 +94,8 @@
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
   ],
   "Model as Data Generation Java/C# - CaptureModels": [
-    "java/ql/src/utils/model-generator/internal/CaptureModels.qll",
-    "csharp/ql/src/utils/model-generator/internal/CaptureModels.qll"
+    "java/ql/src/utils/modelgenerator/internal/CaptureModels.qll",
+    "csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll"
   ],
   "Sign Java/C#": [
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",

csharp/ql/src/utils/model-generator/CaptureDiscardedSummaryModels.ql

@@ -5,8 +5,8 @@
  */
 
 import semmle.code.csharp.dataflow.ExternalFlow
-import internal.CaptureModels
-import internal.CaptureSummaryFlow
+import utils.modelgenerator.internal.CaptureModels
+import utils.modelgenerator.internal.CaptureSummaryFlow
 
 from DataFlowTargetApi api, string flow
 where flow = captureFlow(api) and hasSummary(api, false)

csharp/ql/src/utils/model-generator/CaptureNegativeSummaryModels.ql

@@ -7,8 +7,8 @@
  */
 
 import semmle.code.csharp.dataflow.ExternalFlow
-import internal.CaptureModels
-import internal.CaptureSummaryFlow
+import utils.modelgenerator.internal.CaptureModels
+import utils.modelgenerator.internal.CaptureSummaryFlow
 
 from DataFlowTargetApi api, string noflow
 where

csharp/ql/src/utils/model-generator/CaptureSinkModels.ql

@@ -6,7 +6,7 @@
  * @tags model-generator
  */
 
-import internal.CaptureModels
+import utils.modelgenerator.internal.CaptureModels
 
 class Activate extends ActiveConfiguration {
   override predicate activateToSinkConfig() { any() }

csharp/ql/src/utils/model-generator/CaptureSourceModels.ql

@@ -6,7 +6,7 @@
  * @tags model-generator
  */
 
-import internal.CaptureModels
+import utils.modelgenerator.internal.CaptureModels
 
 class Activate extends ActiveConfiguration {
   override predicate activateFromSourceConfig() { any() }

csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql

@@ -7,8 +7,8 @@
  */
 
 import semmle.code.csharp.dataflow.ExternalFlow
-import internal.CaptureModels
-import internal.CaptureSummaryFlow
+import utils.modelgenerator.internal.CaptureModels
+import utils.modelgenerator.internal.CaptureSummaryFlow
 
 from DataFlowTargetApi api, string flow
 where flow = captureFlow(api) and not hasSummary(api, false)

csharp/ql/src/utils/model-generator/CaptureTypeBasedSummaryModels.ql

@@ -7,7 +7,7 @@
  */
 
 import semmle.code.csharp.dataflow.ExternalFlow
-import internal.CaptureTypeBasedSummaryModels
+import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels
 
 from TypeBasedFlowTargetApi api, string flow
 where flow = captureFlow(api)