Java: Adjust the model generator to produce kinds.

michaelnebel · michaelnebel · commit d103a571413d · 2023-05-08T16:18:59.000+02:00
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll
@@ -25,8 +25,11 @@ module PrintingImpl<PrintingSig Printing> {
         + Printing::getProvenance()
   }
 
-  string asNeutralModel(Printing::Api api) {
-    result = asPartialNeutralModel(api) + Printing::getProvenance()
+  string asNeutralSummaryModel(Printing::Api api) {
+    result =
+      asPartialNeutralModel(api) //
+        + "summary" + ";" //
+        + Printing::getProvenance()
   }
 
   /**
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll b/java/ql/src/utils/modelgenerator/internal/CaptureSummaryFlowQuery.qll
@@ -78,5 +78,5 @@ string captureFlow(DataFlowTargetApi api) {
  */
 string captureNoFlow(DataFlowTargetApi api) {
   not exists(captureFlow(api)) and
-  result = ModelPrinting::asNeutralModel(api)
+  result = ModelPrinting::asNeutralSummaryModel(api)
 }

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,11 @@ module PrintingImpl<PrintingSig Printing> {`
`25`	`25`	`+ Printing::getProvenance()`
`26`	`26`	`}`
`27`	`27`
`28`		`- string asNeutralModel(Printing::Api api) {`
`29`		`- result = asPartialNeutralModel(api) + Printing::getProvenance()`
	`28`	`+ string asNeutralSummaryModel(Printing::Api api) {`
	`29`	`+ result =`
	`30`	`+ asPartialNeutralModel(api) //`
	`31`	`+ + "summary" + ";" //`
	`32`	`+ + Printing::getProvenance()`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,5 @@ string captureFlow(DataFlowTargetApi api) {`
`78`	`78`	`*/`
`79`	`79`	`string captureNoFlow(DataFlowTargetApi api) {`
`80`	`80`	`not exists(captureFlow(api)) and`
`81`		`- result = ModelPrinting::asNeutralModel(api)`
	`81`	`+ result = ModelPrinting::asNeutralSummaryModel(api)`
`82`	`82`	`}`