Java/Ruby: Sync files.

java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll

@@ -1116,13 +1116,13 @@ module Private {
       preservesValue = false and result = "taint"
     }
 
-    private string renderGenerated(RelevantSummarizedCallable c) {
-      if c.(SummarizedCallable).isAutoGenerated() then result = "generated:" else result = ""
+    private string renderProvenance(RelevantSummarizedCallable c) {
+      if c.(SummarizedCallable).isAutoGenerated() then result = "generated" else result = "manual"
     }
 
     /**
      * A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
-     * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;(generated:)?kind",
+     * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
      * ext is hardcoded to empty.
      */
     query predicate summary(string csv) {
@@ -1133,7 +1133,7 @@ module Private {
         c.relevantSummary(input, output, preservesValue) and
         csv =
           c.getCallableCsv() + getComponentStackCsv(input) + ";" + getComponentStackCsv(output) +
-            ";" + renderGenerated(c) + renderKind(preservesValue)
+            ";" + renderKind(preservesValue) + ";" + renderProvenance(c)
       )
     }
   }

java/ql/src/utils/model-generator/internal/CaptureModels.qll

@@ -44,7 +44,8 @@ private string asSummaryModel(TargetApi api, string input, string output, string
   result =
     asPartialModel(api) + input + ";" //
       + output + ";" //
-      + "generated:" + kind
+      + kind + ";" //
+      + "generated"
 }
 
 /**
@@ -68,7 +69,10 @@ private string asTaintModel(TargetApi api, string input, string output) {
  */
 bindingset[input, kind]
 private string asSinkModel(TargetApi api, string input, string kind) {
-  result = asPartialModel(api) + input + ";" + "generated:" + kind
+  result =
+    asPartialModel(api) + input + ";" //
+      + kind + ";" //
+      + "generated"
 }
 
 /**
@@ -76,7 +80,10 @@ private string asSinkModel(TargetApi api, string input, string kind) {
  */
 bindingset[output, kind]
 private string asSourceModel(TargetApi api, string output, string kind) {
-  result = asPartialModel(api) + output + ";" + "generated:" + kind
+  result =
+    asPartialModel(api) + output + ";" //
+      + kind + ";" //
+      + "generated"
 }
 
 /**