Skip to content

Commit d0831eb

Browse files
aschackmullaschackmull
authored
Merge pull request github#17625 from aschackmull/java/collection-neutrals
Java: Minor model tweak and comment fix.
2 parents 52894f5 + 222ae6a commit d0831eb

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

‎java/ql/lib/ext/java.lang.model.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ extensions:
200200
- ["java.lang", "ClassLoader", "loadClass", "(String,boolean)", "summary", "df-manual"]
201201
- ["java.lang", "ClassLoader", "setClassAssertionStatus", "(String,boolean)", "summary", "df-manual"]
202202
- ["java.lang", "ClassLoader", "setPackageAssertionStatus", "(String,boolean)", "summary", "df-manual"]
203+
- ["java.lang", "Comparable", "compareTo", "", "summary", "manual"]
203204
- ["java.lang", "Enum", "Enum", "(String,int)", "summary", "manual"]
204205
- ["java.lang", "Enum", "equals", "(Object)", "summary", "manual"]
205206
- ["java.lang", "Enum", "hashCode", "()", "summary", "manual"]

‎java/ql/lib/ext/java.util.model.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ extensions:
362362
- ["java.util", "SequencedMap", True, "sequencedValues", "", "", "Argument[this].MapValue", "ReturnValue.Element", "value", "manual"]
363363
- ["java.util", "SequencedSet", True, "reversed", "", "", "Argument[this].Element", "ReturnValue.Element", "value", "manual"]
364364
- ["java.util", "Set", False, "copyOf", "(Collection)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
365-
- ["java.util", "Set", False, "clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
365+
- ["java.util", "Set", True, "clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
366366
- ["java.util", "Set", False, "of", "(Object)", "", "Argument[0]", "ReturnValue.Element", "value", "manual"]
367367
- ["java.util", "Set", False, "of", "(Object,Object)", "", "Argument[0..1]", "ReturnValue.Element", "value", "manual"]
368368
- ["java.util", "Set", False, "of", "(Object,Object,Object)", "", "Argument[0..2]", "ReturnValue.Element", "value", "manual"]
@@ -430,6 +430,8 @@ extensions:
430430
- ["java.util", "Collection", "contains", "(Object)", "summary", "manual"]
431431
- ["java.util", "Collection", "containsAll", "(Collection)", "summary", "manual"]
432432
- ["java.util", "Collection", "isEmpty", "()", "summary", "manual"]
433+
- ["java.util", "Collection", "remove", "(Object)", "summary", "manual"]
434+
- ["java.util", "Collection", "removeIf", "(Predicate)", "summary", "manual"]
433435
- ["java.util", "Collection", "size", "()", "summary", "manual"]
434436
- ["java.util", "Collections", "emptyList", "()", "summary", "manual"]
435437
- ["java.util", "Collections", "emptyMap", "()", "summary", "manual"]
@@ -451,12 +453,14 @@ extensions:
451453
- ["java.util", "HashMap", "size", "()", "summary", "manual"]
452454
- ["java.util", "HashSet", "HashSet", "(int)", "summary", "manual"]
453455
- ["java.util", "Iterator", "hasNext", "()", "summary", "manual"]
456+
- ["java.util", "Iterator", "remove", "()", "summary", "manual"]
454457
- ["java.util", "List", "contains", "(Object)", "summary", "manual"]
455458
- ["java.util", "List", "equals", "(Object)", "summary", "manual"]
456459
- ["java.util", "List", "hashCode", "()", "summary", "manual"]
457460
- ["java.util", "List", "indexOf", "(Object)", "summary", "manual"]
458461
- ["java.util", "List", "isEmpty", "()", "summary", "manual"]
459462
- ["java.util", "List", "of", "()", "summary", "manual"]
463+
- ["java.util", "List", "remove", "(Object)", "summary", "manual"]
460464
- ["java.util", "List", "sort", "(Comparator)", "summary", "manual"]
461465
- ["java.util", "List", "size", "()", "summary", "manual"]
462466
- ["java.util", "Locale$Builder", "addUnicodeLocaleAttribute", "(String)", "summary", "df-manual"]
@@ -535,6 +539,8 @@ extensions:
535539
- ["java.util", "Scanner", "locale", "()", "summary", "df-manual"]
536540
- ["java.util", "Set", "contains", "(Object)", "summary", "manual"]
537541
- ["java.util", "Set", "isEmpty", "()", "summary", "manual"]
542+
- ["java.util", "Set", "remove", "(Object)", "summary", "manual"]
543+
- ["java.util", "Set", "removeAll", "(Collection)", "summary", "manual"]
538544
- ["java.util", "Set", "size", "()", "summary", "manual"]
539545
- ["java.util", "TreeMap", "TreeMap", "(Comparator)", "summary", "df-manual"]
540546
- ["java.util", "TreeSet", "TreeSet", "(Comparator)", "summary", "df-manual"]
@@ -545,14 +551,8 @@ extensions:
545551
- ["java.util", "TimeZone", "getTimeZone", "(String)", "summary", "manual"]
546552
- ["java.util", "Vector", "size", "()", "summary", "manual"]
547553

548-
# The below APIs are currently being stored as neutral models since `WithoutElement` has not yet been implemented for Java.
549-
# When `WithoutElement` is implemented, these should be changed to summary models of the form `Argument[this].WithoutElement -> Argument[this]`.
550-
- ["java.util", "Collection", "removeIf", "(Predicate)", "summary", "manual"]
551-
- ["java.util", "Iterator", "remove", "()", "summary", "manual"]
552-
- ["java.util", "List", "remove", "(Object)", "summary", "manual"]
554+
# The below API is currently being stored as neutral models since `WithoutElement` does not yet have a counterpart for MapValue/MapKey.
553555
- ["java.util", "Map", "clear", "()", "summary", "manual"]
554-
- ["java.util", "Set", "remove", "(Object)", "summary", "manual"]
555-
- ["java.util", "Set", "removeAll", "(Collection)", "summary", "manual"]
556556

557557
# The below APIs have numeric flow and are currently being stored as neutral models.
558558
# These may be changed to summary models with kinds "value-numeric" and "taint-numeric" (or similar) in the future.

‎java/ql/test/library-tests/dataflow/collections/containerflow.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ models
297297
| 296 | Summary: java.util; SequencedMap; true; sequencedValues; ; ; Argument[this].MapValue; ReturnValue.Element; value; manual |
298298
| 297 | Summary: java.util; SequencedSet; true; reversed; ; ; Argument[this].Element; ReturnValue.Element; value; manual |
299299
| 298 | Summary: java.util; Set; false; copyOf; (Collection); ; Argument[0].Element; ReturnValue.Element; value; manual |
300-
| 299 | Summary: java.util; Set; false; clear; (); ; Argument[this].WithoutElement; Argument[this]; value; manual |
300+
| 299 | Summary: java.util; Set; true; clear; (); ; Argument[this].WithoutElement; Argument[this]; value; manual |
301301
| 300 | Summary: java.util; Set; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
302302
| 301 | Summary: java.util; Set; false; of; (Object,Object); ; Argument[0..1]; ReturnValue.Element; value; manual |
303303
| 302 | Summary: java.util; Set; false; of; (Object,Object,Object); ; Argument[0..2]; ReturnValue.Element; value; manual |

0 commit comments

Comments
 (0)