Java: remove models for Consumer.accept and Collectors.toMap

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

@@ -11,9 +11,3 @@ extensions:
     data:
       - ["java.util.function", "Function", True, "apply", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["java.util.function", "Supplier", False, "get", "()", "", "Argument[-1]", "ReturnValue", "value", "manual"]
-
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["java.util.function", "Consumer", "accept", "(Object)", "manual"]

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

@@ -93,5 +93,4 @@ extensions:
       extensible: neutralModel
     data:
       - ["java.util.stream", "Collectors", "toList", "()", "manual"]
-      - ["java.util.stream", "Collectors", "toMap", "(Function,Function)", "manual"]
       - ["java.util.stream", "Collectors", "toSet", "()", "manual"]

java/ql/test/ext/TopJdkApis/TopJdkApis.qll

@@ -143,10 +143,12 @@ class TopJdkApi extends SummarizedCallableBase {
   predicate hasManualMadModel() { this.hasManualSummary() or this.hasManualNeutral() }
   /*
    * Note: the following top-100 APIs are not modeled with MaD:
-   * `java.util.stream.Stream#collect(Collector)`: handled separately on a case-by-case basis as it is too complex for MaD
-   * `java.util.stream.Collectors#joining(CharSequence)`: cannot be modeled completely without a model for `java.util.stream.Stream#collect(Collector)` as well
-   * `java.lang.String#valueOf(Object)`: also a complex case; an alias for `Object.toString`, except the dispatch is hidden
+   * `java.lang.String#valueOf(Object)`: a complex case; an alias for `Object.toString`, except the dispatch is hidden
    * `java.lang.Throwable#printStackTrace()`: should probably not be a general step, but there might be specialised queries that care
+   * `java.util.function.Consumer#accept(Object)`: specialized lambda flow
+   * `java.util.stream.Collectors#joining(CharSequence)`: cannot be modeled completely without a model for `java.util.stream.Stream#collect(Collector)` as well
+   * `java.util.stream.Collectors#toMap(Function,Function)`: specialized collectors flow
+   * `java.util.stream.Stream#collect(Collector)`: handled separately on a case-by-case basis as it is too complex for MaD
    */
 
   }

java/ql/test/ext/TopJdkApis/TopJdkApisTest.expected

@@ -1,4 +1,6 @@
 | java.lang.String#valueOf(Object) | no manual model |
 | java.lang.Throwable#printStackTrace() | no manual model |
+| java.util.function.Consumer#accept(Object) | no manual model |
 | java.util.stream.Collectors#joining(CharSequence) | no manual model |
+| java.util.stream.Collectors#toMap(Function,Function) | no manual model |
 | java.util.stream.Stream#collect(Collector) | no manual model |