Skip to content

Commit a121b73

Browse files
asgerfasgerf
committed
Java: update CSV rows to dot-separated syntax
1 parent 7f80871 commit a121b73

42 files changed

Lines changed: 2500 additions & 2502 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll‎

Lines changed: 315 additions & 315 deletions
Large diffs are not rendered by default.

‎java/ql/lib/semmle/code/java/frameworks/JavaxJson.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ private class FlowSummaries extends SummaryModelCsv {
1111
["javax", "jakarta"] +
1212
[
1313
".json;Json;false;createArrayBuilder;(JsonArray);;Argument[0];ReturnValue;taint",
14-
".json;Json;false;createArrayBuilder;(Collection);;Element of Argument[0];ReturnValue;taint",
14+
".json;Json;false;createArrayBuilder;(Collection);;Argument[0].Element;ReturnValue;taint",
1515
".json;Json;false;createDiff;;;Argument[0..1];ReturnValue;taint",
1616
".json;Json;false;createMergeDiff;;;Argument[0..1];ReturnValue;taint",
1717
".json;Json;false;createMergePatch;;;Argument[0];ReturnValue;taint",
1818
".json;Json;false;createObjectBuilder;(JsonObject);;Argument[0];ReturnValue;taint",
19-
".json;Json;false;createObjectBuilder;(Map);;MapKey of Argument[0];ReturnValue;taint",
20-
".json;Json;false;createObjectBuilder;(Map);;MapValue of Argument[0];ReturnValue;taint",
19+
".json;Json;false;createObjectBuilder;(Map);;Argument[0].MapKey;ReturnValue;taint",
20+
".json;Json;false;createObjectBuilder;(Map);;Argument[0].MapValue;ReturnValue;taint",
2121
".json;Json;false;createPatch;;;Argument[0];ReturnValue;taint",
2222
".json;Json;false;createPatchBuilder;;;Argument[0];ReturnValue;taint",
2323
".json;Json;false;createPointer;;;Argument[0];ReturnValue;taint",

‎java/ql/lib/semmle/code/java/frameworks/JaxWS.qll‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -397,16 +397,16 @@ private class MultivaluedMapModel extends SummaryModelCsv {
397397
row =
398398
["javax", "jakarta"] + ".ws.rs.core;MultivaluedMap;true;" +
399399
[
400-
"add;;;Argument[0];MapKey of Argument[-1];value",
401-
"add;;;Argument[1];Element of MapValue of Argument[-1];value",
402-
"addAll;;;Argument[0];MapKey of Argument[-1];value",
403-
"addAll;(Object,List);;Element of Argument[1];Element of MapValue of Argument[-1];value",
404-
"addAll;(Object,Object[]);;ArrayElement of Argument[1];Element of MapValue of Argument[-1];value",
405-
"addFirst;;;Argument[0];MapKey of Argument[-1];value",
406-
"addFirst;;;Argument[1];Element of MapValue of Argument[-1];value",
407-
"getFirst;;;Element of MapValue of Argument[-1];ReturnValue;value",
408-
"putSingle;;;Argument[0];MapKey of Argument[-1];value",
409-
"putSingle;;;Argument[1];Element of MapValue of Argument[-1];value"
400+
"add;;;Argument[0];Argument[-1].MapKey;value",
401+
"add;;;Argument[1];Argument[-1].MapValue.Element;value",
402+
"addAll;;;Argument[0];Argument[-1].MapKey;value",
403+
"addAll;(Object,List);;Argument[1].Element;Argument[-1].MapValue.Element;value",
404+
"addAll;(Object,Object[]);;Argument[1].ArrayElement;Argument[-1].MapValue.Element;value",
405+
"addFirst;;;Argument[0];Argument[-1].MapKey;value",
406+
"addFirst;;;Argument[1];Argument[-1].MapValue.Element;value",
407+
"getFirst;;;Argument[-1].MapValue.Element;ReturnValue;value",
408+
"putSingle;;;Argument[0];Argument[-1].MapKey;value",
409+
"putSingle;;;Argument[1];Argument[-1].MapValue.Element;value"
410410
]
411411
}
412412
}
@@ -419,8 +419,8 @@ private class AbstractMultivaluedMapModel extends SummaryModelCsv {
419419
row =
420420
["javax", "jakarta"] + ".ws.rs.core;AbstractMultivaluedMap;false;AbstractMultivaluedMap;;;" +
421421
[
422-
"MapKey of Argument[0];MapKey of Argument[-1];value",
423-
"MapValue of Argument[0];MapValue of Argument[-1];value"
422+
"Argument[0].MapKey;Argument[-1].MapKey;value",
423+
"Argument[0].MapValue;Argument[-1].MapValue;value"
424424
]
425425
}
426426
}
@@ -433,10 +433,10 @@ private class MultivaluedHashMapModel extends SummaryModelCsv {
433433
row =
434434
["javax", "jakarta"] + ".ws.rs.core;MultivaluedHashMap;false;MultivaluedHashMap;" +
435435
[
436-
"(Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
437-
"(Map);;MapValue of Argument[0];Element of MapValue of Argument[-1];value",
438-
"(MultivaluedMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
439-
"(MultivaluedMap);;MapValue of Argument[0];MapValue of Argument[-1];value"
436+
"(Map);;Argument[0].MapKey;Argument[-1].MapKey;value",
437+
"(Map);;Argument[0].MapValue;Argument[-1].MapValue.Element;value",
438+
"(MultivaluedMap);;Argument[0].MapKey;Argument[-1].MapKey;value",
439+
"(MultivaluedMap);;Argument[0].MapValue;Argument[-1].MapValue;value"
440440
]
441441
}
442442
}
@@ -520,8 +520,8 @@ private class FormModel extends SummaryModelCsv {
520520
row =
521521
["javax", "jakarta"] + ".ws.rs.core;Form;" +
522522
[
523-
"false;Form;;;MapKey of Argument[0];Argument[-1];taint",
524-
"false;Form;;;Element of MapValue of Argument[0];Argument[-1];taint",
523+
"false;Form;;;Argument[0].MapKey;Argument[-1];taint",
524+
"false;Form;;;Argument[0].MapValue.Element;Argument[-1];taint",
525525
"false;Form;;;Argument[0..1];Argument[-1];taint",
526526
"true;asMap;;;Argument[-1];ReturnValue;taint",
527527
"true;param;;;Argument[0..1];Argument[-1];taint",
@@ -571,15 +571,15 @@ private class UriBuilderModel extends SummaryModelCsv {
571571
row =
572572
["javax", "jakarta"] + ".ws.rs.core;UriBuilder;" +
573573
[
574-
"true;build;;;ArrayElement of Argument[0];ReturnValue;taint",
574+
"true;build;;;Argument[0].ArrayElement;ReturnValue;taint",
575575
"true;build;;;Argument[-1];ReturnValue;taint",
576-
"true;buildFromEncoded;;;ArrayElement of Argument[0];ReturnValue;taint",
576+
"true;buildFromEncoded;;;Argument[0].ArrayElement;ReturnValue;taint",
577577
"true;buildFromEncoded;;;Argument[-1];ReturnValue;taint",
578-
"true;buildFromEncodedMap;;;MapKey of Argument[0];ReturnValue;taint",
579-
"true;buildFromEncodedMap;;;MapValue of Argument[0];ReturnValue;taint",
578+
"true;buildFromEncodedMap;;;Argument[0].MapKey;ReturnValue;taint",
579+
"true;buildFromEncodedMap;;;Argument[0].MapValue;ReturnValue;taint",
580580
"true;buildFromEncodedMap;;;Argument[-1];ReturnValue;taint",
581-
"true;buildFromMap;;;MapKey of Argument[0];ReturnValue;taint",
582-
"true;buildFromMap;;;MapValue of Argument[0];ReturnValue;taint",
581+
"true;buildFromMap;;;Argument[0].MapKey;ReturnValue;taint",
582+
"true;buildFromMap;;;Argument[0].MapValue;ReturnValue;taint",
583583
"true;buildFromMap;;;Argument[-1];ReturnValue;taint",
584584
"true;clone;;;Argument[-1];ReturnValue;taint",
585585
"true;fragment;;;Argument[0];ReturnValue;taint",
@@ -589,40 +589,40 @@ private class UriBuilderModel extends SummaryModelCsv {
589589
"false;fromUri;;;Argument[0];ReturnValue;taint",
590590
"true;host;;;Argument[0];ReturnValue;taint", "true;host;;;Argument[-1];ReturnValue;value",
591591
"true;matrixParam;;;Argument[0];ReturnValue;taint",
592-
"true;matrixParam;;;ArrayElement of Argument[1];ReturnValue;taint",
592+
"true;matrixParam;;;Argument[1].ArrayElement;ReturnValue;taint",
593593
"true;matrixParam;;;Argument[-1];ReturnValue;value",
594594
"true;path;;;Argument[0..1];ReturnValue;taint",
595595
"true;path;;;Argument[-1];ReturnValue;value",
596596
"true;queryParam;;;Argument[0];ReturnValue;taint",
597-
"true;queryParam;;;ArrayElement of Argument[1];ReturnValue;taint",
597+
"true;queryParam;;;Argument[1].ArrayElement;ReturnValue;taint",
598598
"true;queryParam;;;Argument[-1];ReturnValue;value",
599599
"true;replaceMatrix;;;Argument[0];ReturnValue;taint",
600600
"true;replaceMatrix;;;Argument[-1];ReturnValue;value",
601601
"true;replaceMatrixParam;;;Argument[0];ReturnValue;taint",
602-
"true;replaceMatrixParam;;;ArrayElement of Argument[1];ReturnValue;taint",
602+
"true;replaceMatrixParam;;;Argument[1].ArrayElement;ReturnValue;taint",
603603
"true;replaceMatrixParam;;;Argument[-1];ReturnValue;value",
604604
"true;replacePath;;;Argument[0];ReturnValue;taint",
605605
"true;replacePath;;;Argument[-1];ReturnValue;value",
606606
"true;replaceQuery;;;Argument[0];ReturnValue;taint",
607607
"true;replaceQuery;;;Argument[-1];ReturnValue;value",
608608
"true;replaceQueryParam;;;Argument[0];ReturnValue;taint",
609-
"true;replaceQueryParam;;;ArrayElement of Argument[1];ReturnValue;taint",
609+
"true;replaceQueryParam;;;Argument[1].ArrayElement;ReturnValue;taint",
610610
"true;replaceQueryParam;;;Argument[-1];ReturnValue;value",
611611
"true;resolveTemplate;;;Argument[0..2];ReturnValue;taint",
612612
"true;resolveTemplate;;;Argument[-1];ReturnValue;value",
613613
"true;resolveTemplateFromEncoded;;;Argument[0..1];ReturnValue;taint",
614614
"true;resolveTemplateFromEncoded;;;Argument[-1];ReturnValue;value",
615-
"true;resolveTemplates;;;MapKey of Argument[0];ReturnValue;taint",
616-
"true;resolveTemplates;;;MapValue of Argument[0];ReturnValue;taint",
615+
"true;resolveTemplates;;;Argument[0].MapKey;ReturnValue;taint",
616+
"true;resolveTemplates;;;Argument[0].MapValue;ReturnValue;taint",
617617
"true;resolveTemplates;;;Argument[-1];ReturnValue;value",
618-
"true;resolveTemplatesFromEncoded;;;MapKey of Argument[0];ReturnValue;taint",
619-
"true;resolveTemplatesFromEncoded;;;MapValue of Argument[0];ReturnValue;taint",
618+
"true;resolveTemplatesFromEncoded;;;Argument[0].MapKey;ReturnValue;taint",
619+
"true;resolveTemplatesFromEncoded;;;Argument[0].MapValue;ReturnValue;taint",
620620
"true;resolveTemplatesFromEncoded;;;Argument[-1];ReturnValue;value",
621621
"true;scheme;;;Argument[0];ReturnValue;taint",
622622
"true;scheme;;;Argument[-1];ReturnValue;value",
623623
"true;schemeSpecificPart;;;Argument[0];ReturnValue;taint",
624624
"true;schemeSpecificPart;;;Argument[-1];ReturnValue;value",
625-
"true;segment;;;ArrayElement of Argument[0];ReturnValue;taint",
625+
"true;segment;;;Argument[0].ArrayElement;ReturnValue;taint",
626626
"true;segment;;;Argument[-1];ReturnValue;value",
627627
"true;toTemplate;;;Argument[-1];ReturnValue;taint",
628628
"true;uri;;;Argument[0];ReturnValue;taint", "true;uri;;;Argument[-1];ReturnValue;value",

0 commit comments

Comments
 (0)