From 9ec17e6338c23a8189334c9082a6f9882f7c7027 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 26 Feb 2024 12:40:40 +0000
Subject: [PATCH 001/136] Shared: Pull out the shared parts of Java's type flow
 library into a shared module.

---
 shared/typeflow/codeql/typeflow/TypeFlow.qll  | 118 +++++
 .../codeql/typeflow/internal/TypeFlowImpl.qll | 445 ++++++++++++++++++
 shared/typeflow/qlpack.yml                    |   7 +
 3 files changed, 570 insertions(+)
 create mode 100644 shared/typeflow/codeql/typeflow/TypeFlow.qll
 create mode 100644 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
 create mode 100644 shared/typeflow/qlpack.yml

diff --git a/shared/typeflow/codeql/typeflow/TypeFlow.qll b/shared/typeflow/codeql/typeflow/TypeFlow.qll
new file mode 100644
index 00000000000..5df8e53a914
--- /dev/null
+++ b/shared/typeflow/codeql/typeflow/TypeFlow.qll
@@ -0,0 +1,118 @@
+/**
+ * Provides predicates for giving improved type bounds on expressions.
+ *
+ * An inferred bound on the runtime type of an expression can be either exact
+ * or merely an upper bound. Bounds are only reported if they are likely to be
+ * better than the static bound, which can happen either if an inferred exact
+ * type has a subtype or if an inferred upper bound passed through at least one
+ * explicit or implicit cast that lost type information.
+ */
+
+/** Provides the input specification. */
+signature module TypeFlowInput {
+  /**
+   * A node for which type information is available. For example, expressions
+   * and method declarations.
+   */
+  class TypeFlowNode {
+    /** Gets a textual representation of this node. */
+    string toString();
+
+    /** Gets the type of this node. */
+    Type getType();
+
+    /**
+     * Holds if this element is at the specified location.
+     * The location spans column `startcolumn` of line `startline` to
+     * column `endcolumn` of line `endline` in file `filepath`.
+     * For more information, see
+     * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+     */
+    predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    );
+  }
+
+  /**
+   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
+   * necessarily functionally determined by `n2`.
+   */
+  predicate joinStep0(TypeFlowNode n1, TypeFlowNode n2);
+
+  /**
+   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is
+   * functionally determined by `n2`.
+   */
+  predicate step(TypeFlowNode n1, TypeFlowNode n2);
+
+  /**
+   * Holds if `null` is the only value that flows to `n`.
+   */
+  predicate isNull(TypeFlowNode n);
+
+  /** A type. */
+  class Type {
+    /** Gets a textual representation of this type. */
+    string toString();
+
+    /** Gets a direct super type of this type. */
+    Type getASupertype();
+  }
+
+  /**
+   * Gets the source declaration of this type, or `t` if `t` is already a
+   * source declaration.
+   */
+  default Type getSourceDeclaration(Type t) { result = t }
+
+  /**
+   * Gets the erased version of this type. The erasure of a erasure of a
+   * parameterized type is its generic counterpart, or `t` if `t` is already
+   * fully erased.
+   */
+  default Type getErasure(Type t) { result = t }
+
+  /** Gets a direct or indirect supertype of this type, including itself. */
+  default Type getAnAncestor(Type sub) {
+    result = sub
+    or
+    exists(Type mid | result = mid.getASupertype() and sub = getAnAncestor(mid))
+  }
+
+  /**
+   * Holds if `t` is the most precise type of `n`, if any.
+   */
+  predicate exactTypeBase(TypeFlowNode n, Type t);
+
+  /**
+   * Holds if `n` has type `t` and this information is discarded, such that `t`
+   * might be a better type bound for nodes where `n` flows to. This might include
+   * multiple bounds for a single node.
+   */
+  predicate typeFlowBaseCand(TypeFlowNode n, Type t);
+
+  /**
+   * Holds if `n` is a value that is guarded by a disjunction of a dynamic type
+   * check that checks if `n` is an instance of type `t_i` where `t` is one of
+   * those `t_i`.
+   */
+  default predicate instanceofDisjunctionGuarded(TypeFlowNode n, Type t) { none() }
+
+  /**
+   * Holds if `t` is a raw type or parameterised type with unrestricted type
+   * arguments.
+   *
+   * By default, no types are unbound.
+   */
+  default predicate unbound(Type t) { none() }
+}
+
+private import internal.TypeFlowImpl as Impl
+
+/**
+ * Provides an implementation of type-flow using input `I`.
+ */
+cached
+module Make<TypeFlowInput I> {
+  import Impl::TypeFlow<I>
+}
diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
new file mode 100644
index 00000000000..121bc605dbc
--- /dev/null
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -0,0 +1,445 @@
+private import codeql.typeflow.TypeFlow
+private import codeql.util.Unit
+
+module TypeFlow<TypeFlowInput I> {
+  private import I
+
+  /**
+   * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
+   * functionally determined by `n2`, and `n1` might take a non-null value.
+   */
+  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep0(n1, n2) and not isNull(n1) }
+
+  private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep(n1, n2) or step(n1, n2) }
+
+  private predicate sccEdge(TypeFlowNode n1, TypeFlowNode n2) {
+    anyStep(n1, n2) and anyStep+(n2, n1)
+  }
+
+  private module Scc = QlBuiltins::EquivalenceRelation<TypeFlowNode, sccEdge/2>;
+
+  private class TypeFlowScc = Scc::EquivalenceClass;
+
+  /** Holds if `n` is part of an SCC of size 2 or more represented by `scc`. */
+  private predicate sccRepr(TypeFlowNode n, TypeFlowScc scc) { scc = Scc::getEquivalenceClass(n) }
+
+  private predicate sccJoinStep(TypeFlowNode n, TypeFlowScc scc) {
+    exists(TypeFlowNode mid |
+      joinStep(n, mid) and
+      sccRepr(mid, scc) and
+      not sccRepr(n, scc)
+    )
+  }
+
+  private signature class NodeSig;
+
+  private signature module Edge {
+    class Node;
+
+    predicate edge(TypeFlowNode n1, Node n2);
+  }
+
+  private signature module RankedEdge<NodeSig Node> {
+    predicate edgeRank(int r, TypeFlowNode n1, Node n2);
+
+    int lastRank(Node n);
+  }
+
+  private module RankEdge<Edge E> implements RankedEdge<E::Node> {
+    private import E
+
+    /**
+     * Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. The used
+     * ordering is not necessarily total, so the ranking may have gaps.
+     */
+    private predicate edgeRank1(int r, TypeFlowNode n1, Node n2) {
+      n1 =
+        rank[r](TypeFlowNode n, int startline, int startcolumn |
+          edge(n, n2) and
+          n.hasLocationInfo(_, startline, startcolumn, _, _)
+        |
+          n order by startline, startcolumn
+        )
+    }
+
+    /**
+     * Holds if `r2` is a ranking of the ranks from `edgeRank1`. This removes the
+     * gaps from the ranking.
+     */
+    private predicate edgeRank2(int r2, int r1, Node n) {
+      r1 = rank[r2](int r | edgeRank1(r, _, n) | r)
+    }
+
+    /** Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. */
+    predicate edgeRank(int r, TypeFlowNode n1, Node n2) {
+      exists(int r1 |
+        edgeRank1(r1, n1, n2) and
+        edgeRank2(r, r1, n2)
+      )
+    }
+
+    int lastRank(Node n) { result = max(int r | edgeRank(r, _, n)) }
+  }
+
+  private signature module TypePropagation {
+    class Typ;
+
+    predicate candType(TypeFlowNode n, Typ t);
+
+    bindingset[t]
+    predicate supportsType(TypeFlowNode n, Typ t);
+  }
+
+  /** Implements recursion through `forall` by way of edge ranking. */
+  private module ForAll<NodeSig Node, RankedEdge<Node> E, TypePropagation T> {
+    /**
+     * Holds if `t` is a bound that holds on one of the incoming edges to `n` and
+     * thus is a candidate bound for `n`.
+     */
+    pragma[nomagic]
+    private predicate candJoinType(Node n, T::Typ t) {
+      exists(TypeFlowNode mid |
+        T::candType(mid, t) and
+        E::edgeRank(_, mid, n)
+      )
+    }
+
+    /**
+     * Holds if `t` is a candidate bound for `n` that is also valid for data coming
+     * through the edges into `n` ranked from `1` to `r`.
+     */
+    private predicate flowJoin(int r, Node n, T::Typ t) {
+      (
+        r = 1 and candJoinType(n, t)
+        or
+        flowJoin(r - 1, n, t) and E::edgeRank(r, _, n)
+      ) and
+      forall(TypeFlowNode mid | E::edgeRank(r, mid, n) | T::supportsType(mid, t))
+    }
+
+    /**
+     * Holds if `t` is a candidate bound for `n` that is also valid for data
+     * coming through all the incoming edges, and therefore is a valid bound for
+     * `n`.
+     */
+    predicate flowJoin(Node n, T::Typ t) { flowJoin(E::lastRank(n), n, t) }
+  }
+
+  private module JoinStep implements Edge {
+    class Node = TypeFlowNode;
+
+    predicate edge = joinStep/2;
+  }
+
+  private module SccJoinStep implements Edge {
+    class Node = TypeFlowScc;
+
+    predicate edge = sccJoinStep/2;
+  }
+
+  private module RankedJoinStep = RankEdge<JoinStep>;
+
+  private module RankedSccJoinStep = RankEdge<SccJoinStep>;
+
+  private module ExactTypePropagation implements TypePropagation {
+    class Typ = Type;
+
+    predicate candType = exactType/2;
+
+    predicate supportsType = exactType/2;
+  }
+
+  /**
+   * Holds if the runtime type of `n` is exactly `t` and if this bound is a
+   * non-trivial lower bound, that is, `t` has a subtype.
+   */
+  private predicate exactType(TypeFlowNode n, Type t) {
+    exactTypeBase(n, t)
+    or
+    exists(TypeFlowNode mid | exactType(mid, t) and step(mid, n))
+    or
+    // The following is an optimized version of
+    // `forex(TypeFlowNode mid | joinStep(mid, n) | exactType(mid, t))`
+    ForAll<TypeFlowNode, RankedJoinStep, ExactTypePropagation>::flowJoin(n, t)
+    or
+    exists(TypeFlowScc scc |
+      sccRepr(n, scc) and
+      // Optimized version of
+      // `forex(TypeFlowNode mid | sccJoinStep(mid, scc) | exactType(mid, t))`
+      ForAll<TypeFlowScc, RankedSccJoinStep, ExactTypePropagation>::flowJoin(scc, t)
+    )
+  }
+
+  /**
+   * Gets the source declaration of a direct supertype of this type, excluding itself.
+   */
+  private Type getASourceSupertype(Type t) {
+    result = getSourceDeclaration(t.getASupertype()) and
+    result != t
+  }
+
+  /**
+   * Holds if `n` has type `t` and this information is discarded, such that `t`
+   * might be a better type bound for nodes where `n` flows to. This only includes
+   * the best such bound for each node.
+   */
+  private predicate typeFlowBase(TypeFlowNode n, Type t) {
+    exists(Type te |
+      typeFlowBaseCand(n, t) and
+      te = getErasure(t) and
+      not exists(Type better |
+        typeFlowBaseCand(n, better) and
+        better != t and
+        not t.getASupertype+() = better
+      |
+        better.getASupertype+() = t or
+        getASourceSupertype+(getErasure(better)) = te
+      )
+    )
+  }
+
+  private module TypeFlowPropagation implements TypePropagation {
+    class Typ = Type;
+
+    predicate candType = typeFlow/2;
+
+    bindingset[t]
+    predicate supportsType(TypeFlowNode mid, Type t) {
+      exists(Type midtyp | exactType(mid, midtyp) or typeFlow(mid, midtyp) |
+        getAnAncestor(pragma[only_bind_out](midtyp)) = t
+      )
+    }
+  }
+
+  /**
+   * Holds if the runtime type of `n` is bounded by `t` and if this bound is
+   * likely to be better than the static type of `n`.
+   */
+  private predicate typeFlow(TypeFlowNode n, Type t) {
+    typeFlowBase(n, t)
+    or
+    exists(TypeFlowNode mid | typeFlow(mid, t) and step(mid, n))
+    or
+    ForAll<TypeFlowNode, RankedJoinStep, TypeFlowPropagation>::flowJoin(n, t)
+    or
+    exists(TypeFlowScc scc |
+      sccRepr(n, scc) and
+      ForAll<TypeFlowScc, RankedSccJoinStep, TypeFlowPropagation>::flowJoin(scc, t)
+    )
+  }
+
+  pragma[nomagic]
+  private predicate erasedTypeBound(Type t) {
+    exists(Type t0 | typeFlow(_, t0) and t = getErasure(t0))
+  }
+
+  pragma[nomagic]
+  private predicate typeBound(Type t) { typeFlow(_, t) }
+
+  /**
+   * Gets a direct or indirect supertype of this type.
+   * This does not include itself, unless this type is part of a cycle
+   * in the type hierarchy.
+   */
+  Type getAStrictAncestor(Type sub) { result = getAnAncestor(sub.getASupertype()) }
+
+  /**
+   * Holds if we have a bound for `n` that is better than `t`.
+   */
+  pragma[nomagic]
+  private predicate irrelevantBound(TypeFlowNode n, Type t) {
+    exists(Type bound |
+      typeFlow(n, bound) and
+      t = getAStrictAncestor(bound) and
+      typeBound(t) and
+      typeFlow(n, pragma[only_bind_into](t)) and
+      not getAnAncestor(t) = bound
+      or
+      n.getType() = pragma[only_bind_into](bound) and
+      typeFlow(n, t) and
+      t = getAnAncestor(bound)
+    )
+  }
+
+  /**
+   * Holds if we have a bound for `n` that is better than `t`, taking only erased
+   * types into account.
+   */
+  pragma[nomagic]
+  private predicate irrelevantErasedBound(TypeFlowNode n, Type t) {
+    exists(Type bound |
+      typeFlow(n, bound)
+      or
+      n.getType() = bound and typeFlow(n, _)
+    |
+      t = getASourceSupertype+(getErasure(bound)) and
+      erasedTypeBound(t)
+    )
+  }
+
+  /**
+   * Holds if the runtime type of `n` is bounded by `t`, if this bound is likely
+   * to be better than the static type of `n`, and if this the best such bound.
+   */
+  private predicate bestTypeFlow(TypeFlowNode n, Type t) {
+    typeFlow(n, t) and
+    not irrelevantErasedBound(n, getErasure(t)) and
+    not irrelevantBound(n, t)
+  }
+
+  predicate bestTypeFlow(TypeFlowNode n, Type t, boolean exact) {
+    exactType(n, t) and exact = true
+    or
+    not exactType(n, _) and bestTypeFlow(n, t) and exact = false
+  }
+
+  private predicate bestTypeFlowOrTypeFlowBase(TypeFlowNode n, Type t, boolean exact) {
+    bestTypeFlow(n, t, exact)
+    or
+    typeFlowBase(n, t) and
+    exact = false and
+    not bestTypeFlow(n, _, _)
+  }
+
+  /**
+   * Holds if `n` has type `t` and this information is not propagated as a
+   * universal bound to a subsequent node, such that `t` might form the basis for
+   * a union type bound for that node.
+   */
+  private predicate unionTypeFlowBaseCand(TypeFlowNode n, Type t, boolean exact) {
+    exists(TypeFlowNode next |
+      joinStep(n, next) and
+      bestTypeFlowOrTypeFlowBase(n, t, exact) and
+      not bestTypeFlowOrTypeFlowBase(next, t, exact) and
+      not exactType(next, _)
+    )
+  }
+
+  private module HasUnionTypePropagation implements TypePropagation {
+    class Typ = Unit;
+
+    predicate candType(TypeFlowNode mid, Unit unit) {
+      exists(unit) and
+      (unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))
+    }
+
+    predicate supportsType = candType/2;
+  }
+
+  /**
+   * Holds if all incoming type flow can be traced back to a
+   * `unionTypeFlowBaseCand`, such that we can compute a union type bound for `n`.
+   * Disregards nodes for which we have an exact bound.
+   */
+  private predicate hasUnionTypeFlow(TypeFlowNode n) {
+    not exactType(n, _) and
+    (
+      // Optimized version of
+      // `forex(TypeFlowNode mid | joinStep(mid, n) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
+      ForAll<TypeFlowNode, RankedJoinStep, HasUnionTypePropagation>::flowJoin(n, _)
+      or
+      exists(TypeFlowScc scc |
+        sccRepr(n, scc) and
+        // Optimized version of
+        // `forex(TypeFlowNode mid | sccJoinStep(mid, scc) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
+        ForAll<TypeFlowScc, RankedSccJoinStep, HasUnionTypePropagation>::flowJoin(scc, _)
+      )
+      or
+      exists(TypeFlowNode mid | step(mid, n) and hasUnionTypeFlow(mid))
+      or
+      instanceofDisjunctionGuarded(n, _)
+    )
+  }
+
+  pragma[nomagic]
+  private Type getTypeBound(TypeFlowNode n) {
+    bestTypeFlow(n, result)
+    or
+    not bestTypeFlow(n, _) and result = n.getType()
+  }
+
+  pragma[nomagic]
+  private predicate unionTypeFlow0(TypeFlowNode n, Type t, boolean exact) {
+    hasUnionTypeFlow(n) and
+    (
+      exists(TypeFlowNode mid | anyStep(mid, n) |
+        unionTypeFlowBaseCand(mid, t, exact) or unionTypeFlow(mid, t, exact)
+      )
+      or
+      instanceofDisjunctionGuarded(n, t) and exact = false
+    )
+  }
+
+  /**
+   * Holds if there is a common (reflexive, transitive) subtype of the erased
+   * types `t1` and `t2`.
+   */
+  private predicate erasedHaveIntersection(Type t1, Type t2) {
+    exists(Type commonSub | commonSub = getSourceDeclaration(commonSub) |
+      getASourceSupertype*(commonSub) = t1 and
+      getASourceSupertype*(commonSub) = t2
+    ) and
+    t1 = getErasure(_) and
+    t2 = getErasure(_)
+  }
+
+  /** Holds if we have a union type bound for `n` and `t` is one of its parts. */
+  private predicate unionTypeFlow(TypeFlowNode n, Type t, boolean exact) {
+    unionTypeFlow0(n, t, exact) and
+    // filter impossible union parts:
+    exists(Type tErased, Type boundErased |
+      pragma[only_bind_into](tErased) = getErasure(t) and
+      pragma[only_bind_into](boundErased) = getErasure(getTypeBound(n))
+    |
+      if exact = true
+      then getASourceSupertype*(tErased) = boundErased
+      else erasedHaveIntersection(tErased, boundErased)
+    )
+  }
+
+  /**
+   * Holds if the inferred union type bound for `n` contains the best universal
+   * bound and thus is irrelevant.
+   */
+  private predicate irrelevantUnionType(TypeFlowNode n) {
+    exists(Type t, Type nt, Type te, Type nte |
+      unionTypeFlow(n, t, false) and
+      nt = getTypeBound(n) and
+      te = getErasure(t) and
+      nte = getErasure(nt)
+    |
+      nt.getASupertype*() = t
+      or
+      getASourceSupertype+(nte) = te
+      or
+      nte = te and unbound(t)
+    )
+  }
+
+  /**
+   * Holds if `t` is an irrelevant part of the union type bound for `n` due to
+   * being contained in another part of the union type bound.
+   */
+  private predicate irrelevantUnionTypePart(TypeFlowNode n, Type t, boolean exact) {
+    unionTypeFlow(n, t, exact) and
+    not irrelevantUnionType(n) and
+    exists(Type weaker |
+      unionTypeFlow(n, weaker, false) and
+      t.getASupertype*() = weaker
+    |
+      exact = true or not weaker.getASupertype*() = t
+    )
+  }
+
+  /**
+   * Holds if the runtime type of `n` is bounded by a union type and if this
+   * bound is likely to be better than the static type of `n`. The union type is
+   * made up of the types `t` related to `n` by this predicate, and the flag
+   * `exact` indicates whether `t` is an exact bound or merely an upper bound.
+   */
+  predicate bestUnionType(TypeFlowNode n, Type t, boolean exact) {
+    unionTypeFlow(n, t, exact) and
+    not irrelevantUnionType(n) and
+    not irrelevantUnionTypePart(n, t, exact)
+  }
+}
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
new file mode 100644
index 00000000000..6bc23bcd4fc
--- /dev/null
+++ b/shared/typeflow/qlpack.yml
@@ -0,0 +1,7 @@
+name: codeql/typeflow
+version: 0.0.1-dev
+groups: shared
+library: true
+dependencies:
+  codeql/util: ${workspace}
+warnOnImplicitThis: true
\ No newline at end of file

From 1d4c889ab87d4a1094b1c912e4e865d6805e089d Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 26 Feb 2024 12:40:56 +0000
Subject: [PATCH 002/136] Java: Use the shared type-flow library.

---
 java/ql/lib/qlpack.yml                        |    1 +
 .../semmle/code/java/dataflow/TypeFlow.qll    | 1003 +++++------------
 2 files changed, 307 insertions(+), 697 deletions(-)

diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 15b4982d41e..82701ce6066 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -13,6 +13,7 @@ dependencies:
   codeql/threat-models: ${workspace}
   codeql/tutorial: ${workspace}
   codeql/typetracking: ${workspace}
+  codeql/typeflow: ${workspace}
   codeql/util: ${workspace}
 dataExtensions:
   - ext/*.model.yml
diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index ea0df55d60f..9a29809f15c 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -8,747 +8,356 @@
  * explicit or implicit cast that lost type information.
  */
 
-import java
+import java as J
 private import semmle.code.java.dispatch.VirtualDispatch
 private import semmle.code.java.dataflow.internal.BaseSSA
 private import semmle.code.java.controlflow.Guards
+private import codeql.typeflow.TypeFlow
 
-private newtype TTypeFlowNode =
-  TField(Field f) { not f.getType() instanceof PrimitiveType } or
-  TSsa(BaseSsaVariable ssa) { not ssa.getSourceVariable().getType() instanceof PrimitiveType } or
-  TExpr(Expr e) or
-  TMethod(Method m) { not m.getReturnType() instanceof PrimitiveType }
+private module Input implements TypeFlowInput {
+  private newtype TTypeFlowNode =
+    TField(Field f) { not f.getType() instanceof PrimitiveType } or
+    TSsa(BaseSsaVariable ssa) { not ssa.getSourceVariable().getType() instanceof PrimitiveType } or
+    TExpr(Expr e) or
+    TMethod(Method m) { not m.getReturnType() instanceof PrimitiveType }
 
-/**
- * A `Field`, `BaseSsaVariable`, `Expr`, or `Method`.
- */
-private class TypeFlowNode extends TTypeFlowNode {
-  string toString() {
-    result = this.asField().toString() or
-    result = this.asSsa().toString() or
-    result = this.asExpr().toString() or
-    result = this.asMethod().toString()
-  }
-
-  Location getLocation() {
-    result = this.asField().getLocation() or
-    result = this.asSsa().getLocation() or
-    result = this.asExpr().getLocation() or
-    result = this.asMethod().getLocation()
-  }
-
-  Field asField() { this = TField(result) }
-
-  BaseSsaVariable asSsa() { this = TSsa(result) }
-
-  Expr asExpr() { this = TExpr(result) }
-
-  Method asMethod() { this = TMethod(result) }
-
-  RefType getType() {
-    result = this.asField().getType() or
-    result = this.asSsa().getSourceVariable().getType() or
-    result = boxIfNeeded(this.asExpr().getType()) or
-    result = this.asMethod().getReturnType()
-  }
-}
-
-/** Gets `t` if it is a `RefType` or the boxed type if `t` is a primitive type. */
-private RefType boxIfNeeded(Type t) {
-  t.(PrimitiveType).getBoxedType() = result or
-  result = t
-}
-
-/**
- * Holds if `arg` is an argument for the parameter `p` in a private callable.
- */
-private predicate privateParamArg(Parameter p, Argument arg) {
-  p.getAnArgument() = arg and
-  p.getCallable().isPrivate()
-}
-
-/**
- * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
- * necessarily functionally determined by `n2`.
- */
-private predicate joinStep0(TypeFlowNode n1, TypeFlowNode n2) {
-  n2.asExpr().(ChooseExpr).getAResultExpr() = n1.asExpr()
-  or
-  exists(Field f, Expr e |
-    f = n2.asField() and
-    f.getAnAssignedValue() = e and
-    e = n1.asExpr() and
-    not e.(FieldAccess).getField() = f
-  )
-  or
-  n2.asSsa().(BaseSsaPhiNode).getAnUltimateLocalDefinition() = n1.asSsa()
-  or
-  exists(ReturnStmt ret |
-    n2.asMethod() = ret.getEnclosingCallable() and ret.getResult() = n1.asExpr()
-  )
-  or
-  viableImpl_v1(n2.asExpr()) = n1.asMethod()
-  or
-  exists(Argument arg, Parameter p |
-    privateParamArg(p, arg) and
-    n1.asExpr() = arg and
-    n2.asSsa().(BaseSsaImplicitInit).isParameterDefinition(p) and
-    // skip trivial recursion
-    not arg = n2.asSsa().getAUse()
-  )
-}
-
-/**
- * Holds if data can flow from `n1` to `n2` in one step, and `n1` is
- * functionally determined by `n2`.
- */
-private predicate step(TypeFlowNode n1, TypeFlowNode n2) {
-  n2.asExpr() = n1.asField().getAnAccess()
-  or
-  n2.asExpr() = n1.asSsa().getAUse()
-  or
-  n2.asExpr().(CastingExpr).getExpr() = n1.asExpr() and
-  not n2.asExpr().getType() instanceof PrimitiveType
-  or
-  n2.asExpr().(AssignExpr).getSource() = n1.asExpr() and
-  not n2.asExpr().getType() instanceof PrimitiveType
-  or
-  n2.asSsa().(BaseSsaUpdate).getDefiningExpr().(VariableAssign).getSource() = n1.asExpr()
-  or
-  n2.asSsa().(BaseSsaImplicitInit).captures(n1.asSsa())
-}
-
-/**
- * Holds if `null` is the only value that flows to `n`.
- */
-private predicate isNull(TypeFlowNode n) {
-  n.asExpr() instanceof NullLiteral
-  or
-  exists(LocalVariableDeclExpr decl |
-    n.asSsa().(BaseSsaUpdate).getDefiningExpr() = decl and
-    not decl.hasImplicitInit() and
-    not exists(decl.getInit())
-  )
-  or
-  exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
-  or
-  forex(TypeFlowNode mid | joinStep0(mid, n) | isNull(mid)) and
-  // Fields that are never assigned a non-null value are probably set by
-  // reflection and are thus not always null.
-  not exists(n.asField())
-}
-
-/**
- * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
- * functionally determined by `n2`, and `n1` might take a non-null value.
- */
-private predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
-  joinStep0(n1, n2) and not isNull(n1)
-}
-
-private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep(n1, n2) or step(n1, n2) }
-
-private predicate sccEdge(TypeFlowNode n1, TypeFlowNode n2) { anyStep(n1, n2) and anyStep+(n2, n1) }
-
-private module Scc = QlBuiltins::EquivalenceRelation<TypeFlowNode, sccEdge/2>;
-
-private class TypeFlowScc = Scc::EquivalenceClass;
-
-/** Holds if `n` is part of an SCC of size 2 or more represented by `scc`. */
-private predicate sccRepr(TypeFlowNode n, TypeFlowScc scc) { scc = Scc::getEquivalenceClass(n) }
-
-private predicate sccJoinStep(TypeFlowNode n, TypeFlowScc scc) {
-  exists(TypeFlowNode mid |
-    joinStep(n, mid) and
-    sccRepr(mid, scc) and
-    not sccRepr(n, scc)
-  )
-}
-
-private signature class NodeSig;
-
-private signature module Edge {
-  class Node;
-
-  predicate edge(TypeFlowNode n1, Node n2);
-}
-
-private signature module RankedEdge<NodeSig Node> {
-  predicate edgeRank(int r, TypeFlowNode n1, Node n2);
-
-  int lastRank(Node n);
-}
-
-private module RankEdge<Edge E> implements RankedEdge<E::Node> {
-  private import E
-
-  /**
-   * Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. The used
-   * ordering is not necessarily total, so the ranking may have gaps.
-   */
-  private predicate edgeRank1(int r, TypeFlowNode n1, Node n2) {
-    n1 =
-      rank[r](TypeFlowNode n |
-        edge(n, n2)
-      |
-        n order by n.getLocation().getStartLine(), n.getLocation().getStartColumn()
-      )
+  /** Gets `t` if it is a `RefType` or the boxed type if `t` is a primitive type. */
+  private RefType boxIfNeeded(J::Type t) {
+    t.(J::PrimitiveType).getBoxedType() = result or
+    result = t
   }
 
   /**
-   * Holds if `r2` is a ranking of the ranks from `edgeRank1`. This removes the
-   * gaps from the ranking.
+   * A `Field`, `BaseSsaVariable`, `Expr`, or `Method`.
    */
-  private predicate edgeRank2(int r2, int r1, Node n) {
-    r1 = rank[r2](int r | edgeRank1(r, _, n) | r)
+  class TypeFlowNode extends TTypeFlowNode {
+    string toString() {
+      result = this.asField().toString() or
+      result = this.asSsa().toString() or
+      result = this.asExpr().toString() or
+      result = this.asMethod().toString()
+    }
+
+    predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+    }
+
+    Location getLocation() {
+      result = this.asField().getLocation() or
+      result = this.asSsa().getLocation() or
+      result = this.asExpr().getLocation() or
+      result = this.asMethod().getLocation()
+    }
+
+    Field asField() { this = TField(result) }
+
+    BaseSsaVariable asSsa() { this = TSsa(result) }
+
+    Expr asExpr() { this = TExpr(result) }
+
+    Method asMethod() { this = TMethod(result) }
+
+    RefType getType() {
+      result = this.asField().getType() or
+      result = this.asSsa().getSourceVariable().getType() or
+      result = boxIfNeeded(this.asExpr().getType()) or
+      result = this.asMethod().getReturnType()
+    }
   }
 
-  /** Holds if `r` is a ranking of the incoming edges `(n1,n2)` to `n2`. */
-  predicate edgeRank(int r, TypeFlowNode n1, Node n2) {
-    exists(int r1 |
-      edgeRank1(r1, n1, n2) and
-      edgeRank2(r, r1, n2)
+  class Type = J::RefType;
+
+  /**
+   * Holds if `arg` is an argument for the parameter `p` in a private callable.
+   */
+  private predicate privateParamArg(Parameter p, Argument arg) {
+    p.getAnArgument() = arg and
+    p.getCallable().isPrivate()
+  }
+
+  /**
+   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
+   * necessarily functionally determined by `n2`.
+   */
+  predicate joinStep0(TypeFlowNode n1, TypeFlowNode n2) {
+    n2.asExpr().(ChooseExpr).getAResultExpr() = n1.asExpr()
+    or
+    exists(Field f, Expr e |
+      f = n2.asField() and
+      f.getAnAssignedValue() = e and
+      e = n1.asExpr() and
+      not e.(FieldAccess).getField() = f
+    )
+    or
+    n2.asSsa().(BaseSsaPhiNode).getAnUltimateLocalDefinition() = n1.asSsa()
+    or
+    exists(ReturnStmt ret |
+      n2.asMethod() = ret.getEnclosingCallable() and ret.getResult() = n1.asExpr()
+    )
+    or
+    viableImpl_v1(n2.asExpr()) = n1.asMethod()
+    or
+    exists(Argument arg, Parameter p |
+      privateParamArg(p, arg) and
+      n1.asExpr() = arg and
+      n2.asSsa().(BaseSsaImplicitInit).isParameterDefinition(p) and
+      // skip trivial recursion
+      not arg = n2.asSsa().getAUse()
     )
   }
 
-  int lastRank(Node n) { result = max(int r | edgeRank(r, _, n)) }
-}
-
-private signature module TypePropagation {
-  class Typ;
-
-  predicate candType(TypeFlowNode n, Typ t);
-
-  bindingset[t]
-  predicate supportsType(TypeFlowNode n, Typ t);
-}
-
-/** Implements recursion through `forall` by way of edge ranking. */
-private module ForAll<NodeSig Node, RankedEdge<Node> E, TypePropagation T> {
   /**
-   * Holds if `t` is a bound that holds on one of the incoming edges to `n` and
-   * thus is a candidate bound for `n`.
+   * Holds if data can flow from `n1` to `n2` in one step, and `n1` is
+   * functionally determined by `n2`.
+   */
+  predicate step(TypeFlowNode n1, TypeFlowNode n2) {
+    n2.asExpr() = n1.asField().getAnAccess()
+    or
+    n2.asExpr() = n1.asSsa().getAUse()
+    or
+    n2.asExpr().(CastingExpr).getExpr() = n1.asExpr() and
+    not n2.asExpr().getType() instanceof PrimitiveType
+    or
+    n2.asExpr().(AssignExpr).getSource() = n1.asExpr() and
+    not n2.asExpr().getType() instanceof PrimitiveType
+    or
+    n2.asSsa().(BaseSsaUpdate).getDefiningExpr().(VariableAssign).getSource() = n1.asExpr()
+    or
+    n2.asSsa().(BaseSsaImplicitInit).captures(n1.asSsa())
+  }
+
+  /**
+   * Holds if `null` is the only value that flows to `n`.
+   */
+  predicate isNull(TypeFlowNode n) {
+    n.asExpr() instanceof NullLiteral
+    or
+    exists(LocalVariableDeclExpr decl |
+      n.asSsa().(BaseSsaUpdate).getDefiningExpr() = decl and
+      not decl.hasImplicitInit() and
+      not exists(decl.getInit())
+    )
+    or
+    exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
+    or
+    forex(TypeFlowNode mid | joinStep0(mid, n) | isNull(mid)) and
+    // Fields that are never assigned a non-null value are probably set by
+    // reflection and are thus not always null.
+    not exists(n.asField())
+  }
+
+  predicate exactTypeBase(TypeFlowNode n, RefType t) {
+    exists(J::ClassInstanceExpr e |
+      n.asExpr() = e and
+      e.getType() = t and
+      not e instanceof FunctionalExpr and
+      exists(SrcRefType sub | sub.getASourceSupertype() = t.getSourceDeclaration())
+    )
+  }
+
+  /**
+   * Holds if `n` occurs in a position where type information might be discarded;
+   * `t1` is the type of `n`, `t1e` is the erasure of `t1`, `t2` is the type of
+   * the implicit or explicit cast, and `t2e` is the erasure of `t2`.
    */
   pragma[nomagic]
-  private predicate candJoinType(Node n, T::Typ t) {
-    exists(TypeFlowNode mid |
-      T::candType(mid, t) and
-      E::edgeRank(_, mid, n)
+  private predicate upcastCand(TypeFlowNode n, RefType t1, RefType t1e, RefType t2, RefType t2e) {
+    exists(TypeFlowNode next | step(n, next) or Make<Input>::joinStep(n, next) |
+      n.getType() = t1 and
+      next.getType() = t2 and
+      t1.getErasure() = t1e and
+      t2.getErasure() = t2e and
+      t1 != t2
     )
   }
 
-  /**
-   * Holds if `t` is a candidate bound for `n` that is also valid for data coming
-   * through the edges into `n` ranked from `1` to `r`.
-   */
-  private predicate flowJoin(int r, Node n, T::Typ t) {
-    (
-      r = 1 and candJoinType(n, t)
+  /** Holds if `n` occurs in a position where type information is discarded. */
+  private predicate upcast(TypeFlowNode n, RefType t1) {
+    exists(RefType t1e, RefType t2, RefType t2e | upcastCand(n, t1, t1e, t2, t2e) |
+      t1e.getASourceSupertype+() = t2e
       or
-      flowJoin(r - 1, n, t) and E::edgeRank(r, _, n)
-    ) and
-    forall(TypeFlowNode mid | E::edgeRank(r, mid, n) | T::supportsType(mid, t))
+      t1e = t2e and
+      unbound(t2) and
+      not unbound(t1)
+    )
+  }
+
+  /** Gets the element type of an array or subtype of `Iterable`. */
+  private J::Type elementType(RefType t) {
+    result = t.(Array).getComponentType()
+    or
+    exists(ParameterizedType it |
+      it.getSourceDeclaration().hasQualifiedName("java.lang", "Iterable") and
+      result = it.getATypeArgument() and
+      t.extendsOrImplements*(it)
+    )
+  }
+
+  private predicate upcastEnhancedForStmtAux(BaseSsaUpdate v, RefType t, RefType t1, RefType t2) {
+    exists(EnhancedForStmt for |
+      for.getVariable() = v.getDefiningExpr() and
+      v.getSourceVariable().getType().getErasure() = t2 and
+      t = boxIfNeeded(elementType(for.getExpr().getType())) and
+      t.getErasure() = t1
+    )
   }
 
   /**
-   * Holds if `t` is a candidate bound for `n` that is also valid for data
-   * coming through all the incoming edges, and therefore is a valid bound for
-   * `n`.
+   * Holds if `v` is the iteration variable of an enhanced for statement, `t` is
+   * the type of the elements being iterated over, and this type is more precise
+   * than the type of `v`.
    */
-  predicate flowJoin(Node n, T::Typ t) { flowJoin(E::lastRank(n), n, t) }
-}
+  private predicate upcastEnhancedForStmt(BaseSsaUpdate v, RefType t) {
+    exists(RefType t1, RefType t2 |
+      upcastEnhancedForStmtAux(v, t, t1, t2) and
+      t1.getASourceSupertype+() = t2
+    )
+  }
 
-private module JoinStep implements Edge {
-  class Node = TypeFlowNode;
+  private predicate downcastSuccessorAux(
+    CastingExpr cast, BaseSsaVariable v, RefType t, RefType t1, RefType t2
+  ) {
+    cast.getExpr() = v.getAUse() and
+    t = cast.getType() and
+    t1 = t.getErasure() and
+    t2 = v.getSourceVariable().getType().getErasure()
+  }
 
-  predicate edge = joinStep/2;
-}
+  /**
+   * Holds if `va` is an access to a value that has previously been downcast to `t`.
+   */
+  private predicate downcastSuccessor(VarAccess va, RefType t) {
+    exists(CastingExpr cast, BaseSsaVariable v, RefType t1, RefType t2 |
+      downcastSuccessorAux(pragma[only_bind_into](cast), v, t, t1, t2) and
+      t1.getASourceSupertype+() = t2 and
+      va = v.getAUse() and
+      dominates(cast, va) and
+      dominates(cast.(ControlFlowNode).getANormalSuccessor(), va)
+    )
+  }
 
-private module SccJoinStep implements Edge {
-  class Node = TypeFlowScc;
+  /**
+   * Holds if `va` is an access to a value that is guarded by `instanceof t` or `case e t`.
+   */
+  private predicate typeTestGuarded(VarAccess va, RefType t) {
+    exists(Guard typeTest, BaseSsaVariable v |
+      typeTest.appliesTypeTest(v.getAUse(), t, _) and
+      va = v.getAUse() and
+      guardControls_v1(typeTest, va.getBasicBlock(), true)
+    )
+  }
 
-  predicate edge = sccJoinStep/2;
-}
+  /**
+   * Holds if `aa` is an access to a value that is guarded by `instanceof t` or `case e t`.
+   */
+  private predicate arrayTypeTestGuarded(ArrayAccess aa, RefType t) {
+    exists(Guard typeTest, BaseSsaVariable v1, BaseSsaVariable v2, ArrayAccess aa1 |
+      typeTest.appliesTypeTest(aa1, t, _) and
+      aa1.getArray() = v1.getAUse() and
+      aa1.getIndexExpr() = v2.getAUse() and
+      aa.getArray() = v1.getAUse() and
+      aa.getIndexExpr() = v2.getAUse() and
+      guardControls_v1(typeTest, aa.getBasicBlock(), true)
+    )
+  }
 
-private module RankedJoinStep = RankEdge<JoinStep>;
-
-private module RankedSccJoinStep = RankEdge<SccJoinStep>;
-
-private predicate exactTypeBase(TypeFlowNode n, RefType t) {
-  exists(ClassInstanceExpr e |
-    n.asExpr() = e and
-    e.getType() = t and
-    not e instanceof FunctionalExpr and
-    exists(SrcRefType sub | sub.getASourceSupertype() = t.getSourceDeclaration())
-  )
-}
-
-private module ExactTypePropagation implements TypePropagation {
-  class Typ = RefType;
-
-  predicate candType = exactType/2;
-
-  predicate supportsType = exactType/2;
-}
-
-/**
- * Holds if the runtime type of `n` is exactly `t` and if this bound is a
- * non-trivial lower bound, that is, `t` has a subtype.
- */
-private predicate exactType(TypeFlowNode n, RefType t) {
-  exactTypeBase(n, t)
-  or
-  exists(TypeFlowNode mid | exactType(mid, t) and step(mid, n))
-  or
-  // The following is an optimized version of
-  // `forex(TypeFlowNode mid | joinStep(mid, n) | exactType(mid, t))`
-  ForAll<TypeFlowNode, RankedJoinStep, ExactTypePropagation>::flowJoin(n, t)
-  or
-  exists(TypeFlowScc scc |
-    sccRepr(n, scc) and
-    // Optimized version of
-    // `forex(TypeFlowNode mid | sccJoinStep(mid, scc) | exactType(mid, t))`
-    ForAll<TypeFlowScc, RankedSccJoinStep, ExactTypePropagation>::flowJoin(scc, t)
-  )
-}
-
-/**
- * Holds if `n` occurs in a position where type information might be discarded;
- * `t1` is the type of `n`, `t1e` is the erasure of `t1`, `t2` is the type of
- * the implicit or explicit cast, and `t2e` is the erasure of `t2`.
- */
-pragma[nomagic]
-private predicate upcastCand(TypeFlowNode n, RefType t1, RefType t1e, RefType t2, RefType t2e) {
-  exists(TypeFlowNode next | step(n, next) or joinStep(n, next) |
-    n.getType() = t1 and
-    next.getType() = t2 and
-    t1.getErasure() = t1e and
-    t2.getErasure() = t2e and
-    t1 != t2
-  )
-}
-
-private predicate unconstrained(BoundedType t) {
-  t.(Wildcard).isUnconstrained()
-  or
-  t.getUpperBoundType() instanceof TypeObject and
-  not t.(Wildcard).hasLowerBound()
-  or
-  unconstrained(t.getUpperBoundType())
-  or
-  unconstrained(t.(Wildcard).getLowerBoundType())
-}
-
-/** Holds if `t` is a raw type or parameterised type with unrestricted type arguments. */
-private predicate unbound(RefType t) {
-  t instanceof RawType
-  or
-  exists(ParameterizedType pt | pt = t |
-    forex(RefType arg | arg = pt.getATypeArgument() | unconstrained(arg))
-  )
-}
-
-/** Holds if `n` occurs in a position where type information is discarded. */
-private predicate upcast(TypeFlowNode n, RefType t1) {
-  exists(RefType t1e, RefType t2, RefType t2e | upcastCand(n, t1, t1e, t2, t2e) |
-    t1e.getASourceSupertype+() = t2e
+  /**
+   * Holds if `t` is the type of the `this` value corresponding to the the
+   * `SuperAccess`. As the `SuperAccess` expression has the type of the supertype,
+   * the type `t` is a stronger type bound.
+   */
+  private predicate superAccess(SuperAccess sup, RefType t) {
+    sup.isEnclosingInstanceAccess(t)
     or
-    t1e = t2e and
-    unbound(t2) and
-    not unbound(t1)
-  )
-}
+    sup.isOwnInstanceAccess() and
+    t = sup.getEnclosingCallable().getDeclaringType()
+  }
 
-/** Gets the element type of an array or subtype of `Iterable`. */
-private Type elementType(RefType t) {
-  result = t.(Array).getComponentType()
-  or
-  exists(ParameterizedType it |
-    it.getSourceDeclaration().hasQualifiedName("java.lang", "Iterable") and
-    result = it.getATypeArgument() and
-    t.extendsOrImplements*(it)
-  )
-}
-
-private predicate upcastEnhancedForStmtAux(BaseSsaUpdate v, RefType t, RefType t1, RefType t2) {
-  exists(EnhancedForStmt for |
-    for.getVariable() = v.getDefiningExpr() and
-    v.getSourceVariable().getType().getErasure() = t2 and
-    t = boxIfNeeded(elementType(for.getExpr().getType())) and
-    t.getErasure() = t1
-  )
-}
-
-/**
- * Holds if `v` is the iteration variable of an enhanced for statement, `t` is
- * the type of the elements being iterated over, and this type is more precise
- * than the type of `v`.
- */
-private predicate upcastEnhancedForStmt(BaseSsaUpdate v, RefType t) {
-  exists(RefType t1, RefType t2 |
-    upcastEnhancedForStmtAux(v, t, t1, t2) and
-    t1.getASourceSupertype+() = t2
-  )
-}
-
-private predicate downcastSuccessorAux(
-  CastingExpr cast, BaseSsaVariable v, RefType t, RefType t1, RefType t2
-) {
-  cast.getExpr() = v.getAUse() and
-  t = cast.getType() and
-  t1 = t.getErasure() and
-  t2 = v.getSourceVariable().getType().getErasure()
-}
-
-/**
- * Holds if `va` is an access to a value that has previously been downcast to `t`.
- */
-private predicate downcastSuccessor(VarAccess va, RefType t) {
-  exists(CastingExpr cast, BaseSsaVariable v, RefType t1, RefType t2 |
-    downcastSuccessorAux(pragma[only_bind_into](cast), v, t, t1, t2) and
-    t1.getASourceSupertype+() = t2 and
-    va = v.getAUse() and
-    dominates(cast, va) and
-    dominates(cast.(ControlFlowNode).getANormalSuccessor(), va)
-  )
-}
-
-/**
- * Holds if `va` is an access to a value that is guarded by `instanceof t` or `case e t`.
- */
-private predicate typeTestGuarded(VarAccess va, RefType t) {
-  exists(Guard typeTest, BaseSsaVariable v |
-    typeTest.appliesTypeTest(v.getAUse(), t, _) and
-    va = v.getAUse() and
-    guardControls_v1(typeTest, va.getBasicBlock(), true)
-  )
-}
-
-/**
- * Holds if `aa` is an access to a value that is guarded by `instanceof t` or `case e t`.
- */
-predicate arrayTypeTestGuarded(ArrayAccess aa, RefType t) {
-  exists(Guard typeTest, BaseSsaVariable v1, BaseSsaVariable v2, ArrayAccess aa1 |
-    typeTest.appliesTypeTest(aa1, t, _) and
-    aa1.getArray() = v1.getAUse() and
-    aa1.getIndexExpr() = v2.getAUse() and
-    aa.getArray() = v1.getAUse() and
-    aa.getIndexExpr() = v2.getAUse() and
-    guardControls_v1(typeTest, aa.getBasicBlock(), true)
-  )
-}
-
-/**
- * Holds if `t` is the type of the `this` value corresponding to the the
- * `SuperAccess`. As the `SuperAccess` expression has the type of the supertype,
- * the type `t` is a stronger type bound.
- */
-private predicate superAccess(SuperAccess sup, RefType t) {
-  sup.isEnclosingInstanceAccess(t)
-  or
-  sup.isOwnInstanceAccess() and
-  t = sup.getEnclosingCallable().getDeclaringType()
-}
-
-/**
- * Holds if `n` has type `t` and this information is discarded, such that `t`
- * might be a better type bound for nodes where `n` flows to. This might include
- * multiple bounds for a single node.
- */
-private predicate typeFlowBaseCand(TypeFlowNode n, RefType t) {
-  exists(RefType srctype |
-    upcast(n, srctype) or
-    upcastEnhancedForStmt(n.asSsa(), srctype) or
-    downcastSuccessor(n.asExpr(), srctype) or
-    typeTestGuarded(n.asExpr(), srctype) or
-    arrayTypeTestGuarded(n.asExpr(), srctype) or
-    n.asExpr().(FunctionalExpr).getConstructedType() = srctype or
-    superAccess(n.asExpr(), srctype)
-  |
-    t = srctype.(BoundedType).getAnUltimateUpperBoundType()
-    or
-    t = srctype and not srctype instanceof BoundedType
-  )
-}
-
-/**
- * Holds if `n` has type `t` and this information is discarded, such that `t`
- * might be a better type bound for nodes where `n` flows to. This only includes
- * the best such bound for each node.
- */
-private predicate typeFlowBase(TypeFlowNode n, RefType t) {
-  exists(RefType te |
-    typeFlowBaseCand(n, t) and
-    te = t.getErasure() and
-    not exists(RefType better |
-      typeFlowBaseCand(n, better) and
-      better != t and
-      not t.getASupertype+() = better
+  /**
+   * Holds if `n` has type `t` and this information is discarded, such that `t`
+   * might be a better type bound for nodes where `n` flows to. This might include
+   * multiple bounds for a single node.
+   */
+  predicate typeFlowBaseCand(TypeFlowNode n, RefType t) {
+    exists(RefType srctype |
+      upcast(n, srctype) or
+      upcastEnhancedForStmt(n.asSsa(), srctype) or
+      downcastSuccessor(n.asExpr(), srctype) or
+      typeTestGuarded(n.asExpr(), srctype) or
+      arrayTypeTestGuarded(n.asExpr(), srctype) or
+      n.asExpr().(FunctionalExpr).getConstructedType() = srctype or
+      superAccess(n.asExpr(), srctype)
     |
-      better.getASupertype+() = t or
-      better.getErasure().(RefType).getASourceSupertype+() = te
-    )
-  )
-}
-
-private module TypeFlowPropagation implements TypePropagation {
-  class Typ = RefType;
-
-  predicate candType = typeFlow/2;
-
-  bindingset[t]
-  predicate supportsType(TypeFlowNode mid, RefType t) {
-    exists(RefType midtyp | exactType(mid, midtyp) or typeFlow(mid, midtyp) |
-      pragma[only_bind_out](midtyp).getAnAncestor() = t
+      t = srctype.(BoundedType).getAnUltimateUpperBoundType()
+      or
+      t = srctype and not srctype instanceof BoundedType
     )
   }
-}
 
-/**
- * Holds if the runtime type of `n` is bounded by `t` and if this bound is
- * likely to be better than the static type of `n`.
- */
-private predicate typeFlow(TypeFlowNode n, RefType t) {
-  typeFlowBase(n, t)
-  or
-  exists(TypeFlowNode mid | typeFlow(mid, t) and step(mid, n))
-  or
-  ForAll<TypeFlowNode, RankedJoinStep, TypeFlowPropagation>::flowJoin(n, t)
-  or
-  exists(TypeFlowScc scc |
-    sccRepr(n, scc) and
-    ForAll<TypeFlowScc, RankedSccJoinStep, TypeFlowPropagation>::flowJoin(scc, t)
-  )
-}
-
-pragma[nomagic]
-private predicate erasedTypeBound(RefType t) {
-  exists(RefType t0 | typeFlow(_, t0) and t = t0.getErasure())
-}
-
-pragma[nomagic]
-private predicate typeBound(RefType t) { typeFlow(_, t) }
-
-/**
- * Holds if we have a bound for `n` that is better than `t`, taking only erased
- * types into account.
- */
-pragma[nomagic]
-private predicate irrelevantErasedBound(TypeFlowNode n, RefType t) {
-  exists(RefType bound |
-    typeFlow(n, bound)
-    or
-    n.getType() = bound and typeFlow(n, _)
-  |
-    t = bound.getErasure().(RefType).getASourceSupertype+() and
-    erasedTypeBound(t)
-  )
-}
-
-/**
- * Holds if we have a bound for `n` that is better than `t`.
- */
-pragma[nomagic]
-private predicate irrelevantBound(TypeFlowNode n, RefType t) {
-  exists(RefType bound |
-    typeFlow(n, bound) and
-    t = bound.getAStrictAncestor() and
-    typeBound(t) and
-    typeFlow(n, pragma[only_bind_into](t)) and
-    not t.getAnAncestor() = bound
-    or
-    n.getType() = pragma[only_bind_into](bound) and
-    typeFlow(n, t) and
-    t = bound.getAnAncestor()
-  )
-}
-
-/**
- * Holds if the runtime type of `n` is bounded by `t`, if this bound is likely
- * to be better than the static type of `n`, and if this the best such bound.
- */
-private predicate bestTypeFlow(TypeFlowNode n, RefType t) {
-  typeFlow(n, t) and
-  not irrelevantErasedBound(n, t.getErasure()) and
-  not irrelevantBound(n, t)
-}
-
-private predicate bestTypeFlow(TypeFlowNode n, RefType t, boolean exact) {
-  exactType(n, t) and exact = true
-  or
-  not exactType(n, _) and bestTypeFlow(n, t) and exact = false
-}
-
-private predicate bestTypeFlowOrTypeFlowBase(TypeFlowNode n, RefType t, boolean exact) {
-  bestTypeFlow(n, t, exact)
-  or
-  typeFlowBase(n, t) and
-  exact = false and
-  not bestTypeFlow(n, _, _)
-}
-
-/**
- * Holds if `n` has type `t` and this information is not propagated as a
- * universal bound to a subsequent node, such that `t` might form the basis for
- * a union type bound for that node.
- */
-private predicate unionTypeFlowBaseCand(TypeFlowNode n, RefType t, boolean exact) {
-  exists(TypeFlowNode next |
-    joinStep(n, next) and
-    bestTypeFlowOrTypeFlowBase(n, t, exact) and
-    not bestTypeFlowOrTypeFlowBase(next, t, exact) and
-    not exactType(next, _)
-  )
-}
-
-/**
- * Holds if `ioe` checks `v`, its true-successor is `bb`, and `bb` has multiple
- * predecessors.
- */
-private predicate instanceofDisjunct(InstanceOfExpr ioe, BasicBlock bb, BaseSsaVariable v) {
-  ioe.getExpr() = v.getAUse() and
-  strictcount(bb.getABBPredecessor()) > 1 and
-  exists(ConditionBlock cb | cb.getCondition() = ioe and cb.getTestSuccessor(true) = bb)
-}
-
-/** Holds if `bb` is disjunctively guarded by multiple `instanceof` tests on `v`. */
-private predicate instanceofDisjunction(BasicBlock bb, BaseSsaVariable v) {
-  strictcount(InstanceOfExpr ioe | instanceofDisjunct(ioe, bb, v)) =
-    strictcount(bb.getABBPredecessor())
-}
-
-/**
- * Holds if `n` is a value that is guarded by a disjunction of
- * `instanceof t_i` where `t` is one of those `t_i`.
- */
-private predicate instanceofDisjunctionGuarded(TypeFlowNode n, RefType t) {
-  exists(BasicBlock bb, InstanceOfExpr ioe, BaseSsaVariable v, VarAccess va |
-    instanceofDisjunction(bb, v) and
-    bb.bbDominates(va.getBasicBlock()) and
-    va = v.getAUse() and
-    instanceofDisjunct(ioe, bb, v) and
-    t = ioe.getSyntacticCheckedType() and
-    n.asExpr() = va
-  )
-}
-
-private module HasUnionTypePropagation implements TypePropagation {
-  class Typ = Unit;
-
-  predicate candType(TypeFlowNode mid, Unit unit) {
-    exists(unit) and
-    (unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))
+  /**
+   * Holds if `ioe` checks `v`, its true-successor is `bb`, and `bb` has multiple
+   * predecessors.
+   */
+  private predicate instanceofDisjunct(InstanceOfExpr ioe, BasicBlock bb, BaseSsaVariable v) {
+    ioe.getExpr() = v.getAUse() and
+    strictcount(bb.getABBPredecessor()) > 1 and
+    exists(ConditionBlock cb | cb.getCondition() = ioe and cb.getTestSuccessor(true) = bb)
   }
 
-  predicate supportsType = candType/2;
-}
+  /** Holds if `bb` is disjunctively guarded by multiple `instanceof` tests on `v`. */
+  private predicate instanceofDisjunction(BasicBlock bb, BaseSsaVariable v) {
+    strictcount(InstanceOfExpr ioe | instanceofDisjunct(ioe, bb, v)) =
+      strictcount(bb.getABBPredecessor())
+  }
 
-/**
- * Holds if all incoming type flow can be traced back to a
- * `unionTypeFlowBaseCand`, such that we can compute a union type bound for `n`.
- * Disregards nodes for which we have an exact bound.
- */
-private predicate hasUnionTypeFlow(TypeFlowNode n) {
-  not exactType(n, _) and
-  (
-    // Optimized version of
-    // `forex(TypeFlowNode mid | joinStep(mid, n) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
-    ForAll<TypeFlowNode, RankedJoinStep, HasUnionTypePropagation>::flowJoin(n, _)
-    or
-    exists(TypeFlowScc scc |
-      sccRepr(n, scc) and
-      // Optimized version of
-      // `forex(TypeFlowNode mid | sccJoinStep(mid, scc) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
-      ForAll<TypeFlowScc, RankedSccJoinStep, HasUnionTypePropagation>::flowJoin(scc, _)
+  /**
+   * Holds if `n` is a value that is guarded by a disjunction of
+   * `instanceof t_i` where `t` is one of those `t_i`.
+   */
+  predicate instanceofDisjunctionGuarded(TypeFlowNode n, RefType t) {
+    exists(BasicBlock bb, InstanceOfExpr ioe, BaseSsaVariable v, VarAccess va |
+      instanceofDisjunction(bb, v) and
+      bb.bbDominates(va.getBasicBlock()) and
+      va = v.getAUse() and
+      instanceofDisjunct(ioe, bb, v) and
+      t = ioe.getSyntacticCheckedType() and
+      n.asExpr() = va
     )
-    or
-    exists(TypeFlowNode mid | step(mid, n) and hasUnionTypeFlow(mid))
-    or
-    instanceofDisjunctionGuarded(n, _)
-  )
-}
+  }
 
-pragma[nomagic]
-private RefType getTypeBound(TypeFlowNode n) {
-  bestTypeFlow(n, result)
-  or
-  not bestTypeFlow(n, _) and result = n.getType()
-}
+  private predicate unconstrained(BoundedType t) {
+    t.(Wildcard).isUnconstrained()
+    or
+    t.getUpperBoundType() instanceof TypeObject and
+    not t.(Wildcard).hasLowerBound()
+    or
+    unconstrained(t.getUpperBoundType())
+    or
+    unconstrained(t.(Wildcard).getLowerBoundType())
+  }
 
-pragma[nomagic]
-private predicate unionTypeFlow0(TypeFlowNode n, RefType t, boolean exact) {
-  hasUnionTypeFlow(n) and
-  (
-    exists(TypeFlowNode mid | anyStep(mid, n) |
-      unionTypeFlowBaseCand(mid, t, exact) or unionTypeFlow(mid, t, exact)
+  /** Holds if `t` is a raw type or parameterised type with unrestricted type arguments. */
+  predicate unbound(RefType t) {
+    t instanceof RawType
+    or
+    exists(ParameterizedType pt | pt = t |
+      forex(RefType arg | arg = pt.getATypeArgument() | unconstrained(arg))
     )
-    or
-    instanceofDisjunctionGuarded(n, t) and exact = false
-  )
-}
+  }
 
-/** Holds if we have a union type bound for `n` and `t` is one of its parts. */
-private predicate unionTypeFlow(TypeFlowNode n, RefType t, boolean exact) {
-  unionTypeFlow0(n, t, exact) and
-  // filter impossible union parts:
-  exists(RefType tErased, RefType boundErased |
-    pragma[only_bind_into](tErased) = t.getErasure() and
-    pragma[only_bind_into](boundErased) = getTypeBound(n).getErasure()
-  |
-    if exact = true
-    then tErased.getASourceSupertype*() = boundErased
-    else erasedHaveIntersection(tErased, boundErased)
-  )
-}
+  Type getErasure(Type t) { result = t.getErasure() }
 
-/**
- * Holds if the inferred union type bound for `n` contains the best universal
- * bound and thus is irrelevant.
- */
-private predicate irrelevantUnionType(TypeFlowNode n) {
-  exists(RefType t, RefType nt, RefType te, RefType nte |
-    unionTypeFlow(n, t, false) and
-    nt = getTypeBound(n) and
-    te = t.getErasure() and
-    nte = nt.getErasure()
-  |
-    nt.getASupertype*() = t
-    or
-    nte.getASourceSupertype+() = te
-    or
-    nte = te and unbound(t)
-  )
-}
+  Type getAnAncestor(Type sub) { result = sub.getAnAncestor() }
 
-/**
- * Holds if `t` is an irrelevant part of the union type bound for `n` due to
- * being contained in another part of the union type bound.
- */
-private predicate irrelevantUnionTypePart(TypeFlowNode n, RefType t, boolean exact) {
-  unionTypeFlow(n, t, exact) and
-  not irrelevantUnionType(n) and
-  exists(RefType weaker |
-    unionTypeFlow(n, weaker, false) and
-    t.getASupertype*() = weaker
-  |
-    exact = true or not weaker.getASupertype*() = t
-  )
-}
-
-/**
- * Holds if the runtime type of `n` is bounded by a union type and if this
- * bound is likely to be better than the static type of `n`. The union type is
- * made up of the types `t` related to `n` by this predicate, and the flag
- * `exact` indicates whether `t` is an exact bound or merely an upper bound.
- */
-private predicate bestUnionType(TypeFlowNode n, RefType t, boolean exact) {
-  unionTypeFlow(n, t, exact) and
-  not irrelevantUnionType(n) and
-  not irrelevantUnionTypePart(n, t, exact)
+  RefType getSourceDeclaration(Type t) { result = t.getSourceDeclaration() }
 }
 
 cached
 private module TypeFlowBounds {
+  private module TypeFlow = Make<Input>;
+
   /**
    * Holds if the runtime type of `f` is bounded by `t` and if this bound is
    * likely to be better than the static type of `f`. The flag `exact` indicates
@@ -756,9 +365,9 @@ private module TypeFlowBounds {
    */
   cached
   predicate fieldTypeFlow(Field f, RefType t, boolean exact) {
-    exists(TypeFlowNode n |
+    exists(Input::TypeFlowNode n |
       n.asField() = f and
-      bestTypeFlow(n, t, exact)
+      TypeFlow::bestTypeFlow(n, t, exact)
     )
   }
 
@@ -769,9 +378,9 @@ private module TypeFlowBounds {
    */
   cached
   predicate exprTypeFlow(Expr e, RefType t, boolean exact) {
-    exists(TypeFlowNode n |
+    exists(Input::TypeFlowNode n |
       n.asExpr() = e and
-      bestTypeFlow(n, t, exact)
+      TypeFlow::bestTypeFlow(n, t, exact)
     )
   }
 
@@ -783,9 +392,9 @@ private module TypeFlowBounds {
    */
   cached
   predicate exprUnionTypeFlow(Expr e, RefType t, boolean exact) {
-    exists(TypeFlowNode n |
+    exists(Input::TypeFlowNode n |
       n.asExpr() = e and
-      bestUnionType(n, t, exact)
+      TypeFlow::bestUnionType(n, t, exact)
     )
   }
 }

From 690fdc076d2e65b9e238589dbc15f05ad57be3cf Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 26 Feb 2024 16:21:35 +0000
Subject: [PATCH 003/136] Shared: Add change note.

---
 shared/typeflow/change-notes/2024-02-26-initial-version.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 shared/typeflow/change-notes/2024-02-26-initial-version.md

diff --git a/shared/typeflow/change-notes/2024-02-26-initial-version.md b/shared/typeflow/change-notes/2024-02-26-initial-version.md
new file mode 100644
index 00000000000..6b3dc344938
--- /dev/null
+++ b/shared/typeflow/change-notes/2024-02-26-initial-version.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Initial release. Adds a library to implement type-flow analysis.

From 2fd57f6ee771e760d54749e649ceea8f3a8716af Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 28 Feb 2024 16:24:21 +0000
Subject: [PATCH 004/136] Shared: Remove cached annotation.

---
 shared/typeflow/codeql/typeflow/TypeFlow.qll | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared/typeflow/codeql/typeflow/TypeFlow.qll b/shared/typeflow/codeql/typeflow/TypeFlow.qll
index 5df8e53a914..bdf90dab7cf 100644
--- a/shared/typeflow/codeql/typeflow/TypeFlow.qll
+++ b/shared/typeflow/codeql/typeflow/TypeFlow.qll
@@ -112,7 +112,6 @@ private import internal.TypeFlowImpl as Impl
 /**
  * Provides an implementation of type-flow using input `I`.
  */
-cached
 module Make<TypeFlowInput I> {
   import Impl::TypeFlow<I>
 }

From da8cc13506f99b310ea6505b1ee319bb9b22dde8 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Mon, 11 Mar 2024 09:57:02 +0000
Subject: [PATCH 005/136] go extractor: avoid long string concatenations

When we see "a" + "b" + "c" + "d", do not add a
row to the constvalues table for the intermiediate
strings "ab" and "abc". We still have entries for
the string literals ("a", "b", "c", and "d") and
the whole string concatenation ("abcd").
---
 go/extractor/extractor.go | 142 ++++++++++++++++++++++----------------
 1 file changed, 83 insertions(+), 59 deletions(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index f2ba68a20f0..97f3ed743fb 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -794,7 +794,7 @@ func extractLocalScope(tw *trap.Writer, scope *types.Scope, parentScopeLabel tra
 func extractFileNode(tw *trap.Writer, nd *ast.File) {
 	lbl := tw.Labeler.FileLabel()
 
-	extractExpr(tw, nd.Name, lbl, 0)
+	extractExpr(tw, nd.Name, lbl, 0, false)
 
 	for i, decl := range nd.Decls {
 		extractDecl(tw, decl, lbl, i)
@@ -851,7 +851,7 @@ func emitScopeNodeInfo(tw *trap.Writer, nd ast.Node, lbl trap.Label) {
 }
 
 // extractExpr extracts AST information for the given expression and all its subexpressions
-func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
+func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int, skipExtractingValue bool) {
 	if expr == nil {
 		return
 	}
@@ -900,7 +900,7 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.EllipsisExpr.Index()
-		extractExpr(tw, expr.Elt, lbl, 0)
+		extractExpr(tw, expr.Elt, lbl, 0, false)
 	case *ast.BasicLit:
 		if expr == nil {
 			return
@@ -932,28 +932,28 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.FuncLitExpr.Index()
-		extractExpr(tw, expr.Type, lbl, 0)
+		extractExpr(tw, expr.Type, lbl, 0, false)
 		extractStmt(tw, expr.Body, lbl, 1)
 	case *ast.CompositeLit:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.CompositeLitExpr.Index()
-		extractExpr(tw, expr.Type, lbl, 0)
+		extractExpr(tw, expr.Type, lbl, 0, false)
 		extractExprs(tw, expr.Elts, lbl, 1, 1)
 	case *ast.ParenExpr:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.ParenExpr.Index()
-		extractExpr(tw, expr.X, lbl, 0)
+		extractExpr(tw, expr.X, lbl, 0, false)
 	case *ast.SelectorExpr:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.SelectorExpr.Index()
-		extractExpr(tw, expr.X, lbl, 0)
-		extractExpr(tw, expr.Sel, lbl, 1)
+		extractExpr(tw, expr.X, lbl, 0, false)
+		extractExpr(tw, expr.Sel, lbl, 1, false)
 	case *ast.IndexExpr:
 		if expr == nil {
 			return
@@ -974,8 +974,8 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 				kind = dbscheme.IndexExpr.Index()
 			}
 		}
-		extractExpr(tw, expr.X, lbl, 0)
-		extractExpr(tw, expr.Index, lbl, 1)
+		extractExpr(tw, expr.X, lbl, 0, false)
+		extractExpr(tw, expr.Index, lbl, 1, false)
 	case *ast.IndexListExpr:
 		if expr == nil {
 			return
@@ -993,30 +993,30 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 				kind = dbscheme.GenericTypeInstantiationExpr.Index()
 			}
 		}
-		extractExpr(tw, expr.X, lbl, 0)
+		extractExpr(tw, expr.X, lbl, 0, false)
 		extractExprs(tw, expr.Indices, lbl, 1, 1)
 	case *ast.SliceExpr:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.SliceExpr.Index()
-		extractExpr(tw, expr.X, lbl, 0)
-		extractExpr(tw, expr.Low, lbl, 1)
-		extractExpr(tw, expr.High, lbl, 2)
-		extractExpr(tw, expr.Max, lbl, 3)
+		extractExpr(tw, expr.X, lbl, 0, false)
+		extractExpr(tw, expr.Low, lbl, 1, false)
+		extractExpr(tw, expr.High, lbl, 2, false)
+		extractExpr(tw, expr.Max, lbl, 3, false)
 	case *ast.TypeAssertExpr:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.TypeAssertExpr.Index()
-		extractExpr(tw, expr.X, lbl, 0)
-		extractExpr(tw, expr.Type, lbl, 1)
+		extractExpr(tw, expr.X, lbl, 0, false)
+		extractExpr(tw, expr.Type, lbl, 1, false)
 	case *ast.CallExpr:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.CallOrConversionExpr.Index()
-		extractExpr(tw, expr.Fun, lbl, 0)
+		extractExpr(tw, expr.Fun, lbl, 0, false)
 		extractExprs(tw, expr.Args, lbl, 1, 1)
 		if expr.Ellipsis.IsValid() {
 			dbscheme.HasEllipsisTable.Emit(tw, lbl)
@@ -1026,14 +1026,14 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.StarExpr.Index()
-		extractExpr(tw, expr.X, lbl, 0)
+		extractExpr(tw, expr.X, lbl, 0, false)
 	case *ast.KeyValueExpr:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.KeyValueExpr.Index()
-		extractExpr(tw, expr.Key, lbl, 0)
-		extractExpr(tw, expr.Value, lbl, 1)
+		extractExpr(tw, expr.Key, lbl, 0, false)
+		extractExpr(tw, expr.Value, lbl, 1, false)
 	case *ast.UnaryExpr:
 		if expr == nil {
 			return
@@ -1047,7 +1047,7 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 			}
 			kind = tp.Index()
 		}
-		extractExpr(tw, expr.X, lbl, 0)
+		extractExpr(tw, expr.X, lbl, 0, false)
 	case *ast.BinaryExpr:
 		if expr == nil {
 			return
@@ -1062,16 +1062,17 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 				log.Fatalf("unsupported binary operator %s", expr.Op)
 			}
 			kind = tp.Index()
-			extractExpr(tw, expr.X, lbl, 0)
-			extractExpr(tw, expr.Y, lbl, 1)
+			skipLeft := skipExtractingValueForLeftOperand(tw, expr)
+			extractExpr(tw, expr.X, lbl, 0, skipLeft)
+			extractExpr(tw, expr.Y, lbl, 1, false)
 		}
 	case *ast.ArrayType:
 		if expr == nil {
 			return
 		}
 		kind = dbscheme.ArrayTypeExpr.Index()
-		extractExpr(tw, expr.Len, lbl, 0)
-		extractExpr(tw, expr.Elt, lbl, 1)
+		extractExpr(tw, expr.Len, lbl, 0, false)
+		extractExpr(tw, expr.Elt, lbl, 1, false)
 	case *ast.StructType:
 		if expr == nil {
 			return
@@ -1100,8 +1101,8 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.MapTypeExpr.Index()
-		extractExpr(tw, expr.Key, lbl, 0)
-		extractExpr(tw, expr.Value, lbl, 1)
+		extractExpr(tw, expr.Key, lbl, 0, false)
+		extractExpr(tw, expr.Value, lbl, 1, false)
 	case *ast.ChanType:
 		if expr == nil {
 			return
@@ -1111,13 +1112,15 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 			log.Fatalf("unsupported channel direction %v", expr.Dir)
 		}
 		kind = tp.Index()
-		extractExpr(tw, expr.Value, lbl, 0)
+		extractExpr(tw, expr.Value, lbl, 0, false)
 	default:
 		log.Fatalf("unknown expression of type %T", expr)
 	}
 	dbscheme.ExprsTable.Emit(tw, lbl, kind, parent, idx)
 	extractNodeLocation(tw, expr, lbl)
-	extractValueOf(tw, expr, lbl)
+	if !skipExtractingValue {
+		extractValueOf(tw, expr, lbl)
+	}
 }
 
 // extractExprs extracts AST information for a list of expressions, which are children of
@@ -1128,7 +1131,7 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 func extractExprs(tw *trap.Writer, exprs []ast.Expr, parent trap.Label, idx int, dir int) {
 	if exprs != nil {
 		for _, expr := range exprs {
-			extractExpr(tw, expr, parent, idx)
+			extractExpr(tw, expr, parent, idx, false)
 			idx += dir
 		}
 	}
@@ -1194,11 +1197,11 @@ func extractFields(tw *trap.Writer, fields *ast.FieldList, parent trap.Label, id
 		extractNodeLocation(tw, field, lbl)
 		if field.Names != nil {
 			for i, name := range field.Names {
-				extractExpr(tw, name, lbl, i+1)
+				extractExpr(tw, name, lbl, i+1, false)
 			}
 		}
-		extractExpr(tw, field.Type, lbl, 0)
-		extractExpr(tw, field.Tag, lbl, -1)
+		extractExpr(tw, field.Type, lbl, 0, false)
+		extractExpr(tw, field.Tag, lbl, -1, false)
 		extractDoc(tw, field.Doc, lbl)
 		idx += dir
 	}
@@ -1229,21 +1232,21 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.LabeledStmtType.Index()
-		extractExpr(tw, stmt.Label, lbl, 0)
+		extractExpr(tw, stmt.Label, lbl, 0, false)
 		extractStmt(tw, stmt.Stmt, lbl, 1)
 	case *ast.ExprStmt:
 		if stmt == nil {
 			return
 		}
 		kind = dbscheme.ExprStmtType.Index()
-		extractExpr(tw, stmt.X, lbl, 0)
+		extractExpr(tw, stmt.X, lbl, 0, false)
 	case *ast.SendStmt:
 		if stmt == nil {
 			return
 		}
 		kind = dbscheme.SendStmtType.Index()
-		extractExpr(tw, stmt.Chan, lbl, 0)
-		extractExpr(tw, stmt.Value, lbl, 1)
+		extractExpr(tw, stmt.Chan, lbl, 0, false)
+		extractExpr(tw, stmt.Value, lbl, 1, false)
 	case *ast.IncDecStmt:
 		if stmt == nil {
 			return
@@ -1255,7 +1258,7 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 		} else {
 			log.Fatalf("unsupported increment/decrement operator %v", stmt.Tok)
 		}
-		extractExpr(tw, stmt.X, lbl, 0)
+		extractExpr(tw, stmt.X, lbl, 0, false)
 	case *ast.AssignStmt:
 		if stmt == nil {
 			return
@@ -1272,13 +1275,13 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.GoStmtType.Index()
-		extractExpr(tw, stmt.Call, lbl, 0)
+		extractExpr(tw, stmt.Call, lbl, 0, false)
 	case *ast.DeferStmt:
 		if stmt == nil {
 			return
 		}
 		kind = dbscheme.DeferStmtType.Index()
-		extractExpr(tw, stmt.Call, lbl, 0)
+		extractExpr(tw, stmt.Call, lbl, 0, false)
 	case *ast.ReturnStmt:
 		kind = dbscheme.ReturnStmtType.Index()
 		extractExprs(tw, stmt.Results, lbl, 0, 1)
@@ -1298,7 +1301,7 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 		default:
 			log.Fatalf("unsupported branch statement type %v", stmt.Tok)
 		}
-		extractExpr(tw, stmt.Label, lbl, 0)
+		extractExpr(tw, stmt.Label, lbl, 0, false)
 	case *ast.BlockStmt:
 		if stmt == nil {
 			return
@@ -1312,7 +1315,7 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 		}
 		kind = dbscheme.IfStmtType.Index()
 		extractStmt(tw, stmt.Init, lbl, 0)
-		extractExpr(tw, stmt.Cond, lbl, 1)
+		extractExpr(tw, stmt.Cond, lbl, 1, false)
 		extractStmt(tw, stmt.Body, lbl, 2)
 		extractStmt(tw, stmt.Else, lbl, 3)
 		emitScopeNodeInfo(tw, stmt, lbl)
@@ -1330,7 +1333,7 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 		}
 		kind = dbscheme.ExprSwitchStmtType.Index()
 		extractStmt(tw, stmt.Init, lbl, 0)
-		extractExpr(tw, stmt.Tag, lbl, 1)
+		extractExpr(tw, stmt.Tag, lbl, 1, false)
 		extractStmt(tw, stmt.Body, lbl, 2)
 		emitScopeNodeInfo(tw, stmt, lbl)
 	case *ast.TypeSwitchStmt:
@@ -1359,7 +1362,7 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 		}
 		kind = dbscheme.ForStmtType.Index()
 		extractStmt(tw, stmt.Init, lbl, 0)
-		extractExpr(tw, stmt.Cond, lbl, 1)
+		extractExpr(tw, stmt.Cond, lbl, 1, false)
 		extractStmt(tw, stmt.Post, lbl, 2)
 		extractStmt(tw, stmt.Body, lbl, 3)
 		emitScopeNodeInfo(tw, stmt, lbl)
@@ -1368,9 +1371,9 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.RangeStmtType.Index()
-		extractExpr(tw, stmt.Key, lbl, 0)
-		extractExpr(tw, stmt.Value, lbl, 1)
-		extractExpr(tw, stmt.X, lbl, 2)
+		extractExpr(tw, stmt.Key, lbl, 0, false)
+		extractExpr(tw, stmt.Value, lbl, 1, false)
+		extractExpr(tw, stmt.X, lbl, 2, false)
 		extractStmt(tw, stmt.Body, lbl, 3)
 		emitScopeNodeInfo(tw, stmt, lbl)
 	default:
@@ -1428,8 +1431,8 @@ func extractDecl(tw *trap.Writer, decl ast.Decl, parent trap.Label, idx int) {
 		}
 		kind = dbscheme.FuncDeclType.Index()
 		extractFields(tw, decl.Recv, lbl, -1, -1)
-		extractExpr(tw, decl.Name, lbl, 0)
-		extractExpr(tw, decl.Type, lbl, 1)
+		extractExpr(tw, decl.Name, lbl, 0, false)
+		extractExpr(tw, decl.Type, lbl, 1, false)
 		extractStmt(tw, decl.Body, lbl, 2)
 		extractDoc(tw, decl.Doc, lbl)
 		extractTypeParamDecls(tw, decl.Type.TypeParams, lbl)
@@ -1455,8 +1458,8 @@ func extractSpec(tw *trap.Writer, spec ast.Spec, parent trap.Label, idx int) {
 			return
 		}
 		kind = dbscheme.ImportSpecType.Index()
-		extractExpr(tw, spec.Name, lbl, 0)
-		extractExpr(tw, spec.Path, lbl, 1)
+		extractExpr(tw, spec.Name, lbl, 0, false)
+		extractExpr(tw, spec.Path, lbl, 1, false)
 		extractDoc(tw, spec.Doc, lbl)
 	case *ast.ValueSpec:
 		if spec == nil {
@@ -1464,9 +1467,9 @@ func extractSpec(tw *trap.Writer, spec ast.Spec, parent trap.Label, idx int) {
 		}
 		kind = dbscheme.ValueSpecType.Index()
 		for i, name := range spec.Names {
-			extractExpr(tw, name, lbl, -(1 + i))
+			extractExpr(tw, name, lbl, -(1 + i), false)
 		}
-		extractExpr(tw, spec.Type, lbl, 0)
+		extractExpr(tw, spec.Type, lbl, 0, false)
 		extractExprs(tw, spec.Values, lbl, 1, 1)
 		extractDoc(tw, spec.Doc, lbl)
 	case *ast.TypeSpec:
@@ -1478,9 +1481,9 @@ func extractSpec(tw *trap.Writer, spec ast.Spec, parent trap.Label, idx int) {
 		} else {
 			kind = dbscheme.TypeDefSpecType.Index()
 		}
-		extractExpr(tw, spec.Name, lbl, 0)
+		extractExpr(tw, spec.Name, lbl, 0, false)
 		extractTypeParamDecls(tw, spec.TypeParams, lbl)
-		extractExpr(tw, spec.Type, lbl, 1)
+		extractExpr(tw, spec.Type, lbl, 1, false)
 		extractDoc(tw, spec.Doc, lbl)
 	}
 	dbscheme.SpecsTable.Emit(tw, lbl, kind, parent, idx)
@@ -1909,7 +1912,7 @@ func flattenBinaryExprTree(tw *trap.Writer, e ast.Expr, parent trap.Label, idx i
 		idx = flattenBinaryExprTree(tw, binaryexpr.X, parent, idx)
 		idx = flattenBinaryExprTree(tw, binaryexpr.Y, parent, idx)
 	} else {
-		extractExpr(tw, e, parent, idx)
+		extractExpr(tw, e, parent, idx, false)
 		idx = idx + 1
 	}
 	return idx
@@ -1931,10 +1934,10 @@ func extractTypeParamDecls(tw *trap.Writer, fields *ast.FieldList, parent trap.L
 		extractNodeLocation(tw, field, lbl)
 		if field.Names != nil {
 			for i, name := range field.Names {
-				extractExpr(tw, name, lbl, i+1)
+				extractExpr(tw, name, lbl, i+1, false)
 			}
 		}
-		extractExpr(tw, field.Type, lbl, 0)
+		extractExpr(tw, field.Type, lbl, 0, false)
 		extractDoc(tw, field.Doc, lbl)
 		idx += 1
 	}
@@ -2023,3 +2026,24 @@ func setTypeParamParent(tp *types.TypeParam, newobj types.Object) {
 		log.Fatalf("Parent of type parameter '%s %s' being set to a different value: '%s' vs '%s'", tp.String(), tp.Constraint().String(), obj, newobj)
 	}
 }
+
+// skipExtractingValueForLeftOperand returns true if the left operand of `be`
+// should not have its value extracted because it is an intermediate value in a
+// string concatenation - specifically that the right operand is a string
+// literal
+func skipExtractingValueForLeftOperand(tw *trap.Writer, be *ast.BinaryExpr) bool {
+	// check `be` has string type
+	tpVal := tw.Package.TypesInfo.Types[be]
+	if tpVal.Value == nil || tpVal.Value.Kind() != constant.String {
+		return false
+	}
+	// check that the right operand of `be` is a basic literal
+	if _, isBasicLit := be.Y.(*ast.BasicLit); !isBasicLit {
+		return false
+	}
+	// check that the left operand of `be` is not a basic literal
+	if _, isBasicLit := be.X.(*ast.BasicLit); isBasicLit {
+		return false
+	}
+	return true
+}

From 530c76ca8b49cf4338cc72124e3b49af28376fd2 Mon Sep 17 00:00:00 2001
From: Kevin Stubbings <kwstubbs@github.com>
Date: Wed, 14 Dec 2022 20:59:47 -0800
Subject: [PATCH 006/136] Add New Sanitizers and Modify Old Ones

---
 .../go/security/TaintedPathCustomizations.qll | 46 ++++++++++++++++++-
 .../Security/CWE-022/TaintedPath.expected     | 22 +++++++--
 .../Security/CWE-022/TaintedPath.go           | 29 +++++++++++-
 3 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index 42edd470da2..3c0288493f5 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -74,19 +74,46 @@ module TaintedPath {
   }
 
   /**
-   * A call to `[file]path.Clean("/" + e)`, considered to sanitize `e` against path traversal.
+   * A call to `filepath.Clean("/" + e)`, considered to sanitize `e` against path traversal.
    */
   class FilepathCleanSanitizer extends Sanitizer {
     FilepathCleanSanitizer() {
       exists(DataFlow::CallNode cleanCall, StringOps::Concatenation concatNode |
         cleanCall =
-          any(Function f | f.hasQualifiedName(["path", "path/filepath"], "Clean")).getACall() and
+          any(Function f | f.hasQualifiedName("path/filepath", "Clean")).getACall() and
         concatNode = cleanCall.getArgument(0) and
         concatNode.getOperand(0).asExpr().(StringLit).getValue() = "/" and
         this = cleanCall.getResult()
       )
     }
   }
+      /**
+   * A call to `filepath.Base(e)`, considered to sanitize `e` against path traversal.
+   */
+  class FilepathBaseSanitizer extends Sanitizer {
+    FilepathBaseSanitizer() {
+      exists(Function f, FunctionOutput outp |
+        f.hasQualifiedName("path/filepath", "Base") and
+        outp.isResult(0) and
+        this = outp.getNode(f.getACall())
+      )
+    }
+  }
+
+  /** An call to ParseMultipartForm creates multipart.Form and cleans mutlpart.Form.FileHeader.Filename using path.Base() */
+  class MultipartClean extends Sanitizer {
+    MultipartClean() {
+      exists(DataFlow::FieldReadNode frn,  ControlFlow::Node node, DataFlow::CallNode cleanCall, Method get |
+        get.hasQualifiedName("net/http","Request", "ParseMultipartForm") and
+        cleanCall = get.getACall() and
+        cleanCall.asInstruction() = node and
+        frn.getField().hasQualifiedName("mime/multipart", "FileHeader", "Filename") and
+        node.getASuccessor*() = frn.asInstruction()
+          |
+        this = frn.getBase()
+      )
+      }
+    }
 
   /**
    * A check of the form `!strings.Contains(nd, "..")`, considered as a sanitizer guard for
@@ -105,6 +132,21 @@ module TaintedPath {
       branch = false
     }
   }
+/**
+   * A replacement of the form `!strings.ReplaceAll(nd, "..")` or `!strings.ReplaceAll(nd, ".")`, considered as a sanitizer guard for
+   * path traversal.
+   */
+  class DotDotReplace extends Sanitizer {
+    DotDotReplace() {
+      exists(DataFlow::CallNode cleanCall, DataFlow::Node valueNode |
+        cleanCall =
+          any(Function f | f.hasQualifiedName("strings", "ReplaceAll")).getACall() and
+        valueNode = cleanCall.getArgument(1) and
+        (valueNode.asExpr().(StringLit).getValue() = ".." or valueNode.asExpr().(StringLit).getValue() = ".") and
+        this = cleanCall.getResult()
+      )
+    }
+  }
 
   /**
    * A node `nd` guarded by a check that ensures it is contained within some root folder,
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
index 34d4180a849..38d968a9e3b 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
@@ -1,19 +1,35 @@
 edges
+<<<<<<< HEAD
 | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:13:18:13:30 | call to Query | provenance |  |
 | TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:16:29:16:40 | tainted_path | provenance |  |
 | TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:20:57:20:68 | tainted_path | provenance |  |
 | TaintedPath.go:20:57:20:68 | tainted_path | TaintedPath.go:20:28:20:69 | call to Join | provenance |  |
 | tst.go:14:2:14:39 | ... := ...[1] | tst.go:17:41:17:56 | selection of Filename | provenance |  |
+=======
+| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:16:29:16:40 | tainted_path |
+| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:20:28:20:69 | call to Join |
+| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:67:28:67:57 | call to Clean |
+| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:77:28:77:56 | call to Base |
+| tst.go:14:2:14:39 | ... := ...[1] : pointer type | tst.go:17:41:17:56 | selection of Filename |
+>>>>>>> a45343fb6c (Add New Sanitizers and Modify Old Ones)
 nodes
 | TaintedPath.go:13:18:13:22 | selection of URL | semmle.label | selection of URL |
 | TaintedPath.go:13:18:13:30 | call to Query | semmle.label | call to Query |
 | TaintedPath.go:16:29:16:40 | tainted_path | semmle.label | tainted_path |
 | TaintedPath.go:20:28:20:69 | call to Join | semmle.label | call to Join |
+<<<<<<< HEAD
 | TaintedPath.go:20:57:20:68 | tainted_path | semmle.label | tainted_path |
 | tst.go:14:2:14:39 | ... := ...[1] | semmle.label | ... := ...[1] |
+=======
+| TaintedPath.go:67:28:67:57 | call to Clean | semmle.label | call to Clean |
+| TaintedPath.go:77:28:77:56 | call to Base | semmle.label | call to Base |
+| tst.go:14:2:14:39 | ... := ...[1] : pointer type | semmle.label | ... := ...[1] : pointer type |
+>>>>>>> a45343fb6c (Add New Sanitizers and Modify Old Ones)
 | tst.go:17:41:17:56 | selection of Filename | semmle.label | selection of Filename |
 subpaths
 #select
-| TaintedPath.go:16:29:16:40 | tainted_path | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:16:29:16:40 | tainted_path | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
-| TaintedPath.go:20:28:20:69 | call to Join | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:20:28:20:69 | call to Join | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
-| tst.go:17:41:17:56 | selection of Filename | tst.go:14:2:14:39 | ... := ...[1] | tst.go:17:41:17:56 | selection of Filename | This path depends on a $@. | tst.go:14:2:14:39 | ... := ...[1] | user-provided value |
+| TaintedPath.go:16:29:16:40 | tainted_path | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:16:29:16:40 | tainted_path | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
+| TaintedPath.go:20:28:20:69 | call to Join | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:20:28:20:69 | call to Join | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
+| TaintedPath.go:67:28:67:57 | call to Clean | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:67:28:67:57 | call to Clean | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
+| TaintedPath.go:77:28:77:56 | call to Base | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:77:28:77:56 | call to Base | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
+| tst.go:17:41:17:56 | selection of Filename | tst.go:14:2:14:39 | ... := ...[1] : pointer type | tst.go:17:41:17:56 | selection of Filename | This path depends on a $@. | tst.go:14:2:14:39 | ... := ...[1] | user-provided value |
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
index e663fc3b11d..629b7556e9b 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
@@ -31,6 +31,10 @@ func handler(w http.ResponseWriter, r *http.Request) {
 		w.Write(data)
 	}
 
+	// GOOD: Sanitized by strings.ReplaceAll and replaces all .. with empty string
+	data, _ = ioutil.ReadFile(strings.ReplaceAll(tainted_path, "..", ""))
+	w.Write(data)
+
 	// GOOD: This can only read inside the provided safe path
 	_, err := filepath.Rel("/home/user/safepath", tainted_path)
 	if err == nil {
@@ -53,10 +57,33 @@ func handler(w http.ResponseWriter, r *http.Request) {
 		w.Write(data)
 	}
 
-	// GOOD: Sanitized by [file]path.Clean with a prepended '/' forcing interpretation
+	// GOOD: Sanitized by filepath.Clean with a prepended '/' forcing interpretation
 	// as an absolute path, so that Clean will throw away any leading `..` components.
 	data, _ = ioutil.ReadFile(filepath.Clean("/" + tainted_path))
 	w.Write(data)
+
+	// BAD: Sanitized by path.Clean with a prepended '/' forcing interpretation
+	// as an absolute path, however is not sufficient for Windows paths.
 	data, _ = ioutil.ReadFile(path.Clean("/" + tainted_path))
 	w.Write(data)
+
+	// GOOD: Sanitized by filepath.Base with a prepended '/' forcing interpretation
+	// as an absolute path, so that Base will throw away any leading `..` components.
+	data, _ = ioutil.ReadFile(filepath.Base("/" + tainted_path))
+	w.Write(data)
+
+	// BAD: Sanitized by path.Base with a prepended '/' forcing interpretation
+	// as an absolute path, however is not sufficient for Windows paths.
+	data, _ = ioutil.ReadFile(path.Base("/" + tainted_path))
+	w.Write(data)
+
+	// GOOD: Multipart.Form.FileHeader.Filename sanitized by filepath.Base when calling ParseMultipartForm
+	r.ParseMultipartForm(32 << 20)
+	form := r.MultipartForm
+	files, ok := form.File["files"]
+	if !ok {
+		return
+	}
+	data, _ = ioutil.ReadFile(files[0].Filename)
+	w.Write(data)
 }

From c9b49d3760db97e22ce266e73065c1c1d8b35879 Mon Sep 17 00:00:00 2001
From: Kevin Stubbings <kwstubbs@github.com>
Date: Sun, 8 Oct 2023 16:24:25 -0700
Subject: [PATCH 007/136] resolve feedback

---
 .../go/security/TaintedPathCustomizations.qll | 17 ++++-------
 .../Security/CWE-022/TaintedPath.expected     | 28 +++++++++++--------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index 3c0288493f5..815a628fec3 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -5,7 +5,7 @@
 
 import go
 import semmle.go.dataflow.barrierguardutil.RegexpCheck
-
+import DataFlow
 /**
  * Provides extension points for customizing the taint tracking configuration for reasoning about
  * path-traversal vulnerabilities.
@@ -100,17 +100,12 @@ module TaintedPath {
     }
   }
 
-  /** An call to ParseMultipartForm creates multipart.Form and cleans mutlpart.Form.FileHeader.Filename using path.Base() */
+  /**An call to ParseMultipartForm creates multipart.Form and cleans mutlpart.Form.FileHeader.Filename using path.Base() */
   class MultipartClean extends Sanitizer {
     MultipartClean() {
-      exists(DataFlow::FieldReadNode frn,  ControlFlow::Node node, DataFlow::CallNode cleanCall, Method get |
-        get.hasQualifiedName("net/http","Request", "ParseMultipartForm") and
-        cleanCall = get.getACall() and
-        cleanCall.asInstruction() = node and
+      exists(DataFlow::FieldReadNode frn |
         frn.getField().hasQualifiedName("mime/multipart", "FileHeader", "Filename") and
-        node.getASuccessor*() = frn.asInstruction()
-          |
-        this = frn.getBase()
+        this = frn
       )
       }
     }
@@ -133,7 +128,7 @@ module TaintedPath {
     }
   }
 /**
-   * A replacement of the form `!strings.ReplaceAll(nd, "..")` or `!strings.ReplaceAll(nd, ".")`, considered as a sanitizer guard for
+   * A replacement of the form `!strings.ReplaceAll(nd, "..")` or `!strings.ReplaceAll(nd, ".")`, considered as a sanitizer for
    * path traversal.
    */
   class DotDotReplace extends Sanitizer {
@@ -142,7 +137,7 @@ module TaintedPath {
         cleanCall =
           any(Function f | f.hasQualifiedName("strings", "ReplaceAll")).getACall() and
         valueNode = cleanCall.getArgument(1) and
-        (valueNode.asExpr().(StringLit).getValue() = ".." or valueNode.asExpr().(StringLit).getValue() = ".") and
+        valueNode.asExpr().(StringLit).getValue() = ["..", "."] and
         this = cleanCall.getResult()
       )
     }
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
index 38d968a9e3b..c3a4fc5a616 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
@@ -1,5 +1,6 @@
 edges
 <<<<<<< HEAD
+<<<<<<< HEAD
 | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:13:18:13:30 | call to Query | provenance |  |
 | TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:16:29:16:40 | tainted_path | provenance |  |
 | TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:20:57:20:68 | tainted_path | provenance |  |
@@ -12,24 +13,29 @@ edges
 | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:77:28:77:56 | call to Base |
 | tst.go:14:2:14:39 | ... := ...[1] : pointer type | tst.go:17:41:17:56 | selection of Filename |
 >>>>>>> a45343fb6c (Add New Sanitizers and Modify Old Ones)
+=======
+| TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:13:18:13:30 | call to Query |
+| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:16:29:16:40 | tainted_path |
+| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:20:57:20:68 | tainted_path |
+| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:67:39:67:56 | ...+... |
+| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:77:38:77:55 | ...+... |
+| TaintedPath.go:20:57:20:68 | tainted_path | TaintedPath.go:20:28:20:69 | call to Join |
+| TaintedPath.go:67:39:67:56 | ...+... | TaintedPath.go:67:28:67:57 | call to Clean |
+| TaintedPath.go:77:38:77:55 | ...+... | TaintedPath.go:77:28:77:56 | call to Base |
+>>>>>>> db14838a4f (resolve feedback)
 nodes
 | TaintedPath.go:13:18:13:22 | selection of URL | semmle.label | selection of URL |
 | TaintedPath.go:13:18:13:30 | call to Query | semmle.label | call to Query |
 | TaintedPath.go:16:29:16:40 | tainted_path | semmle.label | tainted_path |
 | TaintedPath.go:20:28:20:69 | call to Join | semmle.label | call to Join |
-<<<<<<< HEAD
 | TaintedPath.go:20:57:20:68 | tainted_path | semmle.label | tainted_path |
-| tst.go:14:2:14:39 | ... := ...[1] | semmle.label | ... := ...[1] |
-=======
 | TaintedPath.go:67:28:67:57 | call to Clean | semmle.label | call to Clean |
+| TaintedPath.go:67:39:67:56 | ...+... | semmle.label | ...+... |
 | TaintedPath.go:77:28:77:56 | call to Base | semmle.label | call to Base |
-| tst.go:14:2:14:39 | ... := ...[1] : pointer type | semmle.label | ... := ...[1] : pointer type |
->>>>>>> a45343fb6c (Add New Sanitizers and Modify Old Ones)
-| tst.go:17:41:17:56 | selection of Filename | semmle.label | selection of Filename |
+| TaintedPath.go:77:38:77:55 | ...+... | semmle.label | ...+... |
 subpaths
 #select
-| TaintedPath.go:16:29:16:40 | tainted_path | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:16:29:16:40 | tainted_path | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
-| TaintedPath.go:20:28:20:69 | call to Join | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:20:28:20:69 | call to Join | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
-| TaintedPath.go:67:28:67:57 | call to Clean | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:67:28:67:57 | call to Clean | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
-| TaintedPath.go:77:28:77:56 | call to Base | TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:77:28:77:56 | call to Base | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
-| tst.go:17:41:17:56 | selection of Filename | tst.go:14:2:14:39 | ... := ...[1] : pointer type | tst.go:17:41:17:56 | selection of Filename | This path depends on a $@. | tst.go:14:2:14:39 | ... := ...[1] | user-provided value |
+| TaintedPath.go:16:29:16:40 | tainted_path | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:16:29:16:40 | tainted_path | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
+| TaintedPath.go:20:28:20:69 | call to Join | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:20:28:20:69 | call to Join | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
+| TaintedPath.go:67:28:67:57 | call to Clean | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:67:28:67:57 | call to Clean | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
+| TaintedPath.go:77:28:77:56 | call to Base | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:77:28:77:56 | call to Base | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |

From c4c0b22bc78075dfa0463f6fc8b09b9e3c1ef34c Mon Sep 17 00:00:00 2001
From: Kevin Stubbings <kwstubbs@github.com>
Date: Sun, 8 Oct 2023 16:37:35 -0700
Subject: [PATCH 008/136] Formattinga and change notes

---
 .../2023-10-08-addional-gopath-sanitizers.md      |  5 +++++
 .../go/security/TaintedPathCustomizations.qll     | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md

diff --git a/go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md b/go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md
new file mode 100644
index 00000000000..0666fee50d5
--- /dev/null
+++ b/go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md
@@ -0,0 +1,5 @@
+
+* ---
+category: minorAnalysis
+---
+* Added filepath.Base, strings.ReplaceAll, http.ParseMultipartForm sanitizers and remove path sanitizer.
\ No newline at end of file
diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index 815a628fec3..c6eec12d9ef 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -6,6 +6,7 @@
 import go
 import semmle.go.dataflow.barrierguardutil.RegexpCheck
 import DataFlow
+
 /**
  * Provides extension points for customizing the taint tracking configuration for reasoning about
  * path-traversal vulnerabilities.
@@ -79,15 +80,15 @@ module TaintedPath {
   class FilepathCleanSanitizer extends Sanitizer {
     FilepathCleanSanitizer() {
       exists(DataFlow::CallNode cleanCall, StringOps::Concatenation concatNode |
-        cleanCall =
-          any(Function f | f.hasQualifiedName("path/filepath", "Clean")).getACall() and
+        cleanCall = any(Function f | f.hasQualifiedName("path/filepath", "Clean")).getACall() and
         concatNode = cleanCall.getArgument(0) and
         concatNode.getOperand(0).asExpr().(StringLit).getValue() = "/" and
         this = cleanCall.getResult()
       )
     }
   }
-      /**
+
+  /**
    * A call to `filepath.Base(e)`, considered to sanitize `e` against path traversal.
    */
   class FilepathBaseSanitizer extends Sanitizer {
@@ -107,8 +108,8 @@ module TaintedPath {
         frn.getField().hasQualifiedName("mime/multipart", "FileHeader", "Filename") and
         this = frn
       )
-      }
     }
+  }
 
   /**
    * A check of the form `!strings.Contains(nd, "..")`, considered as a sanitizer guard for
@@ -127,15 +128,15 @@ module TaintedPath {
       branch = false
     }
   }
-/**
+
+  /**
    * A replacement of the form `!strings.ReplaceAll(nd, "..")` or `!strings.ReplaceAll(nd, ".")`, considered as a sanitizer for
    * path traversal.
    */
   class DotDotReplace extends Sanitizer {
     DotDotReplace() {
       exists(DataFlow::CallNode cleanCall, DataFlow::Node valueNode |
-        cleanCall =
-          any(Function f | f.hasQualifiedName("strings", "ReplaceAll")).getACall() and
+        cleanCall = any(Function f | f.hasQualifiedName("strings", "ReplaceAll")).getACall() and
         valueNode = cleanCall.getArgument(1) and
         valueNode.asExpr().(StringLit).getValue() = ["..", "."] and
         this = cleanCall.getResult()

From 30fe4168e34cc4059c59cabcee77a30e850c7f7c Mon Sep 17 00:00:00 2001
From: Kevin Stubbings <kwstubbs@github.com>
Date: Mon, 11 Mar 2024 15:08:10 -0700
Subject: [PATCH 009/136] Removed filepath.base sanitizer

---
 .../2023-10-08-addional-gopath-sanitizers.md  |  5 ----
 .../2024-03-11-addional-gopath-sanitizers.md  |  5 ++++
 .../go/security/TaintedPathCustomizations.qll | 13 ----------
 .../Security/CWE-022/TaintedPath.expected     | 25 ++-----------------
 .../Security/CWE-022/TaintedPath.go           | 10 --------
 5 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md
 create mode 100644 go/ql/lib/change-notes/2024-03-11-addional-gopath-sanitizers.md

diff --git a/go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md b/go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md
deleted file mode 100644
index 0666fee50d5..00000000000
--- a/go/ql/lib/change-notes/2023-10-08-addional-gopath-sanitizers.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-* ---
-category: minorAnalysis
----
-* Added filepath.Base, strings.ReplaceAll, http.ParseMultipartForm sanitizers and remove path sanitizer.
\ No newline at end of file
diff --git a/go/ql/lib/change-notes/2024-03-11-addional-gopath-sanitizers.md b/go/ql/lib/change-notes/2024-03-11-addional-gopath-sanitizers.md
new file mode 100644
index 00000000000..acfafc26cc5
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-03-11-addional-gopath-sanitizers.md
@@ -0,0 +1,5 @@
+
+* ---
+category: minorAnalysis
+---
+* Added strings.ReplaceAll, http.ParseMultipartForm sanitizers and remove path sanitizer.
\ No newline at end of file
diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index c6eec12d9ef..70f279d307b 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -88,19 +88,6 @@ module TaintedPath {
     }
   }
 
-  /**
-   * A call to `filepath.Base(e)`, considered to sanitize `e` against path traversal.
-   */
-  class FilepathBaseSanitizer extends Sanitizer {
-    FilepathBaseSanitizer() {
-      exists(Function f, FunctionOutput outp |
-        f.hasQualifiedName("path/filepath", "Base") and
-        outp.isResult(0) and
-        this = outp.getNode(f.getACall())
-      )
-    }
-  }
-
   /**An call to ParseMultipartForm creates multipart.Form and cleans mutlpart.Form.FileHeader.Filename using path.Base() */
   class MultipartClean extends Sanitizer {
     MultipartClean() {
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
index c3a4fc5a616..4b4748f0d9c 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
@@ -1,28 +1,10 @@
 edges
-<<<<<<< HEAD
-<<<<<<< HEAD
 | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:13:18:13:30 | call to Query | provenance |  |
 | TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:16:29:16:40 | tainted_path | provenance |  |
 | TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:20:57:20:68 | tainted_path | provenance |  |
+| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:67:39:67:56 | ...+... | provenance |  |
 | TaintedPath.go:20:57:20:68 | tainted_path | TaintedPath.go:20:28:20:69 | call to Join | provenance |  |
-| tst.go:14:2:14:39 | ... := ...[1] | tst.go:17:41:17:56 | selection of Filename | provenance |  |
-=======
-| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:16:29:16:40 | tainted_path |
-| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:20:28:20:69 | call to Join |
-| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:67:28:67:57 | call to Clean |
-| TaintedPath.go:13:18:13:22 | selection of URL : pointer type | TaintedPath.go:77:28:77:56 | call to Base |
-| tst.go:14:2:14:39 | ... := ...[1] : pointer type | tst.go:17:41:17:56 | selection of Filename |
->>>>>>> a45343fb6c (Add New Sanitizers and Modify Old Ones)
-=======
-| TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:13:18:13:30 | call to Query |
-| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:16:29:16:40 | tainted_path |
-| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:20:57:20:68 | tainted_path |
-| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:67:39:67:56 | ...+... |
-| TaintedPath.go:13:18:13:30 | call to Query | TaintedPath.go:77:38:77:55 | ...+... |
-| TaintedPath.go:20:57:20:68 | tainted_path | TaintedPath.go:20:28:20:69 | call to Join |
-| TaintedPath.go:67:39:67:56 | ...+... | TaintedPath.go:67:28:67:57 | call to Clean |
-| TaintedPath.go:77:38:77:55 | ...+... | TaintedPath.go:77:28:77:56 | call to Base |
->>>>>>> db14838a4f (resolve feedback)
+| TaintedPath.go:67:39:67:56 | ...+... | TaintedPath.go:67:28:67:57 | call to Clean | provenance |  |
 nodes
 | TaintedPath.go:13:18:13:22 | selection of URL | semmle.label | selection of URL |
 | TaintedPath.go:13:18:13:30 | call to Query | semmle.label | call to Query |
@@ -31,11 +13,8 @@ nodes
 | TaintedPath.go:20:57:20:68 | tainted_path | semmle.label | tainted_path |
 | TaintedPath.go:67:28:67:57 | call to Clean | semmle.label | call to Clean |
 | TaintedPath.go:67:39:67:56 | ...+... | semmle.label | ...+... |
-| TaintedPath.go:77:28:77:56 | call to Base | semmle.label | call to Base |
-| TaintedPath.go:77:38:77:55 | ...+... | semmle.label | ...+... |
 subpaths
 #select
 | TaintedPath.go:16:29:16:40 | tainted_path | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:16:29:16:40 | tainted_path | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
 | TaintedPath.go:20:28:20:69 | call to Join | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:20:28:20:69 | call to Join | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
 | TaintedPath.go:67:28:67:57 | call to Clean | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:67:28:67:57 | call to Clean | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
-| TaintedPath.go:77:28:77:56 | call to Base | TaintedPath.go:13:18:13:22 | selection of URL | TaintedPath.go:77:28:77:56 | call to Base | This path depends on a $@. | TaintedPath.go:13:18:13:22 | selection of URL | user-provided value |
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
index 629b7556e9b..378cc3acea5 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
@@ -67,16 +67,6 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	data, _ = ioutil.ReadFile(path.Clean("/" + tainted_path))
 	w.Write(data)
 
-	// GOOD: Sanitized by filepath.Base with a prepended '/' forcing interpretation
-	// as an absolute path, so that Base will throw away any leading `..` components.
-	data, _ = ioutil.ReadFile(filepath.Base("/" + tainted_path))
-	w.Write(data)
-
-	// BAD: Sanitized by path.Base with a prepended '/' forcing interpretation
-	// as an absolute path, however is not sufficient for Windows paths.
-	data, _ = ioutil.ReadFile(path.Base("/" + tainted_path))
-	w.Write(data)
-
 	// GOOD: Multipart.Form.FileHeader.Filename sanitized by filepath.Base when calling ParseMultipartForm
 	r.ParseMultipartForm(32 << 20)
 	form := r.MultipartForm

From 5acc15bfff6c3d9e6bb2e9a6197d34a971fec38a Mon Sep 17 00:00:00 2001
From: Kevin Stubbings <kwstubbs@github.com>
Date: Mon, 11 Mar 2024 20:13:08 -0700
Subject: [PATCH 010/136] fix grammar

---
 go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index 70f279d307b..5959bc0ffe8 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -88,7 +88,7 @@ module TaintedPath {
     }
   }
 
-  /**An call to ParseMultipartForm creates multipart.Form and cleans mutlpart.Form.FileHeader.Filename using path.Base() */
+  /**An call to ParseMultipartForm creates multipart.Form and cleans multipart.Form.FileHeader.Filename using path.Base() */
   class MultipartClean extends Sanitizer {
     MultipartClean() {
       exists(DataFlow::FieldReadNode frn |

From 33c17313b413e9f742f825e5bc4c65609f0d1c0a Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Tue, 12 Mar 2024 11:59:10 +0000
Subject: [PATCH 011/136] Add test for not extracting values for intermediate
 string concatenations

---
 .../no-intermediate-strings/tst.expected        | 11 +++++++++++
 .../no-intermediate-strings/tst.go              |  5 +++++
 .../no-intermediate-strings/tst.ql              | 17 +++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 go/ql/test/extractor-tests/no-intermediate-strings/tst.expected
 create mode 100644 go/ql/test/extractor-tests/no-intermediate-strings/tst.go
 create mode 100644 go/ql/test/extractor-tests/no-intermediate-strings/tst.ql

diff --git a/go/ql/test/extractor-tests/no-intermediate-strings/tst.expected b/go/ql/test/extractor-tests/no-intermediate-strings/tst.expected
new file mode 100644
index 00000000000..9746d74fb90
--- /dev/null
+++ b/go/ql/test/extractor-tests/no-intermediate-strings/tst.expected
@@ -0,0 +1,11 @@
+| tst.go:4:6:4:8 | "a" | a |
+| tst.go:4:6:4:14 | ...+... | <no string value stored> |
+| tst.go:4:6:4:20 | ...+... | <no string value stored> |
+| tst.go:4:6:4:26 | ...+... | <no string value stored> |
+| tst.go:4:6:4:32 | ...+... | <no string value stored> |
+| tst.go:4:6:4:38 | ...+... | abcdef |
+| tst.go:4:12:4:14 | "b" | b |
+| tst.go:4:18:4:20 | "c" | c |
+| tst.go:4:24:4:26 | "d" | d |
+| tst.go:4:30:4:32 | "e" | e |
+| tst.go:4:36:4:38 | "f" | f |
diff --git a/go/ql/test/extractor-tests/no-intermediate-strings/tst.go b/go/ql/test/extractor-tests/no-intermediate-strings/tst.go
new file mode 100644
index 00000000000..c79c97a8e88
--- /dev/null
+++ b/go/ql/test/extractor-tests/no-intermediate-strings/tst.go
@@ -0,0 +1,5 @@
+package main
+
+func main() {
+	_ = "a" + "b" + "c" + "d" + "e" + "f"
+}
diff --git a/go/ql/test/extractor-tests/no-intermediate-strings/tst.ql b/go/ql/test/extractor-tests/no-intermediate-strings/tst.ql
new file mode 100644
index 00000000000..6367ef51e70
--- /dev/null
+++ b/go/ql/test/extractor-tests/no-intermediate-strings/tst.ql
@@ -0,0 +1,17 @@
+import go
+
+string checkStringValue(Expr e) {
+  result = e.getStringValue()
+  or
+  not exists(e.getStringValue()) and result = "<no string value stored>"
+}
+
+from Expr e
+where e.getType() instanceof StringType
+// We should get string values for `"a"`, `"b"`, `"c"` and `"a" + "b" + "c"
+// but not `"a" + "b"`. In the extractor we avoid storing the value of
+// intermediate strings in string concatenations because in pathological cases
+// this could lead to a quadratic blowup in the size of string values stored,
+// which then causes performance problems when we iterate through all string
+// values.
+select e, checkStringValue(e)

From fc8caa66c8ac4cb9b6a9a31f5ea24d0b50d3297a Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 11:35:50 +0100
Subject: [PATCH 012/136] Python: Prepare for general content in type-tracker

Due to the char-pred of Content, this change should keep exactly the
same behavior as before.
---
 .../python/dataflow/new/TypeTracking.qll      | 14 +++---
 .../new/internal/TypeTrackingImpl.qll         | 45 +++++--------------
 2 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll b/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll
index 4f1810f059e..9d0bcb3c487 100644
--- a/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll
@@ -5,6 +5,7 @@
 
 private import internal.TypeTrackingImpl as Impl
 import Impl::Shared::TypeTracking<Impl::TypeTrackingInput>
+private import semmle.python.dataflow.new.internal.DataFlowPublic as DataFlowPublic
 
 /** A string that may appear as the name of an attribute or access path. */
 class AttributeName = Impl::TypeTrackingInput::Content;
@@ -40,7 +41,11 @@ class TypeTracker extends Impl::TypeTracker {
    * Holds if this is the starting point of type tracking, and the value starts in the attribute named `attrName`.
    * The type tracking only ends after the attribute has been loaded.
    */
-  predicate startInAttr(string attrName) { this.startInContent(attrName) }
+  predicate startInAttr(string attrName) {
+    exists(DataFlowPublic::AttributeContent content | content.getAttribute() = attrName |
+      this.startInContent(content)
+    )
+  }
 
   /**
    * INTERNAL. DO NOT USE.
@@ -48,9 +53,8 @@ class TypeTracker extends Impl::TypeTracker {
    * Gets the attribute associated with this type tracker.
    */
   string getAttr() {
-    result = this.getContent().asSome()
-    or
-    this.getContent().isNone() and
-    result = ""
+    if this.getContent().asSome() instanceof DataFlowPublic::AttributeContent
+    then result = this.getContent().asSome().(DataFlowPublic::AttributeContent).getAttribute()
+    else result = ""
   }
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index 1a9bdb5202e..8b6e53c8b74 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -97,24 +97,14 @@ private module SummaryTypeTrackerInput implements SummaryTypeTracker::Input {
 
 private module TypeTrackerSummaryFlow = SummaryTypeTracker::SummaryFlow<SummaryTypeTrackerInput>;
 
-/**
- * Gets the name of a possible piece of content. For Python, this is currently only attribute names,
- * using the name of the attribute for the corresponding content.
- */
-private string getPossibleContentName() {
-  Stages::TypeTracking::ref() and // the TypeTracking::append() etc. predicates that we want to cache depend on this predicate, so we can place the `ref()` call here to get around identical files.
-  result = any(DataFlowPublic::AttrRef a).getAttributeName()
-}
-
 module TypeTrackingInput implements Shared::TypeTrackingInput {
   class Node = DataFlowPublic::Node;
 
   class LocalSourceNode = DataFlowPublic::LocalSourceNode;
 
-  class Content instanceof string {
-    Content() { this = getPossibleContentName() }
-
-    string toString() { result = this }
+  class Content extends DataFlowPublic::Content {
+    // this char-pred is just a temporary restriction while transitioning to more general content
+    Content() { this instanceof DataFlowPublic::AttributeContent }
   }
 
   /**
@@ -181,46 +171,35 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
    * Holds if `nodeFrom` is being written to the `content` content of the object in `nodeTo`.
    */
   predicate storeStep(Node nodeFrom, Node nodeTo, Content content) {
-    exists(DataFlowPublic::AttrWrite a |
-      a.mayHaveAttributeName(content) and
+    exists(DataFlowPublic::AttrWrite a, string attrName |
+      content.(DataFlowPublic::AttributeContent).getAttribute() = attrName and
+      a.mayHaveAttributeName(attrName) and
       nodeFrom = a.getValue() and
       nodeTo = a.getObject()
     )
     or
-    exists(DataFlowPublic::ContentSet contents |
-      contents.(DataFlowPublic::AttributeContent).getAttribute() = content
-    |
-      TypeTrackerSummaryFlow::basicStoreStep(nodeFrom, nodeTo, contents)
-    )
+    TypeTrackerSummaryFlow::basicStoreStep(nodeFrom, nodeTo, content)
   }
 
   /**
    * Holds if `nodeTo` is the result of accessing the `content` content of `nodeFrom`.
    */
   predicate loadStep(Node nodeFrom, LocalSourceNode nodeTo, Content content) {
-    exists(DataFlowPublic::AttrRead a |
-      a.mayHaveAttributeName(content) and
+    exists(DataFlowPublic::AttrRead a, string attrName |
+      content.(DataFlowPublic::AttributeContent).getAttribute() = attrName and
+      a.mayHaveAttributeName(attrName) and
       nodeFrom = a.getObject() and
       nodeTo = a
     )
     or
-    exists(DataFlowPublic::ContentSet contents |
-      contents.(DataFlowPublic::AttributeContent).getAttribute() = content
-    |
-      TypeTrackerSummaryFlow::basicLoadStep(nodeFrom, nodeTo, contents)
-    )
+    TypeTrackerSummaryFlow::basicLoadStep(nodeFrom, nodeTo, content)
   }
 
   /**
    * Holds if the `loadContent` of `nodeFrom` is stored in the `storeContent` of `nodeTo`.
    */
   predicate loadStoreStep(Node nodeFrom, Node nodeTo, Content loadContent, Content storeContent) {
-    exists(DataFlowPublic::ContentSet loadContents, DataFlowPublic::ContentSet storeContents |
-      loadContents.(DataFlowPublic::AttributeContent).getAttribute() = loadContent and
-      storeContents.(DataFlowPublic::AttributeContent).getAttribute() = storeContent
-    |
-      TypeTrackerSummaryFlow::basicLoadStoreStep(nodeFrom, nodeTo, loadContents, storeContents)
-    )
+    TypeTrackerSummaryFlow::basicLoadStoreStep(nodeFrom, nodeTo, loadContent, storeContent)
   }
 
   /**

From 636cf611ae8d5f9ac3025bacff6e028902e89f88 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 11:36:47 +0100
Subject: [PATCH 013/136] Python: Allow general content in type-tracker

This should not result in many changes, since store/load steps are still
only implemented for attributes.
---
 .../semmle/python/dataflow/new/internal/TypeTrackingImpl.qll | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index 8b6e53c8b74..81c1f369561 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -102,10 +102,7 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
 
   class LocalSourceNode = DataFlowPublic::LocalSourceNode;
 
-  class Content extends DataFlowPublic::Content {
-    // this char-pred is just a temporary restriction while transitioning to more general content
-    Content() { this instanceof DataFlowPublic::AttributeContent }
-  }
+  class Content = DataFlowPublic::Content;
 
   /**
    * A label to use for `WithContent` and `WithoutContent` steps, restricting

From 7721fb33314cee322fd4b7ac3c8bd5bfe8b2e353 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 11:44:08 +0100
Subject: [PATCH 014/136] Python: Setup shared read/store steps

---
 .../dataflow/new/internal/DataFlowPrivate.qll      | 14 ++++++++++++++
 .../dataflow/new/internal/TypeTrackingImpl.qll     |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 47f41d0cd05..5ccfa251634 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -641,11 +641,18 @@ predicate jumpStepNotSharedWithTypeTracker(Node nodeFrom, Node nodeTo) {
 //--------
 // Field flow
 //--------
+/**
+ * Subset of `storeStep` that should be shared with type-tracking.
+ */
+predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) { none() }
+
 /**
  * Holds if data can flow from `nodeFrom` to `nodeTo` via an assignment to
  * content `c`.
  */
 predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
+  storeStepCommon(nodeFrom, c, nodeTo)
+  or
   listStoreStep(nodeFrom, c, nodeTo)
   or
   setStoreStep(nodeFrom, c, nodeTo)
@@ -891,10 +898,17 @@ predicate attributeStoreStep(Node nodeFrom, AttributeContent c, Node nodeTo) {
   )
 }
 
+/**
+ * Subset of `readStep` that should be shared with type-tracking.
+ */
+predicate readStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) { none() }
+
 /**
  * Holds if data can flow from `nodeFrom` to `nodeTo` via a read of content `c`.
  */
 predicate readStep(Node nodeFrom, ContentSet c, Node nodeTo) {
+  readStepCommon(nodeFrom, c, nodeTo)
+  or
   subscriptReadStep(nodeFrom, c, nodeTo)
   or
   iterableUnpackingReadStep(nodeFrom, c, nodeTo)
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index 81c1f369561..68779208de9 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -175,6 +175,8 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       nodeTo = a.getObject()
     )
     or
+    DataFlowPrivate::storeStepCommon(nodeFrom, content, nodeTo)
+    or
     TypeTrackerSummaryFlow::basicStoreStep(nodeFrom, nodeTo, content)
   }
 
@@ -189,6 +191,8 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       nodeTo = a
     )
     or
+    DataFlowPrivate::readStepCommon(nodeFrom, content, nodeTo)
+    or
     TypeTrackerSummaryFlow::basicLoadStep(nodeFrom, nodeTo, content)
   }
 

From a95bb7c86b1b9047fd5bcc6adf77ee195074a8c5 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 13:24:48 +0100
Subject: [PATCH 015/136] Python: Expand function reference in content test

---
 .../CallGraph/InlineCallGraphTest.expected    |  3 +-
 .../CallGraph/code/func_ref_in_content.py     | 53 +++++++++++++++++++
 .../CallGraph/code/tuple_function_return.py   | 15 ------
 3 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
 delete mode 100644 python/ql/test/experimental/library-tests/CallGraph/code/tuple_function_return.py

diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
index 55774486be0..504c5251a1a 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -15,8 +15,9 @@ pointsTo_found_typeTracker_notFound
 | code/func_defined_outside_class.py:39:11:39:21 | ControlFlowNode for _gen() | B._gen |
 | code/func_defined_outside_class.py:42:1:42:7 | ControlFlowNode for Attribute() | B._gen.func |
 | code/func_defined_outside_class.py:43:1:43:7 | ControlFlowNode for Attribute() | B._gen.func |
+| code/func_ref_in_content.py:17:1:17:4 | ControlFlowNode for f2() | func |
+| code/func_ref_in_content.py:20:1:20:4 | ControlFlowNode for f3() | func |
 | code/funky_regression.py:15:9:15:17 | ControlFlowNode for Attribute() | Wat.f2 |
-| code/tuple_function_return.py:15:1:15:4 | ControlFlowNode for f2() | func |
 | code/type_tracking_limitation.py:8:1:8:3 | ControlFlowNode for x() | my_func |
 typeTracker_found_pointsTo_notFound
 | code/callable_as_argument.py:29:5:29:12 | ControlFlowNode for Attribute() | test_class.InsideTestFunc.sm |
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
new file mode 100644
index 00000000000..b89a013f5b1
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
@@ -0,0 +1,53 @@
+def func():
+    print("func()")
+
+def return_func():
+    return func
+
+f1 = return_func() # $ pt,tt=return_func
+f1() # $ pt,tt=func
+
+
+def return_func_in_tuple():
+    return (func, 42)
+
+tup = return_func_in_tuple() # $ pt,tt=return_func_in_tuple
+
+f2, _ = tup
+f2() # $ pt=func MISSING: tt
+
+f3 = tup[0]
+f3() # $ pt=func MISSING: tt
+
+
+def return_func_in_dict():
+    return {'func': func, 'val': 42}
+
+dct = return_func_in_dict() # $ pt,tt=return_func_in_dict
+
+f4 = dct['func']
+f4() # $ MISSING: tt=func
+
+
+def return_func_in_dict_update():
+    d = {}
+    d["func"] = func
+    return d
+
+dct2 = return_func_in_dict_update() # $ pt,tt=return_func_in_dict_update
+
+f5 = dct2['func']
+f5() # $ MISSING: tt=func
+
+
+def return_func_in_list():
+    return [func, 42]
+
+lst = return_func_in_list() # $ pt,tt=return_func_in_list
+
+f6 = lst[0]
+f6() # $ MISSING: pt,tt=func
+
+if eval("False"): # don't run this, but fool analysis to still consider it (doesn't wok if you just to `if False:`)
+    f7 = lst[1]
+    f7()
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/tuple_function_return.py b/python/ql/test/experimental/library-tests/CallGraph/code/tuple_function_return.py
deleted file mode 100644
index f87b1aa23e8..00000000000
--- a/python/ql/test/experimental/library-tests/CallGraph/code/tuple_function_return.py
+++ /dev/null
@@ -1,15 +0,0 @@
-def func():
-    print("func()")
-
-def return_func():
-    return func
-
-def return_func_in_tuple():
-    return (func, 42)
-
-f1 = return_func() # $ pt,tt=return_func
-f1() # $ pt,tt=func
-
-
-f2, _ = return_func_in_tuple() # $ pt,tt=return_func_in_tuple
-f2() # $ pt=func MISSING: tt

From ece8245a4be1f05fffc2e9cd7acd5e387729538e Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 13:39:49 +0100
Subject: [PATCH 016/136] Python: type-track through tuple content

---
 .../python/dataflow/new/internal/DataFlowPrivate.qll | 12 ++++++------
 .../CallGraph/InlineCallGraphTest.expected           |  1 -
 .../CallGraph/code/func_ref_in_content.py            |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 5ccfa251634..22fb979f9dc 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -644,7 +644,9 @@ predicate jumpStepNotSharedWithTypeTracker(Node nodeFrom, Node nodeTo) {
 /**
  * Subset of `storeStep` that should be shared with type-tracking.
  */
-predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) { none() }
+predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
+  tupleStoreStep(nodeFrom, c, nodeTo)
+}
 
 /**
  * Holds if data can flow from `nodeFrom` to `nodeTo` via an assignment to
@@ -657,8 +659,6 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   setStoreStep(nodeFrom, c, nodeTo)
   or
-  tupleStoreStep(nodeFrom, c, nodeTo)
-  or
   dictStoreStep(nodeFrom, c, nodeTo)
   or
   moreDictStoreSteps(nodeFrom, c, nodeTo)
@@ -901,7 +901,9 @@ predicate attributeStoreStep(Node nodeFrom, AttributeContent c, Node nodeTo) {
 /**
  * Subset of `readStep` that should be shared with type-tracking.
  */
-predicate readStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) { none() }
+predicate readStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
+  subscriptReadStep(nodeFrom, c, nodeTo)
+}
 
 /**
  * Holds if data can flow from `nodeFrom` to `nodeTo` via a read of content `c`.
@@ -909,8 +911,6 @@ predicate readStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) { none() }
 predicate readStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   readStepCommon(nodeFrom, c, nodeTo)
   or
-  subscriptReadStep(nodeFrom, c, nodeTo)
-  or
   iterableUnpackingReadStep(nodeFrom, c, nodeTo)
   or
   matchReadStep(nodeFrom, c, nodeTo)
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
index 504c5251a1a..667ebf28d75 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -16,7 +16,6 @@ pointsTo_found_typeTracker_notFound
 | code/func_defined_outside_class.py:42:1:42:7 | ControlFlowNode for Attribute() | B._gen.func |
 | code/func_defined_outside_class.py:43:1:43:7 | ControlFlowNode for Attribute() | B._gen.func |
 | code/func_ref_in_content.py:17:1:17:4 | ControlFlowNode for f2() | func |
-| code/func_ref_in_content.py:20:1:20:4 | ControlFlowNode for f3() | func |
 | code/funky_regression.py:15:9:15:17 | ControlFlowNode for Attribute() | Wat.f2 |
 | code/type_tracking_limitation.py:8:1:8:3 | ControlFlowNode for x() | my_func |
 typeTracker_found_pointsTo_notFound
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
index b89a013f5b1..87abb4198e9 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
@@ -17,7 +17,7 @@ f2, _ = tup
 f2() # $ pt=func MISSING: tt
 
 f3 = tup[0]
-f3() # $ pt=func MISSING: tt
+f3() # $ tt,pt=func
 
 
 def return_func_in_dict():

From 73fe596753357032044842f90816421ddd16490c Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 13:57:57 +0100
Subject: [PATCH 017/136] Python: type-tracking through dictionary construction

---
 .../semmle/python/dataflow/new/internal/DataFlowPrivate.qll   | 4 ++--
 .../library-tests/CallGraph/InlineCallGraphTest.expected      | 1 +
 .../library-tests/CallGraph/code/func_ref_in_content.py       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 22fb979f9dc..3b589da37d6 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -646,6 +646,8 @@ predicate jumpStepNotSharedWithTypeTracker(Node nodeFrom, Node nodeTo) {
  */
 predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
   tupleStoreStep(nodeFrom, c, nodeTo)
+  or
+  dictStoreStep(nodeFrom, c, nodeTo)
 }
 
 /**
@@ -659,8 +661,6 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   setStoreStep(nodeFrom, c, nodeTo)
   or
-  dictStoreStep(nodeFrom, c, nodeTo)
-  or
   moreDictStoreSteps(nodeFrom, c, nodeTo)
   or
   comprehensionStoreStep(nodeFrom, c, nodeTo)
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
index 667ebf28d75..ab97d594a4e 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -38,6 +38,7 @@ typeTracker_found_pointsTo_notFound
 | code/class_super.py:101:1:101:7 | ControlFlowNode for Attribute() | Z.foo |
 | code/class_super.py:108:1:108:8 | ControlFlowNode for Attribute() | Z.foo |
 | code/def_in_function.py:22:5:22:11 | ControlFlowNode for Attribute() | test.A.foo |
+| code/func_ref_in_content.py:29:1:29:4 | ControlFlowNode for f4() | func |
 | code/isinstance.py:9:13:9:22 | ControlFlowNode for Attribute() | A.foo |
 | code/isinstance.py:9:13:9:22 | ControlFlowNode for Attribute() | ASub.foo |
 | code/isinstance.py:14:13:14:22 | ControlFlowNode for Attribute() | A.foo |
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
index 87abb4198e9..57b11915c51 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
@@ -26,7 +26,7 @@ def return_func_in_dict():
 dct = return_func_in_dict() # $ pt,tt=return_func_in_dict
 
 f4 = dct['func']
-f4() # $ MISSING: tt=func
+f4() # $ tt=func
 
 
 def return_func_in_dict_update():

From dac2b57bb029e345f79e0337f5ab1ba2a2137db7 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 14:51:38 +0100
Subject: [PATCH 018/136] Python: type-track through dict-updates

---
 .../dataflow/new/internal/DataFlowPrivate.qll       |  4 ++--
 .../dataflow/new/internal/TypeTrackingImpl.qll      | 13 ++++++++++++-
 .../CallGraph/InlineCallGraphTest.expected          |  1 +
 .../CallGraph/code/func_ref_in_content.py           |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 3b589da37d6..98841726a74 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -648,6 +648,8 @@ predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
   tupleStoreStep(nodeFrom, c, nodeTo)
   or
   dictStoreStep(nodeFrom, c, nodeTo)
+  or
+  moreDictStoreSteps(nodeFrom, c, nodeTo)
 }
 
 /**
@@ -661,8 +663,6 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   setStoreStep(nodeFrom, c, nodeTo)
   or
-  moreDictStoreSteps(nodeFrom, c, nodeTo)
-  or
   comprehensionStoreStep(nodeFrom, c, nodeTo)
   or
   iterableUnpackingStoreStep(nodeFrom, c, nodeTo)
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index 68779208de9..8b3e1a95ef1 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -175,7 +175,18 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       nodeTo = a.getObject()
     )
     or
-    DataFlowPrivate::storeStepCommon(nodeFrom, content, nodeTo)
+    // type-tracking doesn't really handle PostUpdateNodes, so for some assignment steps
+    // like `my_dict["foo"] = foo` the data-flow step targets the PostUpdateNode for
+    // `my_dict`, where we want to translate that into a type-tracking step that targets
+    // the normal/non-PostUpdateNode for `my_dict`.
+    exists(DataFlowPublic::Node storeTarget |
+      DataFlowPrivate::storeStepCommon(nodeFrom, content, storeTarget)
+    |
+      not storeTarget instanceof DataFlowPrivate::SyntheticPostUpdateNode and
+      nodeTo = storeTarget
+      or
+      nodeTo = storeTarget.(DataFlowPrivate::SyntheticPostUpdateNode).getPreUpdateNode()
+    )
     or
     TypeTrackerSummaryFlow::basicStoreStep(nodeFrom, nodeTo, content)
   }
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
index ab97d594a4e..378b2c64957 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -39,6 +39,7 @@ typeTracker_found_pointsTo_notFound
 | code/class_super.py:108:1:108:8 | ControlFlowNode for Attribute() | Z.foo |
 | code/def_in_function.py:22:5:22:11 | ControlFlowNode for Attribute() | test.A.foo |
 | code/func_ref_in_content.py:29:1:29:4 | ControlFlowNode for f4() | func |
+| code/func_ref_in_content.py:40:1:40:4 | ControlFlowNode for f5() | func |
 | code/isinstance.py:9:13:9:22 | ControlFlowNode for Attribute() | A.foo |
 | code/isinstance.py:9:13:9:22 | ControlFlowNode for Attribute() | ASub.foo |
 | code/isinstance.py:14:13:14:22 | ControlFlowNode for Attribute() | A.foo |
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
index 57b11915c51..4bea545cb0f 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
@@ -37,7 +37,7 @@ def return_func_in_dict_update():
 dct2 = return_func_in_dict_update() # $ pt,tt=return_func_in_dict_update
 
 f5 = dct2['func']
-f5() # $ MISSING: tt=func
+f5() # $ tt=func
 
 
 def return_func_in_list():

From 0cf3fe4a4c5d7772d2efefa0d45cf2d89e46c160 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 14:59:07 +0100
Subject: [PATCH 019/136] Python: Expand dict update tests

---
 .../CallGraph/InlineCallGraphTest.expected             |  8 +++++---
 .../CallGraph/code/func_ref_in_content.py              | 10 ++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
index 378b2c64957..c5b7d6dc473 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -15,7 +15,7 @@ pointsTo_found_typeTracker_notFound
 | code/func_defined_outside_class.py:39:11:39:21 | ControlFlowNode for _gen() | B._gen |
 | code/func_defined_outside_class.py:42:1:42:7 | ControlFlowNode for Attribute() | B._gen.func |
 | code/func_defined_outside_class.py:43:1:43:7 | ControlFlowNode for Attribute() | B._gen.func |
-| code/func_ref_in_content.py:17:1:17:4 | ControlFlowNode for f2() | func |
+| code/func_ref_in_content.py:20:1:20:4 | ControlFlowNode for f2() | func |
 | code/funky_regression.py:15:9:15:17 | ControlFlowNode for Attribute() | Wat.f2 |
 | code/type_tracking_limitation.py:8:1:8:3 | ControlFlowNode for x() | my_func |
 typeTracker_found_pointsTo_notFound
@@ -38,8 +38,10 @@ typeTracker_found_pointsTo_notFound
 | code/class_super.py:101:1:101:7 | ControlFlowNode for Attribute() | Z.foo |
 | code/class_super.py:108:1:108:8 | ControlFlowNode for Attribute() | Z.foo |
 | code/def_in_function.py:22:5:22:11 | ControlFlowNode for Attribute() | test.A.foo |
-| code/func_ref_in_content.py:29:1:29:4 | ControlFlowNode for f4() | func |
-| code/func_ref_in_content.py:40:1:40:4 | ControlFlowNode for f5() | func |
+| code/func_ref_in_content.py:32:1:32:4 | ControlFlowNode for f4() | func |
+| code/func_ref_in_content.py:46:1:46:4 | ControlFlowNode for f5() | func |
+| code/func_ref_in_content.py:48:1:48:15 | ControlFlowNode for Subscript() | func2 |
+| code/func_ref_in_content.py:50:1:50:19 | ControlFlowNode for Subscript() | func2 |
 | code/isinstance.py:9:13:9:22 | ControlFlowNode for Attribute() | A.foo |
 | code/isinstance.py:9:13:9:22 | ControlFlowNode for Attribute() | ASub.foo |
 | code/isinstance.py:14:13:14:22 | ControlFlowNode for Attribute() | A.foo |
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
index 4bea545cb0f..b249ec0b2e9 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
@@ -1,6 +1,9 @@
 def func():
     print("func()")
 
+def func2():
+    print("func2()")
+
 def return_func():
     return func
 
@@ -32,6 +35,9 @@ f4() # $ tt=func
 def return_func_in_dict_update():
     d = {}
     d["func"] = func
+    d["func2"] = func2
+    d["contested"] = func
+    d["contested"] = func2
     return d
 
 dct2 = return_func_in_dict_update() # $ pt,tt=return_func_in_dict_update
@@ -39,6 +45,10 @@ dct2 = return_func_in_dict_update() # $ pt,tt=return_func_in_dict_update
 f5 = dct2['func']
 f5() # $ tt=func
 
+dct2['func2']() # $ tt=func2
+
+dct2['contested']() # $ tt=func2 SPURIOUS: tt=func
+
 
 def return_func_in_list():
     return [func, 42]

From 92729dbbd659bdac0c8f9e31699161806fb80e73 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 23 Feb 2024 15:27:10 +0100
Subject: [PATCH 020/136] Python: Support iterable unpacking in type-tracking

---
 .../python/dataflow/new/internal/DataFlowPrivate.qll      | 8 ++++----
 .../library-tests/CallGraph/InlineCallGraphTest.expected  | 1 -
 .../library-tests/CallGraph/code/func_ref_in_content.py   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 98841726a74..f2a52377544 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -650,6 +650,8 @@ predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
   dictStoreStep(nodeFrom, c, nodeTo)
   or
   moreDictStoreSteps(nodeFrom, c, nodeTo)
+  or
+  iterableUnpackingStoreStep(nodeFrom, c, nodeTo)
 }
 
 /**
@@ -665,8 +667,6 @@ predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   or
   comprehensionStoreStep(nodeFrom, c, nodeTo)
   or
-  iterableUnpackingStoreStep(nodeFrom, c, nodeTo)
-  or
   attributeStoreStep(nodeFrom, c, nodeTo)
   or
   matchStoreStep(nodeFrom, c, nodeTo)
@@ -903,6 +903,8 @@ predicate attributeStoreStep(Node nodeFrom, AttributeContent c, Node nodeTo) {
  */
 predicate readStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
   subscriptReadStep(nodeFrom, c, nodeTo)
+  or
+  iterableUnpackingReadStep(nodeFrom, c, nodeTo)
 }
 
 /**
@@ -911,8 +913,6 @@ predicate readStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
 predicate readStep(Node nodeFrom, ContentSet c, Node nodeTo) {
   readStepCommon(nodeFrom, c, nodeTo)
   or
-  iterableUnpackingReadStep(nodeFrom, c, nodeTo)
-  or
   matchReadStep(nodeFrom, c, nodeTo)
   or
   forReadStep(nodeFrom, c, nodeTo)
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
index c5b7d6dc473..ef82a9ad20c 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -15,7 +15,6 @@ pointsTo_found_typeTracker_notFound
 | code/func_defined_outside_class.py:39:11:39:21 | ControlFlowNode for _gen() | B._gen |
 | code/func_defined_outside_class.py:42:1:42:7 | ControlFlowNode for Attribute() | B._gen.func |
 | code/func_defined_outside_class.py:43:1:43:7 | ControlFlowNode for Attribute() | B._gen.func |
-| code/func_ref_in_content.py:20:1:20:4 | ControlFlowNode for f2() | func |
 | code/funky_regression.py:15:9:15:17 | ControlFlowNode for Attribute() | Wat.f2 |
 | code/type_tracking_limitation.py:8:1:8:3 | ControlFlowNode for x() | my_func |
 typeTracker_found_pointsTo_notFound
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
index b249ec0b2e9..24518ace088 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
@@ -17,7 +17,7 @@ def return_func_in_tuple():
 tup = return_func_in_tuple() # $ pt,tt=return_func_in_tuple
 
 f2, _ = tup
-f2() # $ pt=func MISSING: tt
+f2() # $ pt,tt=func
 
 f3 = tup[0]
 f3() # $ tt,pt=func

From 8a7ffac19c9162fdfbde38aa859fc114ad927ba6 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 1 Mar 2024 12:13:43 +0100
Subject: [PATCH 021/136] Python: Accept consistency failure

---
 .../CallGraph/CONSISTENCY/TypeTrackingConsistency.expected      | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected

diff --git a/python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected b/python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected
new file mode 100644
index 00000000000..6aed7c83813
--- /dev/null
+++ b/python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected
@@ -0,0 +1,2 @@
+| code/func_ref_in_content.py:19:1:19:5 | IterableElement | Unreachable node in step of kind store Tuple element at index 0. |
+| code/func_ref_in_content.py:19:1:19:5 | IterableElement | Unreachable node in step of kind store Tuple element at index 1. |

From 4d78762ba85ddb1373488ef1b0f45fc2a9f9b2a3 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 1 Mar 2024 12:14:14 +0100
Subject: [PATCH 022/136] Python: Ignore consistency failure

---
 python/ql/consistency-queries/TypeTrackingConsistency.ql   | 7 +++++++
 .../CallGraph/CONSISTENCY/TypeTrackingConsistency.expected | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected

diff --git a/python/ql/consistency-queries/TypeTrackingConsistency.ql b/python/ql/consistency-queries/TypeTrackingConsistency.ql
index 15083229002..551573a7aef 100644
--- a/python/ql/consistency-queries/TypeTrackingConsistency.ql
+++ b/python/ql/consistency-queries/TypeTrackingConsistency.ql
@@ -36,6 +36,13 @@ private module ConsistencyChecksInput implements ConsistencyChecksInputSig {
     // which I couldn't just fix. We ignore the problems here, and instead rely on the
     // test-case added in https://github.com/github/codeql/pull/15841
     n.getLocation().getFile().getAbsolutePath().matches("%/socketserver.py")
+    or
+    // for iterable unpacking like `a,b = some_list`, we currently don't want to allow
+    // type-tracking... however, in the future when we allow tracking list indexes
+    // precisely (that is, move away from ListElementContent), we should ensure we have
+    // proper flow to the synthetic `IterableElementNode`.
+    exists(DataFlow::ListElementContent c) and
+    n instanceof DataFlow::IterableElementNode
   }
 }
 
diff --git a/python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected b/python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected
deleted file mode 100644
index 6aed7c83813..00000000000
--- a/python/ql/test/experimental/library-tests/CallGraph/CONSISTENCY/TypeTrackingConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| code/func_ref_in_content.py:19:1:19:5 | IterableElement | Unreachable node in step of kind store Tuple element at index 0. |
-| code/func_ref_in_content.py:19:1:19:5 | IterableElement | Unreachable node in step of kind store Tuple element at index 1. |

From fa0c4e18fcbe2638af0266bbd86d209e2feec054 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Mon, 4 Mar 2024 16:05:18 +0100
Subject: [PATCH 023/136] Python: Expand dict-content tt test even more

While it might be useful to track content to any lookup, it's not
something we do right now.
---
 .../CallGraph/code/func_ref_in_content.py             | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
index 24518ace088..eee8f29778b 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/func_ref_in_content.py
@@ -50,6 +50,17 @@ dct2['func2']() # $ tt=func2
 dct2['contested']() # $ tt=func2 SPURIOUS: tt=func
 
 
+## non-precise access is not supported right now
+for k in dct2:
+    dct2[k]() # $ MISSING: tt=func tt=func2
+
+for v in dct2.values():
+    v() # $ MISSING: tt=func tt=func2
+
+for k, v in dct2.items():
+    v() # $ MISSING: tt=func tt=func2
+
+
 def return_func_in_list():
     return [func, 42]
 

From 7de304bf1680d61f7b6309cb840a941445f9caf9 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 12 Mar 2024 16:07:53 +0100
Subject: [PATCH 024/136] Python: Add proper type-tracking tests for content

Instead of just relying on the call-graph tests
---
 .../dataflow/typetracking/content_test.py     | 78 +++++++++++++++++++
 .../dataflow/typetracking/tracked.ql          |  8 ++
 2 files changed, 86 insertions(+)
 create mode 100644 python/ql/test/experimental/dataflow/typetracking/content_test.py

diff --git a/python/ql/test/experimental/dataflow/typetracking/content_test.py b/python/ql/test/experimental/dataflow/typetracking/content_test.py
new file mode 100644
index 00000000000..ac201f23301
--- /dev/null
+++ b/python/ql/test/experimental/dataflow/typetracking/content_test.py
@@ -0,0 +1,78 @@
+# test of other content types than attributes
+
+def test_tuple(index_arg):
+    tup = (tracked, other) # $tracked
+
+    tup[0] # $ tracked
+    tup[1]
+
+    a,b = tup # $tracked
+    a # $ tracked
+    b
+
+    # non-precise access is not supported right now (and it's not 100% clear if we want
+    # to support it, or if it will lead to bad results)
+    tup[index_arg]
+
+    for x in tup:
+        print(x)
+
+    for i in range(len(tup)):
+        print(tup[i])
+
+
+def test_dict(key_arg):
+    d1 = {"t": tracked, "o": other} # $tracked
+    d1["t"] # $ tracked
+    d1.get("t") # $ MISSING: tracked
+    d1.setdefault("t") # $ MISSING: tracked
+
+    d1["o"]
+    d1.get("o")
+    d1.setdefault("o")
+
+
+    # non-precise access is not supported right now (and it's not 100% clear if we want
+    # to support it, or if it will lead to bad results)
+    d1[key_arg]
+
+    for k in d1:
+        d1[k]
+
+    for v in d1.values():
+        v
+
+    for k, v in d1.items():
+        v
+
+
+    # construction with inline updates
+    d2 = dict()
+    d2["t"] = tracked # $ tracked
+    d2["o"] = other
+
+    d2["t"] # $ tracked
+    d2["o"]
+
+    # notice that time-travel is also possible (just as with attributes)
+    d3 = dict()
+    d3["t"] # $ SPURIOUS: tracked
+    d3["t"] = tracked # $ tracked
+    d3["t"] # $ tracked
+
+
+def test_list(index_arg):
+    l = [tracked, other] # $tracked
+
+    l[0] # $ MISSING: tracked
+    l[1]
+
+    # non-precise access is not supported right now (and it's not 100% clear if we want
+    # to support it, or if it will lead to bad results)
+    l[index_arg]
+
+    for x in l:
+        print(x)
+
+    for i in range(len(l)):
+        print(l[i])
diff --git a/python/ql/test/experimental/dataflow/typetracking/tracked.ql b/python/ql/test/experimental/dataflow/typetracking/tracked.ql
index ca893688256..8bad0e33ead 100644
--- a/python/ql/test/experimental/dataflow/typetracking/tracked.ql
+++ b/python/ql/test/experimental/dataflow/typetracking/tracked.ql
@@ -30,6 +30,14 @@ module TrackedTest implements TestSig {
       not e instanceof DataFlow::ScopeEntryDefinitionNode and
       // ...same for `SynthCaptureNode`s
       not e instanceof DP::SynthCaptureNode and
+      // after starting to track all kinds of content, we generally just want to show
+      // annotations after reading the tracked data out again. (we keep the old
+      // attribute logic to not rewrite all our tests)
+      (
+        t.getContent().isNone()
+        or
+        t.getContent().asSome() instanceof DataFlow::AttributeContent
+      ) and
       tag = "tracked" and
       location = e.getLocation() and
       value = t.getAttr() and

From 2b09b084e0393193e5daf97a1a512538c9aa4b57 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 12 Mar 2024 17:43:43 +0100
Subject: [PATCH 025/136] Python: Add change-note

---
 python/ql/lib/change-notes/2024-03-12-typetracking-content.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 python/ql/lib/change-notes/2024-03-12-typetracking-content.md

diff --git a/python/ql/lib/change-notes/2024-03-12-typetracking-content.md b/python/ql/lib/change-notes/2024-03-12-typetracking-content.md
new file mode 100644
index 00000000000..5ad93a657ae
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-03-12-typetracking-content.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Improved the type-tracking capabilities (and therefore also API graphs) to allow tracking items in tuples and dictionaries.

From af8cef5b535b068057a58654701cf27ca2641e81 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 12 Mar 2024 17:57:32 +0100
Subject: [PATCH 026/136] Python: Fixup deprecated type-tracker API

---
 .../dataflow/new/internal/TypeTracker.qll     | 46 +++++++++++++++----
 .../new/internal/TypeTrackerSpecific.qll      |  2 +-
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll
index 0f6ff8bd3bd..01c881b2316 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll
@@ -1,6 +1,7 @@
 /** Step Summaries and Type Tracking */
 
 private import TypeTrackerSpecific
+private import semmle.python.dataflow.new.internal.DataFlowPublic as DataFlowPublic
 
 cached
 private module Cached {
@@ -12,10 +13,22 @@ private module Cached {
     LevelStep() or
     CallStep() or
     ReturnStep() or
-    deprecated StoreStep(TypeTrackerContent content) { basicStoreStep(_, _, content) } or
-    deprecated LoadStep(TypeTrackerContent content) { basicLoadStep(_, _, content) } or
+    deprecated StoreStep(TypeTrackerContent content) {
+      exists(DataFlowPublic::AttributeContent dfc | dfc.getAttribute() = content |
+        basicStoreStep(_, _, dfc)
+      )
+    } or
+    deprecated LoadStep(TypeTrackerContent content) {
+      exists(DataFlowPublic::AttributeContent dfc | dfc.getAttribute() = content |
+        basicLoadStep(_, _, dfc)
+      )
+    } or
     deprecated LoadStoreStep(TypeTrackerContent load, TypeTrackerContent store) {
-      basicLoadStoreStep(_, _, load, store)
+      exists(DataFlowPublic::AttributeContent dfcLoad, DataFlowPublic::AttributeContent dfcStore |
+        dfcLoad.getAttribute() = load and dfcStore.getAttribute() = store
+      |
+        basicLoadStoreStep(_, _, dfcLoad, dfcStore)
+      )
     } or
     deprecated WithContent(ContentFilter filter) { basicWithContentStep(_, _, filter) } or
     deprecated WithoutContent(ContentFilter filter) { basicWithoutContentStep(_, _, filter) } or
@@ -29,13 +42,13 @@ private module Cached {
       // Restrict `content` to those that might eventually match a load.
       // We can't rely on `basicStoreStep` since `startInContent` might be used with
       // a content that has no corresponding store.
-      exists(TypeTrackerContent loadContents |
+      exists(DataFlowPublic::AttributeContent loadContents |
         (
           basicLoadStep(_, _, loadContents)
           or
           basicLoadStoreStep(_, _, loadContents, _)
         ) and
-        compatibleContents(content, loadContents)
+        compatibleContents(content, loadContents.getAttribute())
       )
     }
 
@@ -45,13 +58,13 @@ private module Cached {
       content = noContent()
       or
       // As in MkTypeTracker, restrict `content` to those that might eventually match a store.
-      exists(TypeTrackerContent storeContent |
+      exists(DataFlowPublic::AttributeContent storeContent |
         (
           basicStoreStep(_, _, storeContent)
           or
           basicLoadStoreStep(_, _, _, storeContent)
         ) and
-        compatibleContents(storeContent, content)
+        compatibleContents(storeContent.getAttribute(), content)
       )
     }
 
@@ -198,7 +211,10 @@ private module Cached {
       flowsToStoreStep(nodeFrom, nodeTo, content) and
       summary = StoreStep(content)
       or
-      basicLoadStep(nodeFrom, nodeTo, content) and summary = LoadStep(content)
+      exists(DataFlowPublic::AttributeContent dfc | dfc.getAttribute() = content |
+        basicLoadStep(nodeFrom, nodeTo, dfc)
+      ) and
+      summary = LoadStep(content)
     )
     or
     exists(TypeTrackerContent loadContent, TypeTrackerContent storeContent |
@@ -281,7 +297,12 @@ deprecated private predicate smallstepProj(Node nodeFrom, StepSummary summary) {
 deprecated private predicate flowsToStoreStep(
   Node nodeFrom, TypeTrackingNode nodeTo, TypeTrackerContent content
 ) {
-  exists(Node obj | nodeTo.flowsTo(obj) and basicStoreStep(nodeFrom, obj, content))
+  exists(Node obj |
+    nodeTo.flowsTo(obj) and
+    exists(DataFlowPublic::AttributeContent dfc | dfc.getAttribute() = content |
+      basicStoreStep(nodeFrom, obj, dfc)
+    )
+  )
 }
 
 /**
@@ -292,7 +313,12 @@ deprecated private predicate flowsToLoadStoreStep(
   TypeTrackerContent storeContent
 ) {
   exists(Node obj |
-    nodeTo.flowsTo(obj) and basicLoadStoreStep(nodeFrom, obj, loadContent, storeContent)
+    nodeTo.flowsTo(obj) and
+    exists(DataFlowPublic::AttributeContent loadDfc, DataFlowPublic::AttributeContent storeDfc |
+      loadDfc.getAttribute() = loadContent and storeDfc.getAttribute() = storeContent
+    |
+      basicLoadStoreStep(nodeFrom, obj, loadDfc, storeDfc)
+    )
   )
 }
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll
index c31cfeb5331..11cce1446f7 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackerSpecific.qll
@@ -15,7 +15,7 @@ deprecated class OptionalTypeTrackerContent extends string {
   OptionalTypeTrackerContent() {
     this = ""
     or
-    this instanceof TypeTrackingImpl::TypeTrackingInput::Content
+    this = any(DataFlowPublic::AttributeContent dfc).getAttribute()
   }
 }
 

From 6ffaad1bc8cfb0812549780d6547c8e37a2dcea9 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 12 Mar 2024 22:32:40 +0100
Subject: [PATCH 027/136] Python: Expand type-tracking tests with nested tuples

I was initially surprised to see that this didn't work, until I
remembered that type-tracking only works with content of depth 1.
---
 .../TypeTrackingConsistency.expected          | 13 +++++++++++
 .../dataflow/typetracking/content_test.py     | 22 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected

diff --git a/python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected b/python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected
new file mode 100644
index 00000000000..6fc4df91699
--- /dev/null
+++ b/python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected
@@ -0,0 +1,13 @@
+unreachableNode
+| content_test.py:31:6:31:11 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
+| content_test.py:31:6:31:11 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
+| content_test.py:31:6:31:11 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |
+| content_test.py:31:16:31:21 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
+| content_test.py:31:16:31:21 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
+| content_test.py:31:16:31:21 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |
+| content_test.py:40:10:40:13 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
+| content_test.py:40:10:40:13 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
+| content_test.py:40:10:40:13 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |
+| content_test.py:66:9:66:12 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
+| content_test.py:66:9:66:12 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
+| content_test.py:66:9:66:12 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |
diff --git a/python/ql/test/experimental/dataflow/typetracking/content_test.py b/python/ql/test/experimental/dataflow/typetracking/content_test.py
index ac201f23301..1c52d659582 100644
--- a/python/ql/test/experimental/dataflow/typetracking/content_test.py
+++ b/python/ql/test/experimental/dataflow/typetracking/content_test.py
@@ -21,6 +21,28 @@ def test_tuple(index_arg):
         print(tup[i])
 
 
+    # nested tuples
+    nested_tuples = ((tracked, other), (other, tracked)) # $tracked
+
+    nested_tuples[0][0] # $ MISSING: tracked
+    nested_tuples[0][1]
+    nested_tuples[1][0]
+    nested_tuples[1][1] # $ MISSING: tracked
+
+    (aa, ab), (ba, bb) = nested_tuples
+    aa # $ MISSING: tracked
+    ab
+    ba
+    bb # $ MISSING: tracked
+
+
+    # non-precise access is not supported right now (and it's not 100% clear if we want
+    # to support it, or if it will lead to bad results)
+    for (x, y) in nested_tuples:
+        x
+        y
+
+
 def test_dict(key_arg):
     d1 = {"t": tracked, "o": other} # $tracked
     d1["t"] # $ tracked

From 7a3ee0f5f8145abe25b26a64415a43ed32b7016e Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Wed, 13 Mar 2024 16:41:42 +0100
Subject: [PATCH 028/136] Python: Make `IterableSequenceNode` LocalSourceNode

We do this to remove the inconsistencies, and to be ready for a future
where type-tracking support content tracker of depth > 1.

It works because targets of loadSteps needs to be LocalSourceNodes

predicate loadStep(Node nodeFrom, LocalSourceNode nodeTo, Content content) {
---
 .../python/dataflow/new/internal/LocalSources.qll   |  2 ++
 .../CONSISTENCY/TypeTrackingConsistency.expected    | 13 -------------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
index 34b137b3511..92d9e5887ad 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
@@ -74,6 +74,8 @@ class LocalSourceNode extends Node {
     this instanceof ScopeEntryDefinitionNode
     or
     this instanceof ParameterNode
+    or
+    this instanceof IterableSequenceNode
   }
 
   /** Holds if this `LocalSourceNode` can flow to `nodeTo` in one or more local flow steps. */
diff --git a/python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected b/python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected
deleted file mode 100644
index 6fc4df91699..00000000000
--- a/python/ql/test/experimental/dataflow/typetracking/CONSISTENCY/TypeTrackingConsistency.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-unreachableNode
-| content_test.py:31:6:31:11 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
-| content_test.py:31:6:31:11 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
-| content_test.py:31:6:31:11 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |
-| content_test.py:31:16:31:21 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
-| content_test.py:31:16:31:21 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
-| content_test.py:31:16:31:21 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |
-| content_test.py:40:10:40:13 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
-| content_test.py:40:10:40:13 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
-| content_test.py:40:10:40:13 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |
-| content_test.py:66:9:66:12 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 0. |
-| content_test.py:66:9:66:12 | ControlFlowNode for Tuple | Unreachable node in step of kind load Tuple element at index 1. |
-| content_test.py:66:9:66:12 | ControlFlowNode for Tuple | Unreachable node in step of kind storeTarget. |

From 00f2a6a65e76336e0cd926a1630dd0001ed3bd14 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 15 Mar 2024 10:14:45 +0100
Subject: [PATCH 029/136] Python: Update ssa-compute test expectations

---
 .../CONSISTENCY/TypeTrackingConsistency.expected            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/ql/test/library-tests/essa/ssa-compute/CONSISTENCY/TypeTrackingConsistency.expected b/python/ql/test/library-tests/essa/ssa-compute/CONSISTENCY/TypeTrackingConsistency.expected
index 81d19f3f20d..0e829fd207f 100644
--- a/python/ql/test/library-tests/essa/ssa-compute/CONSISTENCY/TypeTrackingConsistency.expected
+++ b/python/ql/test/library-tests/essa/ssa-compute/CONSISTENCY/TypeTrackingConsistency.expected
@@ -1,6 +1,6 @@
 unreachableNode
-| test2.py:16:17:16:17 | ControlFlowNode for y | Unreachable node in step of kind load bar. |
-| test2.py:25:23:25:23 | ControlFlowNode for x | Unreachable node in step of kind load attribute. |
+| test2.py:16:17:16:17 | ControlFlowNode for y | Unreachable node in step of kind load Attribute bar. |
+| test2.py:25:23:25:23 | ControlFlowNode for x | Unreachable node in step of kind load Attribute attribute. |
 | test2.py:25:23:25:23 | ControlFlowNode for x | Unreachable node in step of kind simpleLocalSmallStep. |
-| test2.py:26:17:26:17 | ControlFlowNode for y | Unreachable node in step of kind load bar. |
+| test2.py:26:17:26:17 | ControlFlowNode for y | Unreachable node in step of kind load Attribute bar. |
 | test2.py:27:23:27:23 | ControlFlowNode for x | Unreachable node in step of kind simpleLocalSmallStep. |

From 6babb2ff909d750c908ed3f2faadc8a5285fe81e Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 15 Mar 2024 10:24:33 +0100
Subject: [PATCH 030/136] Python: Accept .expected for `typetracking-summaries`

---
 .../experimental/dataflow/typetracking-summaries/summaries.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py b/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py
index e11f451b865..89b5e1756d5 100644
--- a/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py
+++ b/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py
@@ -41,8 +41,8 @@ tms = tainted_mapped_summary[0]
 tms  # $ MISSING: tracked
 
 another_tainted_list = TTS_append_to_list([], tracked)  # $ tracked
-atl = another_tainted_list[0]
-atl  # $ MISSING: tracked
+atl = another_tainted_list[0] # $ tracked
+atl  # $ tracked
 
 # This will not work, as the call is not found by `getACallSimple`.
 from json import loads as json_loads

From 7eb4419342e08b9f537cd75e1db2e0f5693c55fe Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Fri, 15 Mar 2024 10:24:57 +0100
Subject: [PATCH 031/136] Python: Restrict type-tracking content to only be
 precise

At least for now :)
---
 .../dataflow/new/internal/TypeTrackingImpl.qll   | 16 +++++++++++++++-
 .../dataflow/typetracking-summaries/summaries.py |  4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index 8b3e1a95ef1..ce95a6cca4e 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -102,7 +102,21 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
 
   class LocalSourceNode = DataFlowPublic::LocalSourceNode;
 
-  class Content = DataFlowPublic::Content;
+  class Content extends DataFlowPublic::Content {
+    Content() {
+      // TODO: for now, it's not 100% clear if should support non-precise content in
+      // type-tracking, or if it will lead to bad results. We start with only allowing
+      // precise content, which should always be a good improvement! It also simplifies
+      // the process of examining new results from non-precise content steps in the
+      // future, since you will _only_ have to look over the results from the new
+      // non-precise steps.
+      this instanceof DataFlowPublic::AttributeContent
+      or
+      this instanceof DataFlowPublic::DictionaryElementContent
+      or
+      this instanceof DataFlowPublic::TupleElementContent
+    }
+  }
 
   /**
    * A label to use for `WithContent` and `WithoutContent` steps, restricting
diff --git a/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py b/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py
index 89b5e1756d5..e11f451b865 100644
--- a/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py
+++ b/python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py
@@ -41,8 +41,8 @@ tms = tainted_mapped_summary[0]
 tms  # $ MISSING: tracked
 
 another_tainted_list = TTS_append_to_list([], tracked)  # $ tracked
-atl = another_tainted_list[0] # $ tracked
-atl  # $ tracked
+atl = another_tainted_list[0]
+atl  # $ MISSING: tracked
 
 # This will not work, as the call is not found by `getACallSimple`.
 from json import loads as json_loads

From 90fbacc7bf33203c89346d460676d61faff4ab9c Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 20 Mar 2024 14:29:48 +0000
Subject: [PATCH 032/136] Java/Shared: Use getLocation instead of
 hasLocationInfo.

---
 .../semmle/code/java/dataflow/TypeFlow.qll    | 12 +++--------
 shared/typeflow/codeql/typeflow/TypeFlow.qll  | 20 +++++++------------
 .../codeql/typeflow/internal/TypeFlowImpl.qll |  5 +++--
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index 9a29809f15c..ad423d6d3c7 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -14,7 +14,7 @@ private import semmle.code.java.dataflow.internal.BaseSSA
 private import semmle.code.java.controlflow.Guards
 private import codeql.typeflow.TypeFlow
 
-private module Input implements TypeFlowInput {
+private module Input implements TypeFlowInput<J::Location> {
   private newtype TTypeFlowNode =
     TField(Field f) { not f.getType() instanceof PrimitiveType } or
     TSsa(BaseSsaVariable ssa) { not ssa.getSourceVariable().getType() instanceof PrimitiveType } or
@@ -38,12 +38,6 @@ private module Input implements TypeFlowInput {
       result = this.asMethod().toString()
     }
 
-    predicate hasLocationInfo(
-      string filepath, int startline, int startcolumn, int endline, int endcolumn
-    ) {
-      this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    }
-
     Location getLocation() {
       result = this.asField().getLocation() or
       result = this.asSsa().getLocation() or
@@ -164,7 +158,7 @@ private module Input implements TypeFlowInput {
    */
   pragma[nomagic]
   private predicate upcastCand(TypeFlowNode n, RefType t1, RefType t1e, RefType t2, RefType t2e) {
-    exists(TypeFlowNode next | step(n, next) or Make<Input>::joinStep(n, next) |
+    exists(TypeFlowNode next | step(n, next) or Make<J::Location, Input>::joinStep(n, next) |
       n.getType() = t1 and
       next.getType() = t2 and
       t1.getErasure() = t1e and
@@ -356,7 +350,7 @@ private module Input implements TypeFlowInput {
 
 cached
 private module TypeFlowBounds {
-  private module TypeFlow = Make<Input>;
+  private module TypeFlow = Make<J::Location, Input>;
 
   /**
    * Holds if the runtime type of `f` is bounded by `t` and if this bound is
diff --git a/shared/typeflow/codeql/typeflow/TypeFlow.qll b/shared/typeflow/codeql/typeflow/TypeFlow.qll
index bdf90dab7cf..7551f0f7e44 100644
--- a/shared/typeflow/codeql/typeflow/TypeFlow.qll
+++ b/shared/typeflow/codeql/typeflow/TypeFlow.qll
@@ -8,8 +8,10 @@
  * explicit or implicit cast that lost type information.
  */
 
+private import codeql.util.Location
+
 /** Provides the input specification. */
-signature module TypeFlowInput {
+signature module TypeFlowInput<LocationSig Location> {
   /**
    * A node for which type information is available. For example, expressions
    * and method declarations.
@@ -21,16 +23,8 @@ signature module TypeFlowInput {
     /** Gets the type of this node. */
     Type getType();
 
-    /**
-     * Holds if this element is at the specified location.
-     * The location spans column `startcolumn` of line `startline` to
-     * column `endcolumn` of line `endline` in file `filepath`.
-     * For more information, see
-     * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-     */
-    predicate hasLocationInfo(
-      string filepath, int startline, int startcolumn, int endline, int endcolumn
-    );
+    /** Gets the location of this node. */
+    Location getLocation();
   }
 
   /**
@@ -112,6 +106,6 @@ private import internal.TypeFlowImpl as Impl
 /**
  * Provides an implementation of type-flow using input `I`.
  */
-module Make<TypeFlowInput I> {
-  import Impl::TypeFlow<I>
+module Make<LocationSig Location, TypeFlowInput<Location> I> {
+  import Impl::TypeFlow<Location, I>
 }
diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index 121bc605dbc..787c9b55de2 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -1,7 +1,8 @@
 private import codeql.typeflow.TypeFlow
+private import codeql.util.Location
 private import codeql.util.Unit
 
-module TypeFlow<TypeFlowInput I> {
+module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
   private import I
 
   /**
@@ -56,7 +57,7 @@ module TypeFlow<TypeFlowInput I> {
       n1 =
         rank[r](TypeFlowNode n, int startline, int startcolumn |
           edge(n, n2) and
-          n.hasLocationInfo(_, startline, startcolumn, _, _)
+          n.getLocation().hasLocationInfo(_, startline, startcolumn, _, _)
         |
           n order by startline, startcolumn
         )

From 6a65c46b2e7fe3888a2c3c025751488eb848991b Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 20 Mar 2024 14:36:12 +0000
Subject: [PATCH 033/136] Java/Shared: Share more 'isNull' computations.

---
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll        | 6 ++----
 shared/typeflow/codeql/typeflow/TypeFlow.qll              | 6 ++----
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll | 7 +++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index ad423d6d3c7..ed526ba2eda 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -125,7 +125,7 @@ private module Input implements TypeFlowInput<J::Location> {
   /**
    * Holds if `null` is the only value that flows to `n`.
    */
-  predicate isNull(TypeFlowNode n) {
+  predicate isNullValue(TypeFlowNode n) {
     n.asExpr() instanceof NullLiteral
     or
     exists(LocalVariableDeclExpr decl |
@@ -134,9 +134,7 @@ private module Input implements TypeFlowInput<J::Location> {
       not exists(decl.getInit())
     )
     or
-    exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
-    or
-    forex(TypeFlowNode mid | joinStep0(mid, n) | isNull(mid)) and
+    forex(TypeFlowNode mid | joinStep0(mid, n) | Make<J::Location, Input>::isNull(mid)) and
     // Fields that are never assigned a non-null value are probably set by
     // reflection and are thus not always null.
     not exists(n.asField())
diff --git a/shared/typeflow/codeql/typeflow/TypeFlow.qll b/shared/typeflow/codeql/typeflow/TypeFlow.qll
index 7551f0f7e44..c1679b1b1fe 100644
--- a/shared/typeflow/codeql/typeflow/TypeFlow.qll
+++ b/shared/typeflow/codeql/typeflow/TypeFlow.qll
@@ -39,10 +39,8 @@ signature module TypeFlowInput<LocationSig Location> {
    */
   predicate step(TypeFlowNode n1, TypeFlowNode n2);
 
-  /**
-   * Holds if `null` is the only value that flows to `n`.
-   */
-  predicate isNull(TypeFlowNode n);
+  /** Holds if `n` represents a `null` value. */
+  predicate isNullValue(TypeFlowNode n);
 
   /** A type. */
   class Type {
diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index 787c9b55de2..e486cfe3072 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -5,6 +5,13 @@ private import codeql.util.Unit
 module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
   private import I
 
+  /** Holds if `null` is the only value that flows to `n`. */
+  predicate isNull(TypeFlowNode n) {
+    isNullValue(n)
+    or
+    exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
+  }
+
   /**
    * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
    * functionally determined by `n2`, and `n1` might take a non-null value.

From ebac171b2b89758161757172ab1c76a6fde492de Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 20 Mar 2024 14:40:16 +0000
Subject: [PATCH 034/136] Java/Shared: Rename 'joinStep0' to 'joinStep'.

---
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll        | 4 ++--
 shared/typeflow/codeql/typeflow/TypeFlow.qll              | 2 +-
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index ed526ba2eda..afec2a22ae8 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -75,7 +75,7 @@ private module Input implements TypeFlowInput<J::Location> {
    * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
    * necessarily functionally determined by `n2`.
    */
-  predicate joinStep0(TypeFlowNode n1, TypeFlowNode n2) {
+  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
     n2.asExpr().(ChooseExpr).getAResultExpr() = n1.asExpr()
     or
     exists(Field f, Expr e |
@@ -134,7 +134,7 @@ private module Input implements TypeFlowInput<J::Location> {
       not exists(decl.getInit())
     )
     or
-    forex(TypeFlowNode mid | joinStep0(mid, n) | Make<J::Location, Input>::isNull(mid)) and
+    forex(TypeFlowNode mid | joinStep(mid, n) | Make<J::Location, Input>::isNull(mid)) and
     // Fields that are never assigned a non-null value are probably set by
     // reflection and are thus not always null.
     not exists(n.asField())
diff --git a/shared/typeflow/codeql/typeflow/TypeFlow.qll b/shared/typeflow/codeql/typeflow/TypeFlow.qll
index c1679b1b1fe..d2862b77637 100644
--- a/shared/typeflow/codeql/typeflow/TypeFlow.qll
+++ b/shared/typeflow/codeql/typeflow/TypeFlow.qll
@@ -31,7 +31,7 @@ signature module TypeFlowInput<LocationSig Location> {
    * Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
    * necessarily functionally determined by `n2`.
    */
-  predicate joinStep0(TypeFlowNode n1, TypeFlowNode n2);
+  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2);
 
   /**
    * Holds if data can flow from `n1` to `n2` in one step, and `n1` is
diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index e486cfe3072..d640c4b67e1 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -16,7 +16,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
    * functionally determined by `n2`, and `n1` might take a non-null value.
    */
-  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep0(n1, n2) and not isNull(n1) }
+  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { I::joinStep(n1, n2) and not isNull(n1) }
 
   private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep(n1, n2) or step(n1, n2) }
 

From f03a56f7e0875c0578b18b8c452688060bdb7787 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Thu, 29 Feb 2024 13:03:20 +0000
Subject: [PATCH 035/136] Run generation script

The command line was:
python3 /Users/owen-mc/workspace/codeql-home/codeql/java/ql/src/utils/modelgenerator/GenerateFlowModel.py /Users/owen-mc/db/java/openjdk17 --with-summaries --with-neutrals
---
 .../com.sun.jmx.remote.internal.model.yml     |   7 +
 .../lib/ext/generated/java.applet.model.yml   |  49 +
 java/ql/lib/ext/generated/java.awt.model.yml  |  15 +
 .../java.beans.beancontext.model.yml          |  85 ++
 .../ql/lib/ext/generated/java.beans.model.yml | 261 +++++
 java/ql/lib/ext/generated/java.io.model.yml   | 417 ++++++++
 .../generated/java.lang.annotation.model.yml  |  21 +
 .../generated/java.lang.constant.model.yml    |  94 ++
 .../generated/java.lang.instrument.model.yml  |  18 +
 .../ext/generated/java.lang.invoke.model.yml  | 265 +++++
 .../generated/java.lang.management.model.yml  |  71 ++
 java/ql/lib/ext/generated/java.lang.model.yml | 977 ++++++++++++++++++
 .../ext/generated/java.lang.module.model.yml  | 130 +++
 .../lib/ext/generated/java.lang.ref.model.yml |  32 +
 .../ext/generated/java.lang.reflect.model.yml | 145 +++
 .../ext/generated/java.lang.runtime.model.yml |  13 +
 java/ql/lib/ext/generated/java.math.model.yml | 107 ++
 .../lib/ext/generated/java.net.http.model.yml | 103 ++
 java/ql/lib/ext/generated/java.net.model.yml  | 485 +++++++++
 .../ext/generated/java.nio.channels.model.yml | 180 ++++
 .../generated/java.nio.channels.spi.model.yml |  21 +
 .../ext/generated/java.nio.charset.model.yml  |  82 ++
 .../generated/java.nio.charset.spi.model.yml  |   8 +
 .../java.nio.file.attribute.model.yml         |  38 +
 .../lib/ext/generated/java.nio.file.model.yml | 158 +++
 .../ext/generated/java.nio.file.spi.model.yml |  39 +
 java/ql/lib/ext/generated/java.nio.model.yml  | 234 +++++
 .../lib/ext/generated/java.rmi.dgc.model.yml  |  14 +
 java/ql/lib/ext/generated/java.rmi.model.yml  |  56 +
 .../ext/generated/java.rmi.registry.model.yml |  13 +
 .../ext/generated/java.rmi.server.model.yml   |  71 ++
 .../generated/java.security.cert.model.yml    | 326 ++++++
 .../java.security.interfaces.model.yml        |  10 +
 .../lib/ext/generated/java.security.model.yml | 462 +++++++++
 .../generated/java.security.spec.model.yml    | 146 +++
 java/ql/lib/ext/generated/java.sql.model.yml  | 465 +++++++++
 java/ql/lib/ext/generated/java.text.model.yml | 339 ++++++
 .../lib/ext/generated/java.text.spi.model.yml |  21 +
 .../ext/generated/java.time.chrono.model.yml  | 118 +++
 .../ext/generated/java.time.format.model.yml  | 104 ++
 java/ql/lib/ext/generated/java.time.model.yml | 513 +++++++++
 .../generated/java.time.temporal.model.yml    |  97 ++
 .../ext/generated/java.time.zone.model.yml    |  63 ++
 .../java.util.concurrent.atomic.model.yml     | 271 +++++
 .../java.util.concurrent.locks.model.yml      | 128 +++
 .../generated/java.util.concurrent.model.yml  | 374 +++++++
 .../generated/java.util.function.model.yml    |  46 +
 .../lib/ext/generated/java.util.jar.model.yml |  54 +
 .../ext/generated/java.util.logging.model.yml | 155 +++
 java/ql/lib/ext/generated/java.util.model.yml | 866 ++++++++++++++++
 .../ext/generated/java.util.prefs.model.yml   |  69 ++
 .../ext/generated/java.util.random.model.yml  |  88 ++
 .../ext/generated/java.util.regex.model.yml   |  63 ++
 .../lib/ext/generated/java.util.spi.model.yml |  25 +
 .../ext/generated/java.util.stream.model.yml  | 216 ++++
 .../lib/ext/generated/java.util.zip.model.yml | 155 +++
 .../generated/javax.accessibility.model.yml   |  75 ++
 .../javax.annotation.processing.model.yml     |  25 +
 .../lib/ext/generated/javax.crypto.model.yml  | 180 ++++
 .../ext/generated/javax.crypto.spec.model.yml |  78 ++
 .../javax.imageio.metadata.model.yml          |  65 ++
 .../lib/ext/generated/javax.imageio.model.yml | 251 +++++
 .../javax.imageio.plugins.bmp.model.yml       |  13 +
 .../javax.imageio.plugins.jpeg.model.yml      |  35 +
 .../javax.imageio.plugins.tiff.model.yml      |  94 ++
 .../ext/generated/javax.imageio.spi.model.yml | 129 +++
 .../generated/javax.imageio.stream.model.yml  |  62 ++
 .../javax.lang.model.element.model.yml        |  38 +
 .../ext/generated/javax.lang.model.model.yml  |  13 +
 .../generated/javax.lang.model.type.model.yml |  20 +
 .../generated/javax.lang.model.util.model.yml |  93 ++
 .../javax.management.loading.model.yml        |  44 +
 .../ext/generated/javax.management.model.yml  | 409 ++++++++
 .../javax.management.modelmbean.model.yml     | 113 ++
 .../javax.management.monitor.model.yml        |  68 ++
 .../javax.management.openmbean.model.yml      | 150 +++
 .../javax.management.relation.model.yml       | 171 +++
 .../javax.management.remote.model.yml         |  72 ++
 .../javax.management.remote.rmi.model.yml     |  84 ++
 .../javax.management.timer.model.yml          |  37 +
 .../javax.naming.directory.model.yml          | 137 +++
 .../generated/javax.naming.event.model.yml    |  25 +
 .../ext/generated/javax.naming.ldap.model.yml |  91 ++
 .../generated/javax.naming.ldap.spi.model.yml |  15 +
 .../lib/ext/generated/javax.naming.model.yml  | 177 ++++
 .../ext/generated/javax.naming.spi.model.yml  |  40 +
 java/ql/lib/ext/generated/javax.net.model.yml |  22 +
 .../lib/ext/generated/javax.net.ssl.model.yml | 233 +++++
 .../generated/javax.print.attribute.model.yml |  70 ++
 .../javax.print.attribute.standard.model.yml  |  92 ++
 .../ext/generated/javax.print.event.model.yml |  28 +
 .../lib/ext/generated/javax.print.model.yml   |  56 +
 .../lib/ext/generated/javax.rmi.ssl.model.yml |  18 +
 .../lib/ext/generated/javax.script.model.yml  |  66 ++
 .../javax.security.auth.callback.model.yml    |  61 ++
 .../javax.security.auth.kerberos.model.yml    |  65 ++
 .../javax.security.auth.login.model.yml       |  50 +
 .../generated/javax.security.auth.model.yml   |  37 +
 .../javax.security.auth.x500.model.yml        |  27 +
 .../generated/javax.security.cert.model.yml   |  32 +
 .../generated/javax.security.sasl.model.yml   |  42 +
 .../ext/generated/javax.smartcardio.model.yml |  78 ++
 .../ext/generated/javax.sound.midi.model.yml  |  96 ++
 .../generated/javax.sound.midi.spi.model.yml  |  24 +
 .../generated/javax.sound.sampled.model.yml   | 128 +++
 .../javax.sound.sampled.spi.model.yml         |  31 +
 java/ql/lib/ext/generated/javax.sql.model.yml |  43 +
 .../ext/generated/javax.sql.rowset.model.yml  | 143 +++
 .../javax.sql.rowset.serial.model.yml         |  29 +
 .../generated/javax.sql.rowset.spi.model.yml  |  33 +
 .../lib/ext/generated/javax.tools.model.yml   |  68 ++
 .../generated/javax.transaction.xa.model.yml  |  12 +
 .../ext/generated/javax.xml.catalog.model.yml |  30 +
 .../generated/javax.xml.crypto.dom.model.yml  |  11 +
 .../javax.xml.crypto.dsig.dom.model.yml       |  26 +
 .../javax.xml.crypto.dsig.keyinfo.model.yml   |  31 +
 .../generated/javax.xml.crypto.dsig.model.yml |  61 ++
 .../javax.xml.crypto.dsig.spec.model.yml      |  33 +
 .../ext/generated/javax.xml.crypto.model.yml  |  63 ++
 .../generated/javax.xml.datatype.model.yml    |  97 ++
 .../generated/javax.xml.namespace.model.yml   |  16 +
 .../ext/generated/javax.xml.parsers.model.yml |  93 ++
 .../ext/generated/javax.xml.stream.model.yml  | 156 +++
 .../generated/javax.xml.stream.util.model.yml |  12 +
 .../javax.xml.transform.dom.model.yml         |  23 +
 .../generated/javax.xml.transform.model.yml   |  74 ++
 .../javax.xml.transform.sax.model.yml         |  24 +
 .../javax.xml.transform.stax.model.yml        |  14 +
 .../javax.xml.transform.stream.model.yml      |  21 +
 .../generated/javax.xml.validation.model.yml  |  60 ++
 .../ext/generated/javax.xml.xpath.model.yml   |  37 +
 .../jdk.internal.access.foreign.model.yml     |  10 +
 .../generated/jdk.internal.access.model.yml   | 243 +++++
 .../ext/generated/jdk.internal.misc.model.yml |  11 +
 .../jdk.internal.org.objectweb.asm.model.yml  |  15 +
 .../ext/generated/org.w3c.dom.ls.model.yml    |  28 +
 .../lib/ext/generated/org.w3c.dom.model.yml   | 102 ++
 .../lib/ext/generated/org.xml.sax.model.yml   |  17 +
 java/ql/lib/ext/generated/sun.awt.model.yml   |  11 +
 .../ql/lib/ext/generated/sun.java2d.model.yml |   7 +
 .../generated/sun.management.spi.model.yml    |   7 +
 .../ql/lib/ext/generated/sun.nio.ch.model.yml |  14 +
 java/ql/lib/ext/generated/sun.print.model.yml |   7 +
 .../ext/generated/sun.security.krb5.model.yml |  13 +
 .../ext/generated/sun.security.util.model.yml |   7 +
 .../sun.util.logging.internal.model.yml       |   9 +
 146 files changed, 15154 insertions(+)
 create mode 100644 java/ql/lib/ext/generated/com.sun.jmx.remote.internal.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.applet.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.awt.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.beans.beancontext.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.beans.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.io.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.annotation.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.constant.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.instrument.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.invoke.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.management.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.module.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.ref.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.reflect.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.lang.runtime.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.math.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.net.http.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.net.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.channels.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.channels.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.charset.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.charset.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.file.attribute.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.file.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.file.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.nio.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.rmi.dgc.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.rmi.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.rmi.registry.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.rmi.server.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.security.cert.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.security.interfaces.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.security.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.security.spec.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.sql.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.text.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.text.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.time.chrono.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.time.format.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.time.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.time.temporal.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.time.zone.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.concurrent.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.function.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.jar.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.logging.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.prefs.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.random.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.regex.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.stream.model.yml
 create mode 100644 java/ql/lib/ext/generated/java.util.zip.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.accessibility.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.annotation.processing.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.crypto.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.crypto.spec.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.imageio.metadata.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.imageio.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.imageio.plugins.bmp.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.imageio.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.imageio.stream.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.lang.model.element.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.lang.model.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.lang.model.type.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.lang.model.util.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.loading.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.modelmbean.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.monitor.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.openmbean.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.relation.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.remote.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.management.timer.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.naming.directory.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.naming.event.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.naming.ldap.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.naming.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.naming.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.net.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.net.ssl.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.print.attribute.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.print.event.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.print.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.rmi.ssl.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.script.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.security.auth.callback.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.security.auth.login.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.security.auth.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.security.auth.x500.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.security.cert.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.security.sasl.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.smartcardio.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sound.midi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sound.sampled.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sql.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sql.rowset.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.tools.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.transaction.xa.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.catalog.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.crypto.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.datatype.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.namespace.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.parsers.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.stream.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.stream.util.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.transform.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.validation.model.yml
 create mode 100644 java/ql/lib/ext/generated/javax.xml.xpath.model.yml
 create mode 100644 java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml
 create mode 100644 java/ql/lib/ext/generated/jdk.internal.access.model.yml
 create mode 100644 java/ql/lib/ext/generated/jdk.internal.misc.model.yml
 create mode 100644 java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml
 create mode 100644 java/ql/lib/ext/generated/org.w3c.dom.ls.model.yml
 create mode 100644 java/ql/lib/ext/generated/org.w3c.dom.model.yml
 create mode 100644 java/ql/lib/ext/generated/org.xml.sax.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.awt.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.java2d.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.management.spi.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.nio.ch.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.print.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.security.krb5.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.security.util.model.yml
 create mode 100644 java/ql/lib/ext/generated/sun.util.logging.internal.model.yml

diff --git a/java/ql/lib/ext/generated/com.sun.jmx.remote.internal.model.yml b/java/ql/lib/ext/generated/com.sun.jmx.remote.internal.model.yml
new file mode 100644
index 00000000000..c67869a4253
--- /dev/null
+++ b/java/ql/lib/ext/generated/com.sun.jmx.remote.internal.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["com.sun.jmx.remote.internal", "ClientCommunicatorAdmin", "gotIOException", "(IOException)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.applet.model.yml b/java/ql/lib/ext/generated/java.applet.model.yml
new file mode 100644
index 00000000000..adcf20a8c6e
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.applet.model.yml
@@ -0,0 +1,49 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.applet", "Applet", True, "getAppletContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "Applet", True, "getCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "Applet", True, "getDocumentBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "Applet", True, "getImage", "(URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "Applet", True, "getImage", "(URL,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "Applet", True, "getImage", "(URL,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "Applet", True, "setStub", "(AppletStub)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.applet", "AppletContext", True, "getApplets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "AppletContext", True, "getImage", "(URL)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.applet", "AppletContext", True, "getImage", "(URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "AppletContext", True, "getImage", "(URL)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "AppletStub", True, "getAppletContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "AppletStub", True, "getCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.applet", "AppletStub", True, "getDocumentBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.applet", "Applet", "destroy", "()", "summary", "df-generated"]
+      - ["java.applet", "Applet", "getAppletInfo", "()", "summary", "df-generated"]
+      - ["java.applet", "Applet", "getAudioClip", "(URL)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "getAudioClip", "(URL,String)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "getParameter", "(String)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "getParameterInfo", "()", "summary", "df-generated"]
+      - ["java.applet", "Applet", "init", "()", "summary", "df-generated"]
+      - ["java.applet", "Applet", "isActive", "()", "summary", "df-generated"]
+      - ["java.applet", "Applet", "newAudioClip", "(URL)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "play", "(URL)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "play", "(URL,String)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "showStatus", "(String)", "summary", "df-generated"]
+      - ["java.applet", "Applet", "start", "()", "summary", "df-generated"]
+      - ["java.applet", "Applet", "stop", "()", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "getApplet", "(String)", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "getAudioClip", "(URL)", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "getStream", "(String)", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "getStreamKeys", "()", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "setStream", "(String,InputStream)", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "showDocument", "(URL)", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "showDocument", "(URL,String)", "summary", "df-generated"]
+      - ["java.applet", "AppletContext", "showStatus", "(String)", "summary", "df-generated"]
+      - ["java.applet", "AppletStub", "appletResize", "(int,int)", "summary", "df-generated"]
+      - ["java.applet", "AppletStub", "getParameter", "(String)", "summary", "df-generated"]
+      - ["java.applet", "AppletStub", "isActive", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.awt.model.yml b/java/ql/lib/ext/generated/java.awt.model.yml
new file mode 100644
index 00000000000..63ac56c4b3a
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.awt.model.yml
@@ -0,0 +1,15 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.awt", "Component", True, "getAccessibleContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.awt", "Component", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.awt", "Component", "resize", "(Dimension)", "summary", "df-generated"]
+      - ["java.awt", "Component", "resize", "(int,int)", "summary", "df-generated"]
+      - ["java.awt", "Container", "isValidateRoot", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.beans.beancontext.model.yml b/java/ql/lib/ext/generated/java.beans.beancontext.model.yml
new file mode 100644
index 00000000000..4a096488b80
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.beans.beancontext.model.yml
@@ -0,0 +1,85 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.beans.beancontext", "BeanContext", True, "addBeanContextMembershipListener", "(BeanContextMembershipListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContext", True, "getResource", "(String,BeanContextChild)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContext", True, "instantiateChild", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChild", True, "getBeanContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChild", True, "setBeanContext", "(BeanContext)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", True, "BeanContextChildSupport", "(BeanContextChild)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", True, "getBeanContextChildPeer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextEvent", True, "getBeanContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextEvent", True, "getPropagatedFrom", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextEvent", True, "setPropagatedFrom", "(BeanContext)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Collection)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Object[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "BeanContextMembershipEvent", "(BeanContext,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "iterator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", True, "BeanContextServiceAvailableEvent", "(BeanContextServices,Class)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", True, "getSourceAsBeanContextServices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", True, "BeanContextServiceRevokedEvent", "(BeanContextServices,Class,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", True, "getSourceAsBeanContextServices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", True, "addBeanContextServicesListener", "(BeanContextServicesListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", True, "getCurrentServiceClasses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "BeanContextServicesSupport", "(BeanContextServices,Locale,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesSupport", True, "getBeanContextServicesPeer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean,boolean)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "BeanContextSupport", "(BeanContext,Locale,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "getBeanContextPeer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "readChildren", "(ObjectInputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", True, "writeChildren", "(ObjectOutputStream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.beans.beancontext", "BeanContext", "getResourceAsStream", "(String,BeanContextChild)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContext", "removeBeanContextMembershipListener", "(BeanContextMembershipListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChild", "addPropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChild", "addVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChild", "removePropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChild", "removeVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "firePropertyChange", "(String,Object,Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "fireVetoableChange", "(String,Object,Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "isDelegated", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextChildSupport", "validatePendingSetBeanContext", "(BeanContext)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextEvent", "isPropagated", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", "contains", "(Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextMembershipEvent", "size", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", "getCurrentServiceSelectors", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceAvailableEvent", "getServiceClass", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceProvider", "getCurrentServiceSelectors", "(BeanContextServices,Class)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceProvider", "getService", "(BeanContextServices,Object,Class,Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceProvider", "releaseService", "(BeanContextServices,Object,Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", "getServiceClass", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", "isCurrentServiceInvalidNow", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedEvent", "isServiceClass", "(Class)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServiceRevokedListener", "serviceRevoked", "(BeanContextServiceRevokedEvent)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", "addService", "(Class,BeanContextServiceProvider)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", "getCurrentServiceSelectors", "(Class)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", "getService", "(BeanContextChild,Object,Class,Object,BeanContextServiceRevokedListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", "hasService", "(Class)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", "releaseService", "(BeanContextChild,Object,Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", "removeBeanContextServicesListener", "(BeanContextServicesListener)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServices", "revokeService", "(Class,BeanContextServiceProvider,boolean)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextServicesListener", "serviceAvailable", "(BeanContextServiceAvailableEvent)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "containsKey", "(Object)", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "initialize", "()", "summary", "df-generated"]
+      - ["java.beans.beancontext", "BeanContextSupport", "isSerializing", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.beans.model.yml b/java/ql/lib/ext/generated/java.beans.model.yml
new file mode 100644
index 00000000000..1ae8e6c73b5
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.beans.model.yml
@@ -0,0 +1,261 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.beans", "BeanInfo", True, "getBeanDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "BeanInfo", True, "getEventSetDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "BeanInfo", True, "getMethodDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "BeanInfo", True, "getPropertyDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "getInstanceOf", "(Object,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext)", "", "Argument[0]", "Argument[2].Element", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext,AppletInitializer)", "", "Argument[0]", "Argument[2].Element", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext,AppletInitializer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Beans", True, "instantiate", "(ClassLoader,String,BeanContext,AppletInitializer)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "DefaultPersistenceDelegate", True, "DefaultPersistenceDelegate", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "get", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "get", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "getExceptionListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "getPersistenceDelegate", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "remove", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "setExceptionListener", "(ExceptionListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "writeExpression", "(Expression)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "writeObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Encoder", True, "writeStatement", "(Statement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "EventHandler", "(Object,String,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "getAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "getEventPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "getListenerMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "EventHandler", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(Class,String,Class,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(Class,String,Class,String[],String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(Class,String,Class,String[],String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,MethodDescriptor[],Method,Method)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "EventSetDescriptor", "(String,Class,Method[],Method,Method,Method)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "getListenerMethodDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", True, "getListenerMethods", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,Object,String,Object[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "Expression", "(Object,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Expression", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "attributeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getShortDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "getValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setDisplayName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setShortDescription", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setValue", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", True, "setValue", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyChangeEvent", True, "IndexedPropertyChangeEvent", "(Object,String,Object,Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyChangeEvent", True, "IndexedPropertyChangeEvent", "(Object,String,Object,Object,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyChangeEvent", True, "IndexedPropertyChangeEvent", "(Object,String,Object,Object,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyChangeEvent", True, "IndexedPropertyChangeEvent", "(Object,String,Object,Object,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Class,String,String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Class,String,String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Class,String,String,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Class,String,String,String,String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Class,String,String,String,String)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Method,Method,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Method,Method,Method,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Method,Method,Method,Method)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Method,Method,Method,Method)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "IndexedPropertyDescriptor", "(String,Method,Method,Method,Method)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "setIndexedReadMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", True, "setIndexedWriteMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "IntrospectionException", True, "IntrospectionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Introspector", True, "decapitalize", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "MethodDescriptor", True, "MethodDescriptor", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "MethodDescriptor", True, "MethodDescriptor", "(Method,ParameterDescriptor[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "MethodDescriptor", True, "MethodDescriptor", "(Method,ParameterDescriptor[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "MethodDescriptor", True, "getParameterDescriptors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PersistenceDelegate", True, "writeObject", "(Object,Encoder)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.beans", "PersistenceDelegate", True, "writeObject", "(Object,Encoder)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "PropertyChangeEvent", "(Object,String,Object,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getNewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getOldValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getPropagationId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "getPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeEvent", True, "setPropagationId", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeListener", True, "propertyChange", "(PropertyChangeEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeListenerProxy", True, "PropertyChangeListenerProxy", "(String,PropertyChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeListenerProxy", True, "PropertyChangeListenerProxy", "(String,PropertyChangeListener)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeListenerProxy", True, "getPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", True, "PropertyChangeSupport", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", True, "getPropertyChangeListeners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", True, "getPropertyChangeListeners", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "PropertyDescriptor", "(String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "PropertyDescriptor", "(String,Class,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "PropertyDescriptor", "(String,Class,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "PropertyDescriptor", "(String,Class,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "PropertyDescriptor", "(String,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "PropertyDescriptor", "(String,Method,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "PropertyDescriptor", "(String,Method,Method)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "setReadMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", True, "setWriteMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "addPropertyChangeListener", "(PropertyChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "getAsText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "setAsText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditor", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", True, "PropertyEditorSupport", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", True, "getSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", True, "setSource", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyVetoException", True, "PropertyVetoException", "(String,PropertyChangeEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyVetoException", True, "PropertyVetoException", "(String,PropertyChangeEvent)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "PropertyVetoException", True, "getPropertyChangeEvent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "SimpleBeanInfo", True, "loadImage", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Statement", True, "Statement", "(Object,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "Statement", True, "getArguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Statement", True, "getMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "Statement", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "VetoableChangeListenerProxy", True, "VetoableChangeListenerProxy", "(String,VetoableChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "VetoableChangeListenerProxy", True, "VetoableChangeListenerProxy", "(String,VetoableChangeListener)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "VetoableChangeListenerProxy", True, "getPropertyName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", True, "VetoableChangeSupport", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", True, "getVetoableChangeListeners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", True, "getVetoableChangeListeners", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "createHandler", "(Object,ExceptionListener,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "createHandler", "(Object,ExceptionListener,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "createHandler", "(Object,ExceptionListener,ClassLoader)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "getExceptionListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "getOwner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "readObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "setExceptionListener", "(ExceptionListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "XMLDecoder", True, "setOwner", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "XMLEncoder", True, "XMLEncoder", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "XMLEncoder", True, "XMLEncoder", "(OutputStream,String,boolean,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "XMLEncoder", True, "XMLEncoder", "(OutputStream,String,boolean,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.beans", "XMLEncoder", True, "getOwner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.beans", "XMLEncoder", True, "setOwner", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.beans", "BeanDescriptor", "BeanDescriptor", "(Class)", "summary", "df-generated"]
+      - ["java.beans", "BeanDescriptor", "BeanDescriptor", "(Class,Class)", "summary", "df-generated"]
+      - ["java.beans", "BeanDescriptor", "getBeanClass", "()", "summary", "df-generated"]
+      - ["java.beans", "BeanDescriptor", "getCustomizerClass", "()", "summary", "df-generated"]
+      - ["java.beans", "BeanInfo", "getAdditionalBeanInfo", "()", "summary", "df-generated"]
+      - ["java.beans", "BeanInfo", "getDefaultEventIndex", "()", "summary", "df-generated"]
+      - ["java.beans", "BeanInfo", "getDefaultPropertyIndex", "()", "summary", "df-generated"]
+      - ["java.beans", "BeanInfo", "getIcon", "(int)", "summary", "df-generated"]
+      - ["java.beans", "Beans", "isDesignTime", "()", "summary", "df-generated"]
+      - ["java.beans", "Beans", "isGuiAvailable", "()", "summary", "df-generated"]
+      - ["java.beans", "Beans", "isInstanceOf", "(Object,Class)", "summary", "df-generated"]
+      - ["java.beans", "Beans", "setDesignTime", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "Beans", "setGuiAvailable", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "DesignMode", "isDesignTime", "()", "summary", "df-generated"]
+      - ["java.beans", "DesignMode", "setDesignTime", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "Encoder", "setPersistenceDelegate", "(Class,PersistenceDelegate)", "summary", "df-generated"]
+      - ["java.beans", "EventHandler", "create", "(Class,Object,String)", "summary", "df-generated"]
+      - ["java.beans", "EventHandler", "create", "(Class,Object,String,String)", "summary", "df-generated"]
+      - ["java.beans", "EventHandler", "create", "(Class,Object,String,String,String)", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "getAddListenerMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "getGetListenerMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "getListenerType", "()", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "getRemoveListenerMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "isInDefaultEventSet", "()", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "isUnicast", "()", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "setInDefaultEventSet", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "EventSetDescriptor", "setUnicast", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "ExceptionListener", "exceptionThrown", "(Exception)", "summary", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", "isExpert", "()", "summary", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", "isHidden", "()", "summary", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", "isPreferred", "()", "summary", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", "setExpert", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", "setHidden", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "FeatureDescriptor", "setPreferred", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "IndexedPropertyChangeEvent", "getIndex", "()", "summary", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", "getIndexedPropertyType", "()", "summary", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", "getIndexedReadMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "IndexedPropertyDescriptor", "getIndexedWriteMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "flushCaches", "()", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "flushFromCaches", "(Class)", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "getBeanInfo", "(Class)", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "getBeanInfo", "(Class,Class)", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "getBeanInfo", "(Class,Class,int)", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "getBeanInfo", "(Class,int)", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "getBeanInfoSearchPath", "()", "summary", "df-generated"]
+      - ["java.beans", "Introspector", "setBeanInfoSearchPath", "(String[])", "summary", "df-generated"]
+      - ["java.beans", "MethodDescriptor", "getMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "addPropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "addPropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "fireIndexedPropertyChange", "(String,int,Object,Object)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "fireIndexedPropertyChange", "(String,int,boolean,boolean)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "fireIndexedPropertyChange", "(String,int,int,int)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "firePropertyChange", "(PropertyChangeEvent)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "firePropertyChange", "(String,Object,Object)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "firePropertyChange", "(String,boolean,boolean)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "firePropertyChange", "(String,int,int)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "hasListeners", "(String)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "removePropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "PropertyChangeSupport", "removePropertyChangeListener", "(String,PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "createPropertyEditor", "(Object)", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "getPropertyEditorClass", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "getPropertyType", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "getReadMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "getWriteMethod", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "isBound", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "isConstrained", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "setBound", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "setConstrained", "(boolean)", "summary", "df-generated"]
+      - ["java.beans", "PropertyDescriptor", "setPropertyEditorClass", "(Class)", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditor", "getCustomEditor", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditor", "getJavaInitializationString", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditor", "getTags", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditor", "isPaintable", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditor", "paintValue", "(Graphics,Rectangle)", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditor", "removePropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditor", "supportsCustomEditor", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorManager", "findEditor", "(Class)", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorManager", "getEditorSearchPath", "()", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorManager", "registerEditor", "(Class,Class)", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorManager", "setEditorSearchPath", "(String[])", "summary", "df-generated"]
+      - ["java.beans", "PropertyEditorSupport", "firePropertyChange", "()", "summary", "df-generated"]
+      - ["java.beans", "Statement", "execute", "()", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeListener", "vetoableChange", "(PropertyChangeEvent)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "addVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "addVetoableChangeListener", "(VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "fireVetoableChange", "(PropertyChangeEvent)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "fireVetoableChange", "(String,Object,Object)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "fireVetoableChange", "(String,boolean,boolean)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "fireVetoableChange", "(String,int,int)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "hasListeners", "(String)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "removeVetoableChangeListener", "(String,VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "VetoableChangeSupport", "removeVetoableChangeListener", "(VetoableChangeListener)", "summary", "df-generated"]
+      - ["java.beans", "Visibility", "avoidingGui", "()", "summary", "df-generated"]
+      - ["java.beans", "Visibility", "dontUseGui", "()", "summary", "df-generated"]
+      - ["java.beans", "Visibility", "needsGui", "()", "summary", "df-generated"]
+      - ["java.beans", "Visibility", "okToUseGui", "()", "summary", "df-generated"]
+      - ["java.beans", "XMLEncoder", "flush", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.io.model.yml b/java/ql/lib/ext/generated/java.io.model.yml
new file mode 100644
index 00000000000..248971d2a5a
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.io.model.yml
@@ -0,0 +1,417 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.io", "BufferedOutputStream", True, "BufferedOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "BufferedOutputStream", True, "BufferedOutputStream", "(OutputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "BufferedWriter", True, "BufferedWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "BufferedWriter", True, "BufferedWriter", "(Writer,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ByteArrayOutputStream", True, "writeBytes", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "CharArrayWriter", True, "writeTo", "(Writer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "CharConversionException", True, "CharConversionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "format", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readLine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readLine", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readLine", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readLine", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readPassword", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readPassword", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Console", False, "readPassword", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "reader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Console", False, "writer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "DataInputStream", True, "readUTF", "(DataInput)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "DataOutput", True, "write", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "DataOutput", True, "writeBytes", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "DataOutput", True, "writeChars", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "DataOutput", True, "writeUTF", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "DataOutputStream", True, "DataOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "EOFException", True, "EOFException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Externalizable", True, "readExternal", "(ObjectInput)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "Externalizable", True, "writeExternal", "(ObjectOutput)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "listFiles", "(FileFilter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "listFiles", "(FilenameFilter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "File", True, "toURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "FileInputStream", True, "FileInputStream", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileInputStream", True, "FileInputStream", "(FileDescriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "FileInputStream", True, "FileInputStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileInputStream", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "FileInputStream", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "FileNotFoundException", True, "FileNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(File,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(FileDescriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "FileOutputStream", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "FileOutputStream", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "FilePermission", False, "FilePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileReader", True, "FileReader", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileReader", True, "FileReader", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileReader", True, "FileReader", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileReader", True, "FileReader", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileReader", True, "FileReader", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(File,Charset,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(File,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(String,Charset,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "FileWriter", True, "FileWriter", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "IOError", True, "IOError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "IOException", True, "IOException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "IOException", True, "IOException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "IOException", True, "IOException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "InterruptedIOException", True, "InterruptedIOException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "InvalidClassException", True, "InvalidClassException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "InvalidClassException", True, "InvalidClassException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "InvalidClassException", True, "InvalidClassException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "InvalidObjectException", True, "InvalidObjectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "LineNumberInputStream", True, "LineNumberInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "NotActiveException", True, "NotActiveException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "NotSerializableException", True, "NotSerializableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectInput", True, "readObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputFilter$Config", False, "createFilter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputFilter", True, "allowFilter", "(Predicate,ObjectInputFilter$Status)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputFilter", True, "merge", "(ObjectInputFilter,ObjectInputFilter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputFilter", True, "merge", "(ObjectInputFilter,ObjectInputFilter)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputFilter", True, "rejectFilter", "(Predicate,ObjectInputFilter$Status)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputFilter", True, "rejectUndecidedClass", "(ObjectInputFilter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", True, "get", "(String,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", True, "get", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", True, "getObjectStreamClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream", True, "getObjectInputFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream", True, "readFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream", True, "readUnshared", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectInputStream", True, "setObjectInputFilter", "(ObjectInputFilter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectOutput", True, "writeObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", True, "put", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", True, "write", "(ObjectOutput)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "ObjectOutputStream", True, "ObjectOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectOutputStream", True, "putFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectOutputStream", True, "writeUnshared", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamClass", True, "getField", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamClass", True, "getFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamClass", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamField", True, "ObjectStreamField", "(String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamField", True, "ObjectStreamField", "(String,Class,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamField", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "ObjectStreamField", True, "getTypeString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "OutputStreamWriter", True, "OutputStreamWriter", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "OutputStreamWriter", True, "OutputStreamWriter", "(OutputStream,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "OutputStreamWriter", True, "OutputStreamWriter", "(OutputStream,CharsetEncoder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "OutputStreamWriter", True, "OutputStreamWriter", "(OutputStream,CharsetEncoder)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "OutputStreamWriter", True, "OutputStreamWriter", "(OutputStream,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PipedInputStream", True, "PipedInputStream", "(PipedOutputStream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "PipedInputStream", True, "PipedInputStream", "(PipedOutputStream,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "PipedInputStream", True, "connect", "(PipedOutputStream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "PipedOutputStream", True, "PipedOutputStream", "(PipedInputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PipedOutputStream", True, "connect", "(PipedInputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PipedReader", True, "PipedReader", "(PipedWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "PipedReader", True, "PipedReader", "(PipedWriter,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "PipedReader", True, "connect", "(PipedWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "PipedWriter", True, "PipedWriter", "(PipedReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PipedWriter", True, "connect", "(PipedReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(File,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(OutputStream,boolean,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "PrintStream", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "format", "(Locale,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "format", "(Locale,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "format", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "format", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.io", "PrintStream", True, "format", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.io", "PrintStream", True, "print", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "print", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "print", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "println", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "println", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "println", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintStream", True, "writeBytes", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "PrintWriter", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "PrintWriter", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "PrintWriter", "(OutputStream,boolean,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "PrintWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "PrintWriter", "(Writer,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "format", "(Locale,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "format", "(Locale,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "format", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "format", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.io", "PrintWriter", True, "format", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.io", "PrintWriter", True, "print", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "print", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "print", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "printf", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "println", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "println", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PrintWriter", True, "println", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackInputStream", True, "PushbackInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackInputStream", True, "PushbackInputStream", "(InputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackInputStream", True, "unread", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackInputStream", True, "unread", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackReader", True, "PushbackReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackReader", True, "PushbackReader", "(Reader,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackReader", True, "unread", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "PushbackReader", True, "unread", "(char[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "RandomAccessFile", True, "RandomAccessFile", "(File,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "RandomAccessFile", True, "RandomAccessFile", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "RandomAccessFile", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "RandomAccessFile", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "Reader", True, "transferTo", "(Writer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.io", "SequenceInputStream", True, "SequenceInputStream", "(Enumeration)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "SerializablePermission", False, "SerializablePermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "SerializablePermission", False, "SerializablePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "StreamCorruptedException", True, "StreamCorruptedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "StreamTokenizer", True, "StreamTokenizer", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "StreamTokenizer", True, "StreamTokenizer", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "StringBufferInputStream", True, "StringBufferInputStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "StringWriter", True, "getBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.io", "SyncFailedException", True, "SyncFailedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "UTFDataFormatException", True, "UTFDataFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "UncheckedIOException", True, "UncheckedIOException", "(String,IOException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "UncheckedIOException", True, "UncheckedIOException", "(String,IOException)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "UnsupportedEncodingException", True, "UnsupportedEncodingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "WriteAbortedException", True, "WriteAbortedException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.io", "WriteAbortedException", True, "WriteAbortedException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.io", "BufferedReader", "lines", "()", "summary", "df-generated"]
+      - ["java.io", "BufferedWriter", "newLine", "()", "summary", "df-generated"]
+      - ["java.io", "ByteArrayOutputStream", "ByteArrayOutputStream", "(int)", "summary", "df-generated"]
+      - ["java.io", "ByteArrayOutputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "ByteArrayOutputStream", "size", "()", "summary", "df-generated"]
+      - ["java.io", "CharArrayWriter", "CharArrayWriter", "(int)", "summary", "df-generated"]
+      - ["java.io", "CharArrayWriter", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "CharArrayWriter", "size", "()", "summary", "df-generated"]
+      - ["java.io", "Console", "charset", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readBoolean", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readByte", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readChar", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readDouble", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readFloat", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readInt", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readLong", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readShort", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readUnsignedByte", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "readUnsignedShort", "()", "summary", "df-generated"]
+      - ["java.io", "DataInput", "skipBytes", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "write", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "write", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeBoolean", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeByte", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeChar", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeDouble", "(double)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeFloat", "(float)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeInt", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeLong", "(long)", "summary", "df-generated"]
+      - ["java.io", "DataOutput", "writeShort", "(int)", "summary", "df-generated"]
+      - ["java.io", "DataOutputStream", "size", "()", "summary", "df-generated"]
+      - ["java.io", "File", "canExecute", "()", "summary", "df-generated"]
+      - ["java.io", "File", "canRead", "()", "summary", "df-generated"]
+      - ["java.io", "File", "canWrite", "()", "summary", "df-generated"]
+      - ["java.io", "File", "createNewFile", "()", "summary", "df-generated"]
+      - ["java.io", "File", "deleteOnExit", "()", "summary", "df-generated"]
+      - ["java.io", "File", "getFreeSpace", "()", "summary", "df-generated"]
+      - ["java.io", "File", "getTotalSpace", "()", "summary", "df-generated"]
+      - ["java.io", "File", "getUsableSpace", "()", "summary", "df-generated"]
+      - ["java.io", "File", "isAbsolute", "()", "summary", "df-generated"]
+      - ["java.io", "File", "isHidden", "()", "summary", "df-generated"]
+      - ["java.io", "File", "lastModified", "()", "summary", "df-generated"]
+      - ["java.io", "File", "list", "()", "summary", "df-generated"]
+      - ["java.io", "File", "list", "(FilenameFilter)", "summary", "df-generated"]
+      - ["java.io", "File", "listRoots", "()", "summary", "df-generated"]
+      - ["java.io", "File", "mkdir", "()", "summary", "df-generated"]
+      - ["java.io", "File", "renameTo", "(File)", "summary", "df-generated"]
+      - ["java.io", "File", "setExecutable", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "File", "setExecutable", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.io", "File", "setLastModified", "(long)", "summary", "df-generated"]
+      - ["java.io", "File", "setReadOnly", "()", "summary", "df-generated"]
+      - ["java.io", "File", "setReadable", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "File", "setReadable", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.io", "File", "setWritable", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "File", "setWritable", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.io", "FileDescriptor", "sync", "()", "summary", "df-generated"]
+      - ["java.io", "FileDescriptor", "valid", "()", "summary", "df-generated"]
+      - ["java.io", "Flushable", "flush", "()", "summary", "df-generated"]
+      - ["java.io", "InputStream", "available", "()", "summary", "df-generated"]
+      - ["java.io", "InputStream", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "InputStream", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "InputStream", "nullInputStream", "()", "summary", "df-generated"]
+      - ["java.io", "InputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "InputStream", "skip", "(long)", "summary", "df-generated"]
+      - ["java.io", "InputStream", "skipNBytes", "(long)", "summary", "df-generated"]
+      - ["java.io", "InputStreamReader", "getEncoding", "()", "summary", "df-generated"]
+      - ["java.io", "LineNumberInputStream", "getLineNumber", "()", "summary", "df-generated"]
+      - ["java.io", "LineNumberInputStream", "setLineNumber", "(int)", "summary", "df-generated"]
+      - ["java.io", "LineNumberReader", "getLineNumber", "()", "summary", "df-generated"]
+      - ["java.io", "LineNumberReader", "setLineNumber", "(int)", "summary", "df-generated"]
+      - ["java.io", "ObjectInput", "available", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$Config", "getSerialFilter", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$Config", "getSerialFilterFactory", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$Config", "setSerialFilter", "(ObjectInputFilter)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$Config", "setSerialFilterFactory", "(BinaryOperator)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$FilterInfo", "arrayLength", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$FilterInfo", "depth", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$FilterInfo", "references", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$FilterInfo", "serialClass", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter$FilterInfo", "streamBytes", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputFilter", "checkInput", "(ObjectInputFilter$FilterInfo)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "defaulted", "(String)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,boolean)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,byte)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,char)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,double)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,float)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,int)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,long)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream$GetField", "get", "(String,short)", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "defaultReadObject", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectInputStream", "registerValidation", "(ObjectInputValidation,int)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutput", "flush", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,boolean)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,byte)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,char)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,double)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,float)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,int)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,long)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream$PutField", "put", "(String,short)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "defaultWriteObject", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "useProtocolVersion", "(int)", "summary", "df-generated"]
+      - ["java.io", "ObjectOutputStream", "writeFields", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamClass", "forClass", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamClass", "getSerialVersionUID", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamClass", "lookup", "(Class)", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamClass", "lookupAny", "(Class)", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamField", "getOffset", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamField", "getType", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamField", "getTypeCode", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamField", "isPrimitive", "()", "summary", "df-generated"]
+      - ["java.io", "ObjectStreamField", "isUnshared", "()", "summary", "df-generated"]
+      - ["java.io", "OutputStream", "nullOutputStream", "()", "summary", "df-generated"]
+      - ["java.io", "OutputStreamWriter", "getEncoding", "()", "summary", "df-generated"]
+      - ["java.io", "PipedInputStream", "PipedInputStream", "(int)", "summary", "df-generated"]
+      - ["java.io", "PipedReader", "PipedReader", "(int)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "checkError", "()", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(char)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(double)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(float)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(int)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "print", "(long)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "()", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(char)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(double)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(float)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(int)", "summary", "df-generated"]
+      - ["java.io", "PrintStream", "println", "(long)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "PrintWriter", "(File)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "PrintWriter", "(File,Charset)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "PrintWriter", "(File,String)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "PrintWriter", "(String)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "PrintWriter", "(String,Charset)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "PrintWriter", "(String,String)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "checkError", "()", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(char)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(double)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(float)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(int)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "print", "(long)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "()", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(char)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(double)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(float)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(int)", "summary", "df-generated"]
+      - ["java.io", "PrintWriter", "println", "(long)", "summary", "df-generated"]
+      - ["java.io", "PushbackInputStream", "unread", "(int)", "summary", "df-generated"]
+      - ["java.io", "PushbackReader", "unread", "(int)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "getFilePointer", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "length", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "read", "()", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "read", "(byte[])", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "read", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "seek", "(long)", "summary", "df-generated"]
+      - ["java.io", "RandomAccessFile", "setLength", "(long)", "summary", "df-generated"]
+      - ["java.io", "Reader", "mark", "(int)", "summary", "df-generated"]
+      - ["java.io", "Reader", "markSupported", "()", "summary", "df-generated"]
+      - ["java.io", "Reader", "nullReader", "()", "summary", "df-generated"]
+      - ["java.io", "Reader", "ready", "()", "summary", "df-generated"]
+      - ["java.io", "Reader", "reset", "()", "summary", "df-generated"]
+      - ["java.io", "Reader", "skip", "(long)", "summary", "df-generated"]
+      - ["java.io", "SequenceInputStream", "SequenceInputStream", "(InputStream,InputStream)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "commentChar", "(int)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "eolIsSignificant", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "lineno", "()", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "lowerCaseMode", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "nextToken", "()", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "ordinaryChar", "(int)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "ordinaryChars", "(int,int)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "parseNumbers", "()", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "pushBack", "()", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "quoteChar", "(int)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "resetSyntax", "()", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "slashSlashComments", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "slashStarComments", "(boolean)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "whitespaceChars", "(int,int)", "summary", "df-generated"]
+      - ["java.io", "StreamTokenizer", "wordChars", "(int,int)", "summary", "df-generated"]
+      - ["java.io", "StringWriter", "StringWriter", "(int)", "summary", "df-generated"]
+      - ["java.io", "Writer", "nullWriter", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.annotation.model.yml b/java/ql/lib/ext/generated/java.lang.annotation.model.yml
new file mode 100644
index 00000000000..8417e0d4cee
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.annotation.model.yml
@@ -0,0 +1,21 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.annotation", "AnnotationFormatError", True, "AnnotationFormatError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationFormatError", True, "AnnotationFormatError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationFormatError", True, "AnnotationFormatError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationFormatError", True, "AnnotationFormatError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "AnnotationTypeMismatchException", "(Method,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "AnnotationTypeMismatchException", "(Method,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "element", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.annotation", "AnnotationTypeMismatchException", True, "foundType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.annotation", "IncompleteAnnotationException", True, "IncompleteAnnotationException", "(Class,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.annotation", "IncompleteAnnotationException", True, "elementName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.annotation", "IncompleteAnnotationException", "annotationType", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.constant.model.yml b/java/ql/lib/ext/generated/java.lang.constant.model.yml
new file mode 100644
index 00000000000..efa0c1a5b8c
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.constant.model.yml
@@ -0,0 +1,94 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.constant", "ClassDesc", True, "arrayType", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "displayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "nested", "(String,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "of", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "ofDescriptor", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ClassDesc", True, "packageName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "Constable", True, "describeConstable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDesc", True, "resolveConstantDesc", "(MethodHandles$Lookup)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDesc", True, "resolveConstantDesc", "(MethodHandles$Lookup)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofCallsiteBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofCallsiteBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofCallsiteBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofCallsiteBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofConstantBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofConstantBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofConstantBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "ConstantDescs", False, "ofConstantBootstrap", "(ClassDesc,String,ClassDesc,ClassDesc[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc", True, "lookupDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc", True, "methodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc", True, "owner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "bootstrapArgs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "bootstrapMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "invocationName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "invocationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "of", "(DirectMethodHandleDesc,String,MethodTypeDesc,ConstantDesc[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withArgs", "(ConstantDesc[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", True, "withNameAndType", "(String,MethodTypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "bootstrapArgs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "bootstrapArgsList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "bootstrapMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "constantName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "constantType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "of", "(DirectMethodHandleDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "of", "(DirectMethodHandleDesc,ConstantDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "of", "(DirectMethodHandleDesc,ConstantDesc[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofCanonical", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofCanonical", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofCanonical", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofCanonical", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofNamed", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofNamed", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofNamed", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "DynamicConstantDesc", True, "ofNamed", "(DirectMethodHandleDesc,String,ClassDesc,ConstantDesc[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "asType", "(MethodTypeDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "asType", "(MethodTypeDesc)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "invocationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "of", "(DirectMethodHandleDesc$Kind,ClassDesc,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "of", "(DirectMethodHandleDesc$Kind,ClassDesc,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofConstructor", "(ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofConstructor", "(ClassDesc,ClassDesc[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofField", "(DirectMethodHandleDesc$Kind,ClassDesc,String,ClassDesc)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodHandleDesc", True, "ofMethod", "(DirectMethodHandleDesc$Kind,ClassDesc,String,MethodTypeDesc)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "displayDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "of", "(ClassDesc,ClassDesc[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "of", "(ClassDesc,ClassDesc[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.constant", "MethodTypeDesc", True, "ofDescriptor", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.constant", "ClassDesc", "isClassOrInterface", "()", "summary", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc$Kind", "valueOf", "(int)", "summary", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc$Kind", "valueOf", "(int,boolean)", "summary", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc", "isOwnerInterface", "()", "summary", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc", "kind", "()", "summary", "df-generated"]
+      - ["java.lang.constant", "DirectMethodHandleDesc", "refKind", "()", "summary", "df-generated"]
+      - ["java.lang.constant", "DynamicCallSiteDesc", "resolveCallSiteDesc", "(MethodHandles$Lookup)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.instrument.model.yml b/java/ql/lib/ext/generated/java.lang.instrument.model.yml
new file mode 100644
index 00000000000..ed5693a13d4
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.instrument.model.yml
@@ -0,0 +1,18 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.instrument", "ClassDefinition", False, "ClassDefinition", "(Class,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.instrument", "ClassDefinition", False, "getDefinitionClassFile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.instrument", "IllegalClassFormatException", True, "IllegalClassFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.instrument", "UnmodifiableClassException", True, "UnmodifiableClassException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.instrument", "UnmodifiableModuleException", True, "UnmodifiableModuleException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.instrument", "ClassDefinition", "getDefinitionClass", "()", "summary", "df-generated"]
+      - ["java.lang.instrument", "ClassFileTransformer", "transform", "(ClassLoader,String,Class,ProtectionDomain,byte[])", "summary", "df-generated"]
+      - ["java.lang.instrument", "ClassFileTransformer", "transform", "(Module,ClassLoader,String,Class,ProtectionDomain,byte[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.invoke.model.yml b/java/ql/lib/ext/generated/java.lang.invoke.model.yml
new file mode 100644
index 00000000000..16ba799e924
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.invoke.model.yml
@@ -0,0 +1,265 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.invoke", "CallSite", True, "dynamicInvoker", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "CallSite", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "CallSite", True, "type", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "ClassSpecializer$SpeciesData", True, "key", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", False, "explicitCast", "(MethodHandles$Lookup,String,Class,Object)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "ConstantCallSite", True, "ConstantCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(String,Throwable,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaConversionException", True, "LambdaConversionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaMetafactory", False, "altMetafactory", "(MethodHandles$Lookup,String,MethodType,Object[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "LambdaMetafactory", False, "metafactory", "(MethodHandles$Lookup,String,MethodType,MethodType,MethodHandle,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asCollector", "(Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asCollector", "(int,Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asFixedArity", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asFixedArity", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asSpreader", "(Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asSpreader", "(int,Class,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asType", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asType", "(MethodType)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asTypeUncached", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asTypeUncached", "(MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asTypeUncached", "(MethodType)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "asVarargsCollector", "(Class)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "bindTo", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "bindTo", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "type", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", True, "withVarargs", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", True, "getMethodType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "bind", "(Object,String,MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "dropLookupMode", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findConstructor", "(Class,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findGetter", "(Class,String,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findSetter", "(Class,String,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findSpecial", "(Class,String,MethodType,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findSpecial", "(Class,String,MethodType,Class)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findStatic", "(Class,String,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findStatic", "(Class,String,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findStaticGetter", "(Class,String,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findStaticSetter", "(Class,String,Class)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findVirtual", "(Class,String,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "findVirtual", "(Class,String,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "in", "(Class)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "revealDirect", "(MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "unreflect", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "unreflectConstructor", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "unreflectGetter", "(Field)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "unreflectSetter", "(Field)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", False, "unreflectSpecial", "(Method,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "collectArguments", "(MethodHandle,int,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "collectArguments", "(MethodHandle,int,MethodHandle)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "constant", "(Class,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "dropArguments", "(MethodHandle,int,Class[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "dropArguments", "(MethodHandle,int,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "dropArgumentsToMatch", "(MethodHandle,int,List,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "dropReturn", "(MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "exactInvoker", "(MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "explicitCastArguments", "(MethodHandle,MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "explicitCastArguments", "(MethodHandle,MethodType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "explicitCastArguments", "(MethodHandle,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "filterArguments", "(MethodHandle,int,MethodHandle[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "filterArguments", "(MethodHandle,int,MethodHandle[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "filterReturnValue", "(MethodHandle,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "filterReturnValue", "(MethodHandle,MethodHandle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "foldArguments", "(MethodHandle,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "foldArguments", "(MethodHandle,MethodHandle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "foldArguments", "(MethodHandle,int,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "foldArguments", "(MethodHandle,int,MethodHandle)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "insertArguments", "(MethodHandle,int,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "insertArguments", "(MethodHandle,int,Object[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "invoker", "(MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "permuteArguments", "(MethodHandle,MethodType,int[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "permuteArguments", "(MethodHandle,MethodType,int[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "varHandleExactInvoker", "(VarHandle$AccessMode,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", True, "varHandleInvoker", "(VarHandle$AccessMode,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(Class[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(Class[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "appendParameterTypes", "(List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "erase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,List)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "insertParameterTypes", "(int,List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,Class,Class[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,Class[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,List)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "methodType", "(Class,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "toMethodDescriptorString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "unwrap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MethodType", False, "wrap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "MutableCallSite", True, "MutableCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "MutableCallSite", True, "MutableCallSite", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "SerializedLambda", "(Class,String,String,String,int,String,String,String,String,Object[])", "", "Argument[9].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getCapturedArg", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getFunctionalInterfaceMethodSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getImplClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getImplMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getImplMethodSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", False, "getInstantiatedMethodType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "StringConcatException", True, "StringConcatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "StringConcatException", True, "StringConcatException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "StringConcatException", True, "StringConcatException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "StringConcatFactory", False, "makeConcat", "(MethodHandles$Lookup,String,MethodType)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "StringConcatFactory", False, "makeConcatWithConstants", "(MethodHandles$Lookup,String,MethodType,String,Object[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "SwitchPoint", True, "guardWithTest", "(MethodHandle,MethodHandle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "TypeDescriptor", True, "descriptorString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofArray", "(ClassDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofField", "(ClassDesc,String,ClassDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofField", "(ClassDesc,String,ClassDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofField", "(ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofStaticField", "(ClassDesc,String,ClassDesc)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofStaticField", "(ClassDesc,String,ClassDesc)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "ofStaticField", "(ClassDesc,String,ClassDesc)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$VarHandleDesc", False, "varType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", True, "accessModeType", "(VarHandle$AccessMode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", True, "coordinateTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", True, "toMethodHandle", "(VarHandle$AccessMode)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", True, "withInvokeBehavior", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", True, "withInvokeExactBehavior", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.invoke", "VolatileCallSite", True, "VolatileCallSite", "(MethodHandle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "VolatileCallSite", True, "VolatileCallSite", "(MethodType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.invoke", "WrongMethodTypeException", True, "WrongMethodTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.invoke", "CallSite", "setTarget", "(MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "arrayVarHandle", "(MethodHandles$Lookup,String,Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "enumConstant", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "fieldVarHandle", "(MethodHandles$Lookup,String,Class,Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "getStaticFinal", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "getStaticFinal", "(MethodHandles$Lookup,String,Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "invoke", "(MethodHandles$Lookup,String,Class,MethodHandle,Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "nullConstant", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "primitiveClass", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "ConstantBootstraps", "staticFieldVarHandle", "(MethodHandles$Lookup,String,Class,Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", "invoke", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", "invokeExact", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", "invokeWithArguments", "(List)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", "invokeWithArguments", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandle", "isVarargsCollector", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", "getDeclaringClass", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", "getModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", "getReferenceKind", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", "isVarArgs", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", "referenceKindToString", "(int)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleInfo", "reflectAs", "(Class,MethodHandles$Lookup)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleProxies", "asInterfaceInstance", "(Class,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleProxies", "isWrapperInstance", "(Object)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleProxies", "wrapperInstanceTarget", "(Object)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandleProxies", "wrapperInstanceType", "(Object)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "accessClass", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "defineClass", "(byte[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "defineHiddenClass", "(byte[],boolean,MethodHandles$Lookup$ClassOption[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "defineHiddenClassWithClassData", "(byte[],Object,boolean,MethodHandles$Lookup$ClassOption[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "ensureInitialized", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "findClass", "(String)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "findStaticVarHandle", "(Class,String,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "findVarHandle", "(Class,String,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "hasFullPrivilegeAccess", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "hasPrivateAccess", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "lookupClass", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "lookupModes", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "previousLookupClass", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles$Lookup", "unreflectVarHandle", "(Field)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "arrayConstructor", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "arrayElementGetter", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "arrayElementSetter", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "arrayElementVarHandle", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "arrayLength", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "byteArrayViewVarHandle", "(Class,ByteOrder)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "byteBufferViewVarHandle", "(Class,ByteOrder)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "catchException", "(MethodHandle,Class,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "classData", "(MethodHandles$Lookup,String,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "classDataAt", "(MethodHandles$Lookup,String,Class,int)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "countedLoop", "(MethodHandle,MethodHandle,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "countedLoop", "(MethodHandle,MethodHandle,MethodHandle,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "doWhileLoop", "(MethodHandle,MethodHandle,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "empty", "(MethodType)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "guardWithTest", "(MethodHandle,MethodHandle,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "identity", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "iteratedLoop", "(MethodHandle,MethodHandle,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "loop", "(MethodHandle[][])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "privateLookupIn", "(Class,MethodHandles$Lookup)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "publicLookup", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "reflectAs", "(Class,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "spreadInvoker", "(MethodType,int)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "tableSwitch", "(MethodHandle,MethodHandle[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "throwException", "(Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "tryFinally", "(MethodHandle,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "whileLoop", "(MethodHandle,MethodHandle,MethodHandle)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodHandles", "zero", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "fromMethodDescriptorString", "(String,ClassLoader)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "generic", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "genericMethodType", "(int)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "genericMethodType", "(int,boolean)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "hasPrimitives", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "hasWrappers", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "lastParameterType", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "methodType", "(Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MethodType", "methodType", "(Class,Class)", "summary", "df-generated"]
+      - ["java.lang.invoke", "MutableCallSite", "syncAll", "(MutableCallSite[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", "getCapturedArgCount", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", "getCapturingClass", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "SerializedLambda", "getImplMethodKind", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "SwitchPoint", "hasBeenInvalidated", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "SwitchPoint", "invalidateAll", "(SwitchPoint[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$AccessMode", "methodName", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle$AccessMode", "valueFromMethodName", "(String)", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "acquireFence", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "compareAndExchange", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "compareAndExchangeAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "compareAndExchangeRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "compareAndSet", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "fullFence", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "get", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndAdd", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndAddAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndAddRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseAnd", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseAndAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseAndRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseOr", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseOrAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseOrRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseXor", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseXorAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndBitwiseXorRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndSet", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndSetAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getAndSetRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getOpaque", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "getVolatile", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "hasInvokeExactBehavior", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "isAccessModeSupported", "(VarHandle$AccessMode)", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "loadLoadFence", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "releaseFence", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "set", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "setOpaque", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "setRelease", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "setVolatile", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "storeStoreFence", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "varType", "()", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "weakCompareAndSet", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "weakCompareAndSetAcquire", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "weakCompareAndSetPlain", "(Object[])", "summary", "df-generated"]
+      - ["java.lang.invoke", "VarHandle", "weakCompareAndSetRelease", "(Object[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.management.model.yml b/java/ql/lib/ext/generated/java.lang.management.model.yml
new file mode 100644
index 00000000000..6fd0dea3597
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.management.model.yml
@@ -0,0 +1,71 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.management", "LockInfo", True, "LockInfo", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "LockInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "LockInfo", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ManagementPermission", False, "ManagementPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "ManagementPermission", False, "ManagementPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "MemoryNotificationInfo", "(String,MemoryUsage,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "MemoryNotificationInfo", "(String,MemoryUsage,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "getPoolName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", True, "getUsage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MemoryUsage", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MonitorInfo", True, "MonitorInfo", "(String,int,int,StackTraceElement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "MonitorInfo", True, "MonitorInfo", "(String,int,int,StackTraceElement)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.management", "MonitorInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "MonitorInfo", True, "getLockedStackFrame", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "from", "(CompositeData)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "getLockInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "getLockName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "getLockOwnerName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "getLockedMonitors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "getLockedSynchronizers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "getStackTrace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", True, "getThreadName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.management", "LockInfo", "getIdentityHashCode", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getClassLoadingMXBean", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getCompilationMXBean", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getGarbageCollectorMXBeans", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getMemoryMXBean", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getMemoryManagerMXBeans", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getMemoryPoolMXBeans", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getOperatingSystemMXBean", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getPlatformMBeanServer", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getPlatformMXBean", "(Class)", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getPlatformMXBean", "(MBeanServerConnection,Class)", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getPlatformMXBeans", "(Class)", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getPlatformMXBeans", "(MBeanServerConnection,Class)", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getPlatformManagementInterfaces", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getRuntimeMXBean", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "getThreadMXBean", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ManagementFactory", "newPlatformMXBeanProxy", "(MBeanServerConnection,String,Class)", "summary", "df-generated"]
+      - ["java.lang.management", "MemoryNotificationInfo", "getCount", "()", "summary", "df-generated"]
+      - ["java.lang.management", "MemoryUsage", "MemoryUsage", "(long,long,long,long)", "summary", "df-generated"]
+      - ["java.lang.management", "MemoryUsage", "getCommitted", "()", "summary", "df-generated"]
+      - ["java.lang.management", "MemoryUsage", "getInit", "()", "summary", "df-generated"]
+      - ["java.lang.management", "MemoryUsage", "getMax", "()", "summary", "df-generated"]
+      - ["java.lang.management", "MemoryUsage", "getUsed", "()", "summary", "df-generated"]
+      - ["java.lang.management", "MonitorInfo", "getLockedStackDepth", "()", "summary", "df-generated"]
+      - ["java.lang.management", "RuntimeMXBean", "getPid", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getBlockedCount", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getBlockedTime", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getLockOwnerId", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getPriority", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getThreadId", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getThreadState", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getWaitedCount", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "getWaitedTime", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "isDaemon", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "isInNative", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadInfo", "isSuspended", "()", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadMXBean", "dumpAllThreads", "(boolean,boolean,int)", "summary", "df-generated"]
+      - ["java.lang.management", "ThreadMXBean", "getThreadInfo", "(long[],boolean,boolean,int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.model.yml b/java/ql/lib/ext/generated/java.lang.model.yml
new file mode 100644
index 00000000000..c8af5bdc004
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.model.yml
@@ -0,0 +1,977 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang", "AbstractMethodError", True, "AbstractMethodError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", True, "appendCodePoint", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", True, "deleteCharAt", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ArithmeticException", True, "ArithmeticException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ArrayIndexOutOfBoundsException", True, "ArrayIndexOutOfBoundsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ArrayStoreException", True, "ArrayStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "AssertionError", True, "AssertionError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "AssertionError", True, "AssertionError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "BootstrapMethodError", True, "BootstrapMethodError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "BootstrapMethodError", True, "BootstrapMethodError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "BootstrapMethodError", True, "BootstrapMethodError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "BootstrapMethodError", True, "BootstrapMethodError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "CharSequence", True, "chars", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "CharSequence", True, "codePoints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Class", False, "getNestHost", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ClassCastException", True, "ClassCastException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassCircularityError", True, "ClassCircularityError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassFormatError", True, "ClassFormatError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "findResource", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "getDefinedPackage", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "getDefinedPackage", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "getSystemResource", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "getUnnamedModule", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "loadClass", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "loadClass", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "setClassAssertionStatus", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassLoader", True, "setPackageAssertionStatus", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ClassNotFoundException", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ClassValue", True, "get", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "CloneNotSupportedException", True, "CloneNotSupportedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Enum$EnumDesc", False, "of", "(ClassDesc,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Enum$EnumDesc", False, "of", "(ClassDesc,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "EnumConstantNotPresentException", True, "EnumConstantNotPresentException", "(Class,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "EnumConstantNotPresentException", True, "constantName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Error", True, "Error", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Error", True, "Error", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Error", True, "Error", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Error", True, "Error", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ExceptionInInitializerError", True, "ExceptionInInitializerError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ExceptionInInitializerError", True, "ExceptionInInitializerError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ExceptionInInitializerError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "IllegalAccessError", True, "IllegalAccessError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalAccessException", True, "IllegalAccessException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalArgumentException", True, "IllegalArgumentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalArgumentException", True, "IllegalArgumentException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalArgumentException", True, "IllegalArgumentException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalCallerException", True, "IllegalCallerException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalCallerException", True, "IllegalCallerException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalCallerException", True, "IllegalCallerException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalCallerException", True, "IllegalCallerException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalMonitorStateException", True, "IllegalMonitorStateException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalStateException", True, "IllegalStateException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalStateException", True, "IllegalStateException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalStateException", True, "IllegalStateException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IllegalThreadStateException", True, "IllegalThreadStateException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "IncompatibleClassChangeError", True, "IncompatibleClassChangeError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "InstantiationError", True, "InstantiationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "InstantiationException", True, "InstantiationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "InternalError", True, "InternalError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "InternalError", True, "InternalError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "InternalError", True, "InternalError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "InternalError", True, "InternalError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "InterruptedException", True, "InterruptedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "LayerInstantiationException", True, "LayerInstantiationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "LayerInstantiationException", True, "LayerInstantiationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "LayerInstantiationException", True, "LayerInstantiationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "LayerInstantiationException", True, "LayerInstantiationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "LinkageError", True, "LinkageError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "LinkageError", True, "LinkageError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "LinkageError", True, "LinkageError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Module", False, "addExports", "(String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Module", False, "addOpens", "(String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Module", False, "addReads", "(Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Module", False, "addUses", "(Class)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Module", False, "getClassLoader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Module", False, "getDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Module", False, "getLayer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Module", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Module", False, "getPackages", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer$Controller", False, "addExports", "(Module,String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ModuleLayer$Controller", False, "addOpens", "(Module,String,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ModuleLayer$Controller", False, "addReads", "(Module,Module)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ModuleLayer$Controller", False, "layer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "configuration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,List,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModules", "(Configuration,List,Function)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,ClassLoader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,List,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithManyLoaders", "(Configuration,List,ClassLoader)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,ClassLoader)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,List,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "defineModulesWithOneLoader", "(Configuration,List,ClassLoader)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "findLoader", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "findModule", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "modules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ModuleLayer", False, "parents", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "NegativeArraySizeException", True, "NegativeArraySizeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "NoClassDefFoundError", True, "NoClassDefFoundError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "NoSuchFieldError", True, "NoSuchFieldError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "NoSuchFieldException", True, "NoSuchFieldException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "NoSuchMethodError", True, "NoSuchMethodError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "NoSuchMethodException", True, "NoSuchMethodException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "NumberFormatException", True, "NumberFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "OutOfMemoryError", True, "OutOfMemoryError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getImplementationTitle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getImplementationVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getImplementationVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getPackage", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getSpecificationTitle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getSpecificationVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Package", True, "getSpecificationVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "destroyForcibly", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "Process", True, "errorReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "errorReader", "(Charset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "getErrorStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "getInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "inputReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "inputReader", "(Charset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "outputWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "outputWriter", "(Charset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Process", True, "toHandle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "ProcessBuilder", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "ProcessBuilder", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(List)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "command", "(String[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "directory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "directory", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "directory", "(File)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "inheritIO", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectError", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectErrorStream", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectInput", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(ProcessBuilder$Redirect)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ProcessBuilder", False, "redirectOutput", "(ProcessBuilder$Redirect)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang", "ProcessHandle$Info", True, "arguments", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessHandle$Info", True, "command", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessHandle$Info", True, "commandLine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ProcessHandle$Info", True, "user", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ReflectiveOperationException", True, "ReflectiveOperationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Runtime$Version", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Runtime$Version", False, "optional", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Runtime$Version", False, "pre", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "RuntimePermission", False, "RuntimePermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "RuntimePermission", False, "RuntimePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "SecurityException", True, "SecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "SecurityException", True, "SecurityException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "SecurityException", True, "SecurityException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "SecurityException", True, "SecurityException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackOverflowError", True, "StackOverflowError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,String,String,String,int)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "StackTraceElement", "(String,String,String,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "getClassLoaderName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "getFileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "getMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "getModuleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackTraceElement", False, "getModuleVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", True, "getDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", True, "getFileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", True, "getMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", True, "getMethodType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", True, "toStackTraceElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackWalker", False, "getInstance", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StackWalker", False, "getInstance", "(Set,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "String", False, "lines", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "StringIndexOutOfBoundsException", True, "StringIndexOutOfBoundsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System", False, "getLogger", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System", False, "getProperty", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System", False, "setProperty", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "System", False, "setProperty", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable,String,long,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "getThreadGroup", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "getUncaughtExceptionHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "setContextClassLoader", "(ClassLoader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "Thread", True, "setUncaughtExceptionHandler", "(Thread$UncaughtExceptionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "ThreadGroup", "(ThreadGroup,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "enumerate", "(ThreadGroup[])", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "enumerate", "(ThreadGroup[],boolean)", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "enumerate", "(Thread[])", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "enumerate", "(Thread[],boolean)", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "ThreadGroup", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Throwable", True, "fillInStackTrace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "Throwable", True, "printStackTrace", "(PrintWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "TypeNotPresentException", True, "typeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang", "UnknownError", True, "UnknownError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "UnsatisfiedLinkError", True, "UnsatisfiedLinkError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "UnsupportedClassVersionError", True, "UnsupportedClassVersionError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "UnsupportedOperationException", True, "UnsupportedOperationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "UnsupportedOperationException", True, "UnsupportedOperationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "UnsupportedOperationException", True, "UnsupportedOperationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "VerifyError", True, "VerifyError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "VirtualMachineError", True, "VirtualMachineError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "VirtualMachineError", True, "VirtualMachineError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "VirtualMachineError", True, "VirtualMachineError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang", "VirtualMachineError", True, "VirtualMachineError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang", "AbstractStringBuilder", "capacity", "()", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "codePointAt", "(int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "codePointBefore", "(int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "codePointCount", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "ensureCapacity", "(int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "indexOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "indexOf", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "lastIndexOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "lastIndexOf", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "offsetByCodePoints", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "setCharAt", "(int,char)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "setLength", "(int)", "summary", "df-generated"]
+      - ["java.lang", "AbstractStringBuilder", "trimToSize", "()", "summary", "df-generated"]
+      - ["java.lang", "ArrayIndexOutOfBoundsException", "ArrayIndexOutOfBoundsException", "(int)", "summary", "df-generated"]
+      - ["java.lang", "AssertionError", "AssertionError", "(boolean)", "summary", "df-generated"]
+      - ["java.lang", "AssertionError", "AssertionError", "(char)", "summary", "df-generated"]
+      - ["java.lang", "AssertionError", "AssertionError", "(double)", "summary", "df-generated"]
+      - ["java.lang", "AssertionError", "AssertionError", "(float)", "summary", "df-generated"]
+      - ["java.lang", "AssertionError", "AssertionError", "(int)", "summary", "df-generated"]
+      - ["java.lang", "AssertionError", "AssertionError", "(long)", "summary", "df-generated"]
+      - ["java.lang", "AutoCloseable", "close", "()", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "Boolean", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "Boolean", "(boolean)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "compare", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "getBoolean", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "hashCode", "(boolean)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "logicalAnd", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "logicalOr", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "logicalXor", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.lang", "Boolean", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "Byte", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "Byte", "(byte)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "compare", "(byte,byte)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "compareUnsigned", "(byte,byte)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "decode", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "hashCode", "(byte)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "parseByte", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "parseByte", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "toUnsignedInt", "(byte)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "toUnsignedLong", "(byte)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "valueOf", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Byte", "valueOf", "(byte)", "summary", "df-generated"]
+      - ["java.lang", "CharSequence", "compare", "(CharSequence,CharSequence)", "summary", "df-generated"]
+      - ["java.lang", "CharSequence", "isEmpty", "()", "summary", "df-generated"]
+      - ["java.lang", "CharSequence", "length", "()", "summary", "df-generated"]
+      - ["java.lang", "Character$UnicodeBlock", "forName", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Character$UnicodeBlock", "of", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character$UnicodeBlock", "of", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character$UnicodeScript", "forName", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Character$UnicodeScript", "of", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "Character", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "charCount", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "charValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointAt", "(CharSequence,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointAt", "(char[],int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointAt", "(char[],int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointBefore", "(CharSequence,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointBefore", "(char[],int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointBefore", "(char[],int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointCount", "(CharSequence,int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointCount", "(char[],int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "codePointOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Character", "compare", "(char,char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "digit", "(char,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "digit", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "forDigit", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "getDirectionality", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "getDirectionality", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "getName", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "getNumericValue", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "getNumericValue", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "getType", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "getType", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "hashCode", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "highSurrogate", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isAlphabetic", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isBmpCodePoint", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isDefined", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isDefined", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isDigit", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isDigit", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isHighSurrogate", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isISOControl", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isISOControl", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isIdentifierIgnorable", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isIdentifierIgnorable", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isIdeographic", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isJavaIdentifierPart", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isJavaIdentifierPart", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isJavaIdentifierStart", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isJavaIdentifierStart", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isJavaLetter", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isJavaLetterOrDigit", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isLetter", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isLetter", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isLetterOrDigit", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isLetterOrDigit", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isLowSurrogate", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isLowerCase", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isLowerCase", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isMirrored", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isMirrored", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isSpace", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isSpaceChar", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isSpaceChar", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isSupplementaryCodePoint", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isSurrogate", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isSurrogatePair", "(char,char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isTitleCase", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isTitleCase", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isUnicodeIdentifierPart", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isUnicodeIdentifierPart", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isUnicodeIdentifierStart", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isUnicodeIdentifierStart", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isUpperCase", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isUpperCase", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isValidCodePoint", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isWhitespace", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "isWhitespace", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "lowSurrogate", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "offsetByCodePoints", "(CharSequence,int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "offsetByCodePoints", "(char[],int,int,int,int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "reverseBytes", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toChars", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toChars", "(int,char[],int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toCodePoint", "(char,char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toLowerCase", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toLowerCase", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toTitleCase", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toTitleCase", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toUpperCase", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Character", "toUpperCase", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Character", "valueOf", "(char)", "summary", "df-generated"]
+      - ["java.lang", "Class", "asSubclass", "(Class)", "summary", "df-generated"]
+      - ["java.lang", "Class", "desiredAssertionStatus", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "forName", "(Module,String)", "summary", "df-generated"]
+      - ["java.lang", "Class", "forName", "(String,boolean,ClassLoader)", "summary", "df-generated"]
+      - ["java.lang", "Class", "getAnnotatedInterfaces", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getAnnotatedSuperclass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getClasses", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getComponentType", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getConstructor", "(Class[])", "summary", "df-generated"]
+      - ["java.lang", "Class", "getConstructors", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getDeclaredClasses", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getDeclaredConstructors", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getDeclaredFields", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getDeclaredMethod", "(String,Class[])", "summary", "df-generated"]
+      - ["java.lang", "Class", "getDeclaredMethods", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getDeclaringClass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getEnclosingClass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getEnclosingConstructor", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getEnclosingMethod", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getEnumConstants", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getField", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Class", "getFields", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getGenericInterfaces", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getGenericSuperclass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getInterfaces", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getMethods", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getModifiers", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getModule", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getNestMembers", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getPackage", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getPackageName", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getPermittedSubclasses", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getProtectionDomain", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getRecordComponents", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getSigners", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "getSuperclass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isAnnotation", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isAnonymousClass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isEnum", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isHidden", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isInterface", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isLocalClass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isMemberClass", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isNestmateOf", "(Class)", "summary", "df-generated"]
+      - ["java.lang", "Class", "isRecord", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isSealed", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "isSynthetic", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "newInstance", "()", "summary", "df-generated"]
+      - ["java.lang", "Class", "toGenericString", "()", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "clearAssertionStatus", "()", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "findResources", "(String)", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "getDefinedPackages", "()", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "getPlatformClassLoader", "()", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "getResourceAsStream", "(String)", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "getResources", "(String)", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "getSystemClassLoader", "()", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "getSystemResourceAsStream", "(String)", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "getSystemResources", "(String)", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "isRegisteredAsParallelCapable", "()", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "resources", "(String)", "summary", "df-generated"]
+      - ["java.lang", "ClassLoader", "setDefaultAssertionStatus", "(boolean)", "summary", "df-generated"]
+      - ["java.lang", "ClassValue", "remove", "(Class)", "summary", "df-generated"]
+      - ["java.lang", "Compiler", "command", "(Object)", "summary", "df-generated"]
+      - ["java.lang", "Compiler", "compileClass", "(Class)", "summary", "df-generated"]
+      - ["java.lang", "Compiler", "compileClasses", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Compiler", "disable", "()", "summary", "df-generated"]
+      - ["java.lang", "Compiler", "enable", "()", "summary", "df-generated"]
+      - ["java.lang", "Double", "Double", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Double", "Double", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "compare", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "doubleToRawLongBits", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "hashCode", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "isFinite", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "isInfinite", "()", "summary", "df-generated"]
+      - ["java.lang", "Double", "isInfinite", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "isNaN", "()", "summary", "df-generated"]
+      - ["java.lang", "Double", "isNaN", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "longBitsToDouble", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Double", "max", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "min", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "sum", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "toHexString", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Double", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Enum", "getDeclaringClass", "()", "summary", "df-generated"]
+      - ["java.lang", "Enum", "valueOf", "(Class,String)", "summary", "df-generated"]
+      - ["java.lang", "EnumConstantNotPresentException", "enumType", "()", "summary", "df-generated"]
+      - ["java.lang", "FdLibm$Cbrt", "compute", "(double)", "summary", "df-generated"]
+      - ["java.lang", "FdLibm$Hypot", "compute", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "FdLibm$Pow", "compute", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Float", "Float", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Float", "Float", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Float", "Float", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "compare", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "floatToIntBits", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "floatToRawIntBits", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "hashCode", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "intBitsToFloat", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Float", "isFinite", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "isInfinite", "()", "summary", "df-generated"]
+      - ["java.lang", "Float", "isInfinite", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "isNaN", "()", "summary", "df-generated"]
+      - ["java.lang", "Float", "isNaN", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "max", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "min", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "parseFloat", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Float", "sum", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "toHexString", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Float", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Float", "valueOf", "(float)", "summary", "df-generated"]
+      - ["java.lang", "IndexOutOfBoundsException", "IndexOutOfBoundsException", "(int)", "summary", "df-generated"]
+      - ["java.lang", "IndexOutOfBoundsException", "IndexOutOfBoundsException", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "Integer", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "bitCount", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "compare", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "compareUnsigned", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "decode", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "divideUnsigned", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "getInteger", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "getInteger", "(String,Integer)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "getInteger", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "hashCode", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "highestOneBit", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "lowestOneBit", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "max", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "min", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "numberOfLeadingZeros", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "numberOfTrailingZeros", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "parseInt", "(CharSequence,int,int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "parseInt", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "parseUnsignedInt", "(CharSequence,int,int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "parseUnsignedInt", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "parseUnsignedInt", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "remainderUnsigned", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "reverse", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "reverseBytes", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "rotateLeft", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "rotateRight", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "signum", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "sum", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "toBinaryString", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "toOctalString", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "toUnsignedLong", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "toUnsignedString", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Integer", "toUnsignedString", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "LiveStackFrame$PrimitiveSlot", "intValue", "()", "summary", "df-generated"]
+      - ["java.lang", "LiveStackFrame$PrimitiveSlot", "longValue", "()", "summary", "df-generated"]
+      - ["java.lang", "LiveStackFrame$PrimitiveSlot", "size", "()", "summary", "df-generated"]
+      - ["java.lang", "Long", "Long", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Long", "bitCount", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "compare", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "compareUnsigned", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "decode", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Long", "divideUnsigned", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "getLong", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Long", "getLong", "(String,Long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "getLong", "(String,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "hashCode", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "highestOneBit", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "lowestOneBit", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "max", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "min", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "numberOfLeadingZeros", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "numberOfTrailingZeros", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "parseLong", "(CharSequence,int,int,int)", "summary", "df-generated"]
+      - ["java.lang", "Long", "parseLong", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Long", "parseUnsignedLong", "(CharSequence,int,int,int)", "summary", "df-generated"]
+      - ["java.lang", "Long", "parseUnsignedLong", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Long", "parseUnsignedLong", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Long", "remainderUnsigned", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "reverse", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "reverseBytes", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "rotateLeft", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Long", "rotateRight", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Long", "signum", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "sum", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "toBinaryString", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "toHexString", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "toOctalString", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "toUnsignedString", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Long", "toUnsignedString", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "IEEEremainder", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "abs", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "abs", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "abs", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "abs", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "absExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "absExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "acos", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "addExact", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "addExact", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "asin", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "atan2", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "atan", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "cbrt", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "ceil", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "copySign", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "copySign", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "cos", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "cosh", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "decrementExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "decrementExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "exp", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "expm1", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "floor", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "floorDiv", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "floorDiv", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "floorDiv", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "floorMod", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "floorMod", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "floorMod", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "fma", "(double,double,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "fma", "(float,float,float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "getExponent", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "getExponent", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "hypot", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "incrementExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "incrementExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "log10", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "log1p", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "log", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "multiplyExact", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "multiplyExact", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "multiplyExact", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "multiplyFull", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "multiplyHigh", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "negateExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "negateExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "nextAfter", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "nextAfter", "(float,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "nextDown", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "nextDown", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "nextUp", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "nextUp", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "pow", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "random", "()", "summary", "df-generated"]
+      - ["java.lang", "Math", "rint", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "round", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "round", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "scalb", "(double,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "scalb", "(float,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "signum", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "signum", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Math", "sin", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "sinh", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "sqrt", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "subtractExact", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "Math", "subtractExact", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "tan", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "tanh", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "toDegrees", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "toIntExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Math", "toRadians", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "ulp", "(double)", "summary", "df-generated"]
+      - ["java.lang", "Math", "ulp", "(float)", "summary", "df-generated"]
+      - ["java.lang", "Module", "canRead", "(Module)", "summary", "df-generated"]
+      - ["java.lang", "Module", "canUse", "(Class)", "summary", "df-generated"]
+      - ["java.lang", "Module", "getResourceAsStream", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Module", "isExported", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Module", "isExported", "(String,Module)", "summary", "df-generated"]
+      - ["java.lang", "Module", "isNamed", "()", "summary", "df-generated"]
+      - ["java.lang", "Module", "isOpen", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Module", "isOpen", "(String,Module)", "summary", "df-generated"]
+      - ["java.lang", "ModuleLayer", "boot", "()", "summary", "df-generated"]
+      - ["java.lang", "ModuleLayer", "empty", "()", "summary", "df-generated"]
+      - ["java.lang", "Number", "byteValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Number", "doubleValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Number", "floatValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Number", "intValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Number", "longValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Number", "shortValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Object", "equals", "(Object)", "summary", "df-generated"]
+      - ["java.lang", "Object", "finalize", "()", "summary", "df-generated"]
+      - ["java.lang", "Object", "hashCode", "()", "summary", "df-generated"]
+      - ["java.lang", "Object", "notify", "()", "summary", "df-generated"]
+      - ["java.lang", "Object", "notifyAll", "()", "summary", "df-generated"]
+      - ["java.lang", "Object", "wait", "()", "summary", "df-generated"]
+      - ["java.lang", "Object", "wait", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Object", "wait", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Package", "getPackages", "()", "summary", "df-generated"]
+      - ["java.lang", "Package", "isCompatibleWith", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Package", "isSealed", "()", "summary", "df-generated"]
+      - ["java.lang", "Package", "isSealed", "(URL)", "summary", "df-generated"]
+      - ["java.lang", "Process", "children", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "descendants", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "destroy", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "exitValue", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "info", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "isAlive", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "onExit", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "pid", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "supportsNormalTermination", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "waitFor", "()", "summary", "df-generated"]
+      - ["java.lang", "Process", "waitFor", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder$Redirect", "appendTo", "(File)", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder$Redirect", "file", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder$Redirect", "from", "(File)", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder$Redirect", "to", "(File)", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder$Redirect", "type", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder", "redirectErrorStream", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder", "start", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessBuilder", "startPipeline", "(List)", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle$Info", "startInstant", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle$Info", "totalCpuDuration", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "allProcesses", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "children", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "current", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "descendants", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "destroy", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "destroyForcibly", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "info", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "isAlive", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "of", "(long)", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "onExit", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "parent", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "pid", "()", "summary", "df-generated"]
+      - ["java.lang", "ProcessHandle", "supportsNormalTermination", "()", "summary", "df-generated"]
+      - ["java.lang", "Readable", "read", "(CharBuffer)", "summary", "df-generated"]
+      - ["java.lang", "Runnable", "run", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "compareToIgnoreOptional", "(Runtime$Version)", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "equalsIgnoreOptional", "(Object)", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "feature", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "interim", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "major", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "minor", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "parse", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "patch", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "security", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "update", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime$Version", "version", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "addShutdownHook", "(Thread)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "availableProcessors", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "exec", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "exec", "(String,String[])", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "exec", "(String,String[],File)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "exec", "(String[])", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "exec", "(String[],String[])", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "exec", "(String[],String[],File)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "exit", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "freeMemory", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "gc", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "halt", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "load", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "loadLibrary", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "maxMemory", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "removeShutdownHook", "(Thread)", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "runFinalization", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "totalMemory", "()", "summary", "df-generated"]
+      - ["java.lang", "Runtime", "version", "()", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkAccept", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkAccess", "(Thread)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkAccess", "(ThreadGroup)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkConnect", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkConnect", "(String,int,Object)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkCreateClassLoader", "()", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkDelete", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkExec", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkExit", "(int)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkLink", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkListen", "(int)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkMulticast", "(InetAddress)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkMulticast", "(InetAddress,byte)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkPackageAccess", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkPackageDefinition", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkPermission", "(Permission)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkPermission", "(Permission,Object)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkPrintJobAccess", "()", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkPropertiesAccess", "()", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkPropertyAccess", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkRead", "(FileDescriptor)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkRead", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkRead", "(String,Object)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkSecurityAccess", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkSetFactory", "()", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkWrite", "(FileDescriptor)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "checkWrite", "(String)", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "getSecurityContext", "()", "summary", "df-generated"]
+      - ["java.lang", "SecurityManager", "getThreadGroup", "()", "summary", "df-generated"]
+      - ["java.lang", "Short", "Short", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Short", "Short", "(short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "compare", "(short,short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "compareUnsigned", "(short,short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "decode", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Short", "hashCode", "(short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "parseShort", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Short", "parseShort", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Short", "reverseBytes", "(short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "toUnsignedInt", "(short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "toUnsignedLong", "(short)", "summary", "df-generated"]
+      - ["java.lang", "Short", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.lang", "Short", "valueOf", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "Short", "valueOf", "(short)", "summary", "df-generated"]
+      - ["java.lang", "StackTraceElement", "getLineNumber", "()", "summary", "df-generated"]
+      - ["java.lang", "StackTraceElement", "isNativeMethod", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", "getByteCodeIndex", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", "getClassName", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", "getDeclaringClass", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", "getLineNumber", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker$StackFrame", "isNativeMethod", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker", "forEach", "(Consumer)", "summary", "df-generated"]
+      - ["java.lang", "StackWalker", "getCallerClass", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker", "getInstance", "()", "summary", "df-generated"]
+      - ["java.lang", "StackWalker", "getInstance", "(StackWalker$Option)", "summary", "df-generated"]
+      - ["java.lang", "StackWalker", "walk", "(Function)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "IEEEremainder", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "abs", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "abs", "(float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "abs", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "abs", "(long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "absExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "absExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "acos", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "addExact", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "addExact", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "asin", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "atan2", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "atan", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "cbrt", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "ceil", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "copySign", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "copySign", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "cos", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "cosh", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "decrementExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "decrementExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "exp", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "expm1", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "floor", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "floorDiv", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "floorDiv", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "floorDiv", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "floorMod", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "floorMod", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "floorMod", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "fma", "(double,double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "fma", "(float,float,float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "getExponent", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "getExponent", "(float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "hypot", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "incrementExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "incrementExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "log10", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "log1p", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "log", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "max", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "max", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "max", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "max", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "min", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "min", "(float,float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "min", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "min", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "multiplyExact", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "multiplyExact", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "multiplyExact", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "multiplyFull", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "multiplyHigh", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "negateExact", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "negateExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "nextAfter", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "nextAfter", "(float,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "nextDown", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "nextDown", "(float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "nextUp", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "nextUp", "(float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "pow", "(double,double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "random", "()", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "rint", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "round", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "round", "(float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "scalb", "(double,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "scalb", "(float,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "signum", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "signum", "(float)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "sin", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "sinh", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "sqrt", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "subtractExact", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "subtractExact", "(long,long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "tan", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "tanh", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "toDegrees", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "toIntExact", "(long)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "toRadians", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "ulp", "(double)", "summary", "df-generated"]
+      - ["java.lang", "StrictMath", "ulp", "(float)", "summary", "df-generated"]
+      - ["java.lang", "String", "codePointAt", "(int)", "summary", "df-generated"]
+      - ["java.lang", "String", "codePointBefore", "(int)", "summary", "df-generated"]
+      - ["java.lang", "String", "codePointCount", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "compareToIgnoreCase", "(String)", "summary", "df-generated"]
+      - ["java.lang", "String", "contentEquals", "(CharSequence)", "summary", "df-generated"]
+      - ["java.lang", "String", "contentEquals", "(StringBuffer)", "summary", "df-generated"]
+      - ["java.lang", "String", "indexOf", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "indexOf", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "isBlank", "()", "summary", "df-generated"]
+      - ["java.lang", "String", "lastIndexOf", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "lastIndexOf", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "matches", "(String)", "summary", "df-generated"]
+      - ["java.lang", "String", "offsetByCodePoints", "(int,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "regionMatches", "(boolean,int,String,int,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "regionMatches", "(int,String,int,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "startsWith", "(String,int)", "summary", "df-generated"]
+      - ["java.lang", "String", "transform", "(Function)", "summary", "df-generated"]
+      - ["java.lang", "String", "valueOf", "(double)", "summary", "df-generated"]
+      - ["java.lang", "String", "valueOf", "(float)", "summary", "df-generated"]
+      - ["java.lang", "StringBuffer", "StringBuffer", "(int)", "summary", "df-generated"]
+      - ["java.lang", "StringIndexOutOfBoundsException", "StringIndexOutOfBoundsException", "(int)", "summary", "df-generated"]
+      - ["java.lang", "System$Logger$Level", "getName", "()", "summary", "df-generated"]
+      - ["java.lang", "System$Logger$Level", "getSeverity", "()", "summary", "df-generated"]
+      - ["java.lang", "System$Logger", "log", "(System$Logger$Level,Object)", "summary", "df-generated"]
+      - ["java.lang", "System$Logger", "log", "(System$Logger$Level,String)", "summary", "df-generated"]
+      - ["java.lang", "System$Logger", "log", "(System$Logger$Level,String,Object[])", "summary", "df-generated"]
+      - ["java.lang", "System$Logger", "log", "(System$Logger$Level,String,Throwable)", "summary", "df-generated"]
+      - ["java.lang", "System$Logger", "log", "(System$Logger$Level,Supplier)", "summary", "df-generated"]
+      - ["java.lang", "System$Logger", "log", "(System$Logger$Level,Supplier,Throwable)", "summary", "df-generated"]
+      - ["java.lang", "System$LoggerFinder", "getLogger", "(String,Module)", "summary", "df-generated"]
+      - ["java.lang", "System$LoggerFinder", "getLoggerFinder", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "clearProperty", "(String)", "summary", "df-generated"]
+      - ["java.lang", "System", "console", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "gc", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "getProperties", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "getProperty", "(String)", "summary", "df-generated"]
+      - ["java.lang", "System", "getSecurityManager", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "getenv", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "inheritedChannel", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "load", "(String)", "summary", "df-generated"]
+      - ["java.lang", "System", "loadLibrary", "(String)", "summary", "df-generated"]
+      - ["java.lang", "System", "mapLibraryName", "(String)", "summary", "df-generated"]
+      - ["java.lang", "System", "runFinalization", "()", "summary", "df-generated"]
+      - ["java.lang", "System", "setErr", "(PrintStream)", "summary", "df-generated"]
+      - ["java.lang", "System", "setIn", "(InputStream)", "summary", "df-generated"]
+      - ["java.lang", "System", "setOut", "(PrintStream)", "summary", "df-generated"]
+      - ["java.lang", "System", "setProperties", "(Properties)", "summary", "df-generated"]
+      - ["java.lang", "System", "setSecurityManager", "(SecurityManager)", "summary", "df-generated"]
+      - ["java.lang", "Thread$UncaughtExceptionHandler", "uncaughtException", "(Thread,Throwable)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "activeCount", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "checkAccess", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "countStackFrames", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "dumpStack", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "enumerate", "(Thread[])", "summary", "df-generated"]
+      - ["java.lang", "Thread", "getAllStackTraces", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "getDefaultUncaughtExceptionHandler", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "getId", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "getPriority", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "getStackTrace", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "getState", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "holdsLock", "(Object)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "interrupted", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "isAlive", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "isDaemon", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "isInterrupted", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "join", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "join", "(long)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "join", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "onSpinWait", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "resume", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "setDaemon", "(boolean)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "setDefaultUncaughtExceptionHandler", "(Thread$UncaughtExceptionHandler)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "setPriority", "(int)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "sleep", "(long,int)", "summary", "df-generated"]
+      - ["java.lang", "Thread", "stop", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "suspend", "()", "summary", "df-generated"]
+      - ["java.lang", "Thread", "yield", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "activeCount", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "activeGroupCount", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "allowThreadSuspension", "(boolean)", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "checkAccess", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "destroy", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "getMaxPriority", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "interrupt", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "isDaemon", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "isDestroyed", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "list", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "parentOf", "(ThreadGroup)", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "resume", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "setDaemon", "(boolean)", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "setMaxPriority", "(int)", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "stop", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadGroup", "suspend", "()", "summary", "df-generated"]
+      - ["java.lang", "ThreadLocal", "remove", "()", "summary", "df-generated"]
+      - ["java.lang", "Throwable", "printStackTrace", "()", "summary", "df-generated"]
+      - ["java.lang", "Throwable", "printStackTrace", "(PrintStream)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.module.model.yml b/java/ql/lib/ext/generated/java.lang.module.model.yml
new file mode 100644
index 00000000000..99377e90986
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.module.model.yml
@@ -0,0 +1,130 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.module", "Configuration", False, "findModule", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "Configuration", False, "modules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "Configuration", False, "parents", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "Configuration", False, "resolve", "(ModuleFinder,List,ModuleFinder,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "Configuration", False, "resolve", "(ModuleFinder,ModuleFinder,Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "Configuration", False, "resolveAndBind", "(ModuleFinder,List,ModuleFinder,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "Configuration", False, "resolveAndBind", "(ModuleFinder,ModuleFinder,Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "FindException", True, "FindException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "FindException", True, "FindException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "FindException", True, "FindException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "FindException", True, "FindException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "InvalidModuleDescriptorException", True, "InvalidModuleDescriptorException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(ModuleDescriptor$Exports)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(ModuleDescriptor$Exports)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String,Set)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(Set,String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String,Set)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "exports", "(String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "mainClass", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "mainClass", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(ModuleDescriptor$Opens)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(ModuleDescriptor$Opens)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String,Set)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(Set,String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String,Set)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "opens", "(String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "packages", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "packages", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(ModuleDescriptor$Provides)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(ModuleDescriptor$Provides)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(String,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(String,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "provides", "(String,List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(ModuleDescriptor$Requires)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(ModuleDescriptor$Requires)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(Set,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "requires", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "uses", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "uses", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(ModuleDescriptor$Version)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(ModuleDescriptor$Version)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Builder", False, "version", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Exports", False, "modifiers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Exports", False, "source", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Exports", False, "targets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Opens", False, "modifiers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Opens", False, "source", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Opens", False, "targets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Provides", False, "providers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Provides", False, "service", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Requires", False, "compiledVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Requires", False, "modifiers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Requires", False, "name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Requires", False, "rawCompiledVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Version", False, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "exports", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "mainClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "modifiers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "newAutomaticModule", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "newModule", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "newModule", "(String,Set)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "newModule", "(String,Set)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "newOpenModule", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "opens", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "packages", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "provides", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "rawVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "read", "(ByteBuffer,Supplier)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "read", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "read", "(InputStream,Supplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "read", "(InputStream,Supplier)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "requires", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "toNameAndVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "uses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", True, "version", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleFinder", True, "find", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleFinder", True, "findAll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleFinder", True, "of", "(Path[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleReader", True, "open", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleReader", True, "read", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleReference", True, "descriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ModuleReference", True, "location", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ResolutionException", True, "ResolutionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ResolutionException", True, "ResolutionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ResolutionException", True, "ResolutionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ResolutionException", True, "ResolutionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.module", "ResolvedModule", False, "configuration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ResolvedModule", False, "reads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.module", "ResolvedModule", False, "reference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.module", "Configuration", "empty", "()", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Exports", "isQualified", "()", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor$Opens", "isQualified", "()", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", "isAutomatic", "()", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", "isOpen", "()", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleDescriptor", "read", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleFinder", "compose", "(ModuleFinder[])", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleFinder", "ofSystem", "()", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleReader", "release", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.lang.module", "ModuleReference", "open", "()", "summary", "df-generated"]
+      - ["java.lang.module", "ResolvedModule", "name", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.ref.model.yml b/java/ql/lib/ext/generated/java.lang.ref.model.yml
new file mode 100644
index 00000000000..58ae03a832f
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.ref.model.yml
@@ -0,0 +1,32 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.ref", "Cleaner", False, "register", "(Object,Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.ref", "Cleaner", False, "register", "(Object,Runnable)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.ref", "Cleaner", False, "register", "(Object,Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.ref", "PhantomReference", True, "PhantomReference", "(Object,ReferenceQueue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "PhantomReference", True, "PhantomReference", "(Object,ReferenceQueue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "Reference", True, "get", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.ref", "ReferenceQueue", True, "poll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.ref", "ReferenceQueue", True, "remove", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.ref", "ReferenceQueue", True, "remove", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object,ReferenceQueue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "SoftReference", True, "SoftReference", "(Object,ReferenceQueue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "WeakReference", True, "WeakReference", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "WeakReference", True, "WeakReference", "(Object,ReferenceQueue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.ref", "WeakReference", True, "WeakReference", "(Object,ReferenceQueue)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.ref", "Cleaner", "create", "()", "summary", "df-generated"]
+      - ["java.lang.ref", "Cleaner", "create", "(ThreadFactory)", "summary", "df-generated"]
+      - ["java.lang.ref", "Reference", "clear", "()", "summary", "df-generated"]
+      - ["java.lang.ref", "Reference", "enqueue", "()", "summary", "df-generated"]
+      - ["java.lang.ref", "Reference", "isEnqueued", "()", "summary", "df-generated"]
+      - ["java.lang.ref", "Reference", "reachabilityFence", "(Object)", "summary", "df-generated"]
+      - ["java.lang.ref", "Reference", "refersTo", "(Object)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.reflect.model.yml b/java/ql/lib/ext/generated/java.lang.reflect.model.yml
new file mode 100644
index 00000000000..b79a4078005
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.reflect.model.yml
@@ -0,0 +1,145 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.reflect", "AnnotatedElement", True, "getAnnotation", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedElement", True, "getAnnotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedElement", True, "getAnnotationsByType", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedElement", True, "getDeclaredAnnotation", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedElement", True, "getDeclaredAnnotations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedElement", True, "getDeclaredAnnotationsByType", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getAnnotatedExceptionTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getAnnotatedParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getAnnotatedReceiverType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getAnnotatedReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getExceptionTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getGenericExceptionTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getGenericParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Executable", True, "toGenericString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Field", False, "getAnnotatedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Field", False, "getGenericType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Field", False, "toGenericString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "GenericDeclaration", True, "getTypeParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "GenericSignatureFormatError", True, "GenericSignatureFormatError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "InaccessibleObjectException", True, "InaccessibleObjectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "InvocationHandler", True, "invoke", "(Object,Method,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "InvocationTargetException", True, "InvocationTargetException", "(Throwable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "InvocationTargetException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "MalformedParameterizedTypeException", True, "MalformedParameterizedTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "MalformedParametersException", True, "MalformedParametersException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "Member", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Method", False, "getGenericReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Parameter", False, "getAnnotatedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Parameter", False, "getDeclaringExecutable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Parameter", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Parameter", False, "getParameterizedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "Proxy", True, "getInvocationHandler", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "RecordComponent", False, "getAccessor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "RecordComponent", False, "getAnnotatedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "RecordComponent", False, "getGenericSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "RecordComponent", False, "getGenericType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "RecordComponent", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "ReflectPermission", False, "ReflectPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "ReflectPermission", False, "ReflectPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "Type", True, "getTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "UndeclaredThrowableException", True, "UndeclaredThrowableException", "(Throwable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.lang.reflect", "UndeclaredThrowableException", True, "getUndeclaredThrowable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.reflect", "AccessibleObject", "canAccess", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "AccessibleObject", "isAccessible", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "AccessibleObject", "setAccessible", "(AccessibleObject[],boolean)", "summary", "df-generated"]
+      - ["java.lang.reflect", "AccessibleObject", "setAccessible", "(boolean)", "summary", "df-generated"]
+      - ["java.lang.reflect", "AccessibleObject", "trySetAccessible", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedElement", "isAnnotationPresent", "(Class)", "summary", "df-generated"]
+      - ["java.lang.reflect", "AnnotatedType", "getAnnotatedOwnerType", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "get", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getBoolean", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getByte", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getChar", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getDouble", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getFloat", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getInt", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getLength", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getLong", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "getShort", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "newInstance", "(Class,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "newInstance", "(Class,int[])", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "set", "(Object,int,Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setBoolean", "(Object,int,boolean)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setByte", "(Object,int,byte)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setChar", "(Object,int,char)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setDouble", "(Object,int,double)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setFloat", "(Object,int,float)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setInt", "(Object,int,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setLong", "(Object,int,long)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Array", "setShort", "(Object,int,short)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Executable", "getParameterAnnotations", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Executable", "getParameterCount", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Executable", "isVarArgs", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getBoolean", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getByte", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getChar", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getDouble", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getFloat", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getInt", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getLong", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getShort", "(Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "getType", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "isEnumConstant", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "set", "(Object,Object)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setBoolean", "(Object,boolean)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setByte", "(Object,byte)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setChar", "(Object,char)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setDouble", "(Object,double)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setFloat", "(Object,float)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setInt", "(Object,int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setLong", "(Object,long)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Field", "setShort", "(Object,short)", "summary", "df-generated"]
+      - ["java.lang.reflect", "InvocationHandler", "invokeDefault", "(Object,Method,Object[])", "summary", "df-generated"]
+      - ["java.lang.reflect", "Member", "getDeclaringClass", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Member", "getModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Member", "isSynthetic", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "getDefaultValue", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "getReturnType", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "isBridge", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Method", "isDefault", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "classModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "constructorModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "fieldModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "interfaceModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isAbstract", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isFinal", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isInterface", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isNative", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isPrivate", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isProtected", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isPublic", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isStatic", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isStrict", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isSynchronized", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isTransient", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "isVolatile", "(int)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "methodModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Modifier", "parameterModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Parameter", "getModifiers", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Parameter", "getType", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Parameter", "isImplicit", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Parameter", "isNamePresent", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Parameter", "isSynthetic", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Parameter", "isVarArgs", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "Proxy", "getProxyClass", "(ClassLoader,Class[])", "summary", "df-generated"]
+      - ["java.lang.reflect", "Proxy", "isProxyClass", "(Class)", "summary", "df-generated"]
+      - ["java.lang.reflect", "Proxy", "newProxyInstance", "(ClassLoader,Class[],InvocationHandler)", "summary", "df-generated"]
+      - ["java.lang.reflect", "RecordComponent", "getDeclaringRecord", "()", "summary", "df-generated"]
+      - ["java.lang.reflect", "RecordComponent", "getType", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.runtime.model.yml b/java/ql/lib/ext/generated/java.lang.runtime.model.yml
new file mode 100644
index 00000000000..940d246f9b3
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.lang.runtime.model.yml
@@ -0,0 +1,13 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang.runtime", "SwitchBootstraps", True, "enumSwitch", "(MethodHandles$Lookup,String,MethodType,Object[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.lang.runtime", "SwitchBootstraps", True, "typeSwitch", "(MethodHandles$Lookup,String,MethodType,Object[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang.runtime", "ObjectMethods", "bootstrap", "(MethodHandles$Lookup,String,TypeDescriptor,Class,String,MethodHandle[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.math.model.yml b/java/ql/lib/ext/generated/java.math.model.yml
new file mode 100644
index 00000000000..2f149239f07
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.math.model.yml
@@ -0,0 +1,107 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.math", "BigDecimal", True, "movePointLeft", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigDecimal", True, "movePointRight", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigDecimal", True, "plus", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigDecimal", True, "plus", "(MathContext)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigDecimal", True, "setScale", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigInteger", True, "add", "(BigInteger)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigInteger", True, "shiftLeft", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigInteger", True, "shiftRight", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.math", "BigInteger", True, "subtract", "(BigInteger)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.math", "BigDecimal", "abs", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "abs", "(MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "add", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "byteValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divide", "(BigDecimal)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divide", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divide", "(BigDecimal,RoundingMode)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divide", "(BigDecimal,int)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divide", "(BigDecimal,int,RoundingMode)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divide", "(BigDecimal,int,int)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divideAndRemainder", "(BigDecimal)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divideAndRemainder", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divideToIntegralValue", "(BigDecimal)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "divideToIntegralValue", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "intValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "longValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "max", "(BigDecimal)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "min", "(BigDecimal)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "multiply", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "negate", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "negate", "(MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "pow", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "pow", "(int,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "precision", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "remainder", "(BigDecimal)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "remainder", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "round", "(MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "scale", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "scaleByPowerOfTen", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "setScale", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "shortValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "signum", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "sqrt", "(MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "stripTrailingZeros", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "subtract", "(BigDecimal,MathContext)", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "toBigIntegerExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "toEngineeringString", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "toPlainString", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "ulp", "()", "summary", "df-generated"]
+      - ["java.math", "BigDecimal", "unscaledValue", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "BigInteger", "(String,int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "BigInteger", "(byte[])", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "BigInteger", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "BigInteger", "(int,Random)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "BigInteger", "(int,byte[])", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "BigInteger", "(int,byte[],int,int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "BigInteger", "(int,int,Random)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "abs", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "and", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "andNot", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "bitCount", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "bitLength", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "byteValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "clearBit", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "divide", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "divideAndRemainder", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "flipBit", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "gcd", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "getLowestSetBit", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "intValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "isProbablePrime", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "longValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "max", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "min", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "mod", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "modInverse", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "modPow", "(BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "multiply", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "negate", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "nextProbablePrime", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "not", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "pow", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "probablePrime", "(int,Random)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "remainder", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "setBit", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "shortValueExact", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "signum", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "sqrt", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "sqrtAndRemainder", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "testBit", "(int)", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "toByteArray", "()", "summary", "df-generated"]
+      - ["java.math", "BigInteger", "xor", "(BigInteger)", "summary", "df-generated"]
+      - ["java.math", "MathContext", "MathContext", "(String)", "summary", "df-generated"]
+      - ["java.math", "MathContext", "MathContext", "(int)", "summary", "df-generated"]
+      - ["java.math", "MathContext", "MathContext", "(int,RoundingMode)", "summary", "df-generated"]
+      - ["java.math", "MathContext", "getPrecision", "()", "summary", "df-generated"]
+      - ["java.math", "MathContext", "getRoundingMode", "()", "summary", "df-generated"]
+      - ["java.math", "RoundingMode", "valueOf", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.net.http.model.yml b/java/ql/lib/ext/generated/java.net.http.model.yml
new file mode 100644
index 00000000000..6bb3608a437
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.net.http.model.yml
@@ -0,0 +1,103 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.net.http", "HttpConnectTimeoutException", True, "HttpConnectTimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net.http", "HttpHeaders", False, "allValues", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpHeaders", False, "firstValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpHeaders", False, "map", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "concat", "(HttpRequest$BodyPublisher[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "fromPublisher", "(Flow$Publisher)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "fromPublisher", "(Flow$Publisher,long)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofByteArray", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofByteArray", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofByteArrays", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofFile", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofInputStream", "(Supplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofString", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", True, "ofString", "(String,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest", True, "newBuilder", "(HttpRequest,BiPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpRequest", True, "newBuilder", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFile", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFile", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFile", "(Path,OpenOption[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFileDownload", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", True, "ofFileDownload", "(Path,OpenOption[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "buffering", "(HttpResponse$BodySubscriber,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "fromLineSubscriber", "(Flow$Subscriber)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "fromLineSubscriber", "(Flow$Subscriber,Function,Charset,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "fromLineSubscriber", "(Flow$Subscriber,Function,Charset,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "fromLineSubscriber", "(Flow$Subscriber,Function,Charset,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "fromSubscriber", "(Flow$Subscriber)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "fromSubscriber", "(Flow$Subscriber,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "fromSubscriber", "(Flow$Subscriber,Function)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "mapping", "(HttpResponse$BodySubscriber,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "mapping", "(HttpResponse$BodySubscriber,Function)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "ofByteArrayConsumer", "(Consumer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "ofFile", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "ofFile", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", True, "replacing", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$PushPromiseHandler", True, "of", "(Function,ConcurrentMap)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpResponse$PushPromiseHandler", True, "of", "(Function,ConcurrentMap)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net.http", "HttpTimeoutException", True, "HttpTimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net.http", "WebSocketHandshakeException", False, "WebSocketHandshakeException", "(HttpResponse)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net.http", "WebSocketHandshakeException", False, "getResponse", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.net.http", "HttpClient", "authenticator", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "connectTimeout", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "cookieHandler", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "executor", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "followRedirects", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "newBuilder", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "newHttpClient", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "newWebSocketBuilder", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "proxy", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "send", "(HttpRequest,HttpResponse$BodyHandler)", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "sendAsync", "(HttpRequest,HttpResponse$BodyHandler)", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "sendAsync", "(HttpRequest,HttpResponse$BodyHandler,HttpResponse$PushPromiseHandler)", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "sslContext", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "sslParameters", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpClient", "version", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpHeaders", "firstValueAsLong", "(String)", "summary", "df-generated"]
+      - ["java.net.http", "HttpHeaders", "of", "(Map,BiPredicate)", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest$BodyPublishers", "noBody", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "bodyPublisher", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "expectContinue", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "headers", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "method", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "newBuilder", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "timeout", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "uri", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpRequest", "version", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "buffering", "(HttpResponse$BodyHandler,int)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "discarding", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "fromLineSubscriber", "(Flow$Subscriber)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "fromLineSubscriber", "(Flow$Subscriber,Function,String)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "fromSubscriber", "(Flow$Subscriber)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "fromSubscriber", "(Flow$Subscriber,Function)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "ofByteArray", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "ofByteArrayConsumer", "(Consumer)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "ofInputStream", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "ofLines", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "ofPublisher", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "ofString", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "ofString", "(Charset)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodyHandlers", "replacing", "(Object)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", "discarding", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", "ofByteArray", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", "ofInputStream", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", "ofLines", "(Charset)", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", "ofPublisher", "()", "summary", "df-generated"]
+      - ["java.net.http", "HttpResponse$BodySubscribers", "ofString", "(Charset)", "summary", "df-generated"]
+      - ["java.net.http", "WebSocket$Listener", "onBinary", "(WebSocket,ByteBuffer,boolean)", "summary", "df-generated"]
+      - ["java.net.http", "WebSocket$Listener", "onClose", "(WebSocket,int,String)", "summary", "df-generated"]
+      - ["java.net.http", "WebSocket$Listener", "onError", "(WebSocket,Throwable)", "summary", "df-generated"]
+      - ["java.net.http", "WebSocket$Listener", "onOpen", "(WebSocket)", "summary", "df-generated"]
+      - ["java.net.http", "WebSocket$Listener", "onPing", "(WebSocket,ByteBuffer)", "summary", "df-generated"]
+      - ["java.net.http", "WebSocket$Listener", "onPong", "(WebSocket,ByteBuffer)", "summary", "df-generated"]
+      - ["java.net.http", "WebSocket$Listener", "onText", "(WebSocket,CharSequence,boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.net.model.yml b/java/ql/lib/ext/generated/java.net.model.yml
new file mode 100644
index 00000000000..7ca397cdb5c
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.net.model.yml
@@ -0,0 +1,485 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.net", "Authenticator", True, "requestPasswordAuthentication", "(Authenticator,String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthentication", "(Authenticator,String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthentication", "(Authenticator,String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[4]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthentication", "(Authenticator,String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[5]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthentication", "(Authenticator,String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[6]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthentication", "(Authenticator,String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[7]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthenticationInstance", "(String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthenticationInstance", "(String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthenticationInstance", "(String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthenticationInstance", "(String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthenticationInstance", "(String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Authenticator", True, "requestPasswordAuthenticationInstance", "(String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "BindException", True, "BindException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "ConnectException", True, "ConnectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "ContentHandler", True, "getContent", "(URLConnection)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ContentHandler", True, "getContent", "(URLConnection,Class[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "CookieManager", True, "CookieManager", "(CookieStore,CookiePolicy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "CookieManager", True, "CookieManager", "(CookieStore,CookiePolicy)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "CookieManager", True, "getCookieStore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "CookieManager", True, "setCookiePolicy", "(CookiePolicy)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "CookieStore", True, "add", "(URI,HttpCookie)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "CookieStore", True, "add", "(URI,HttpCookie)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "CookieStore", True, "get", "(URI)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "CookieStore", True, "getCookies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "CookieStore", True, "getURIs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,InetAddress,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,SocketAddress)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,InetAddress,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "DatagramPacket", "(byte[],int,int,SocketAddress)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "getSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "setAddress", "(InetAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "setData", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "setData", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramPacket", False, "setSocketAddress", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "connect", "(InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "connect", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "getInetAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "getRemoteSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "send", "(DatagramPacket)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "DatagramSocket", True, "supportedOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "HttpCookie", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "getComment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "getCommentURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "getDomain", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "getPortlist", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "setComment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "setCommentURL", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "setDomain", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "setPath", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "setPortlist", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpCookie", False, "setValue", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpRetryException", True, "HttpRetryException", "(String,int,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "HttpRetryException", True, "getLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpRetryException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpURLConnection", True, "getRequestMethod", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpURLConnection", True, "getResponseMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "HttpURLConnection", True, "setRequestMethod", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],NetworkInterface)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Inet6Address", False, "getByAddress", "(String,byte[],int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Inet6Address", False, "getScopedInterface", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetAddress", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetAddress", True, "getByAddress", "(String,byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetAddress", True, "getByAddress", "(String,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetAddress", True, "getCanonicalHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetAddress", True, "getHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetSocketAddress", True, "InetSocketAddress", "(InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "InetSocketAddress", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetSocketAddress", True, "getHostName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InetSocketAddress", True, "getHostString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InterfaceAddress", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "InterfaceAddress", True, "getBroadcast", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "JarURLConnection", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "JarURLConnection", True, "getCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "JarURLConnection", True, "getEntryName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "JarURLConnection", True, "getJarEntry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "JarURLConnection", True, "getJarFileURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "JarURLConnection", True, "getManifest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "MalformedURLException", True, "MalformedURLException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "MulticastSocket", True, "getInterface", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "MulticastSocket", True, "send", "(DatagramPacket,byte)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.net", "MulticastSocket", True, "setInterface", "(InetAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "NetPermission", False, "NetPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "NetPermission", False, "NetPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "NetworkInterface", False, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "NetworkInterface", False, "getInterfaceAddresses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "NetworkInterface", False, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "NetworkInterface", False, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "NetworkInterface", False, "subInterfaces", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "NoRouteToHostException", True, "NoRouteToHostException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "PasswordAuthentication", False, "PasswordAuthentication", "(String,char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "PasswordAuthentication", False, "PasswordAuthentication", "(String,char[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "PasswordAuthentication", False, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "PasswordAuthentication", False, "getUserName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "PortUnreachableException", True, "PortUnreachableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "ProtocolException", True, "ProtocolException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Proxy", True, "Proxy", "(Proxy$Type,SocketAddress)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Proxy", True, "address", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ProxySelector", True, "select", "(URI)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "ServerSocket", "(int,int,InetAddress)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "bind", "(SocketAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "getInetAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "getLocalSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "ServerSocket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "ServerSocket", True, "supportedOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(InetAddress,int,InetAddress,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(String,int,InetAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(String,int,InetAddress,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "Socket", "(String,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "bind", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "connect", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "connect", "(SocketAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "getInetAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "getInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "getRemoteSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "Socket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "Socket", True, "supportedOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "SocketException", True, "SocketException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "SocketOptions", True, "setOption", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "SocketPermission", False, "SocketPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "SocketTimeoutException", True, "SocketTimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getAuthority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getFragment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getQuery", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getRawAuthority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getRawFragment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getRawPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getRawQuery", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getRawSchemeSpecificPart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getRawUserInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getScheme", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getSchemeSpecificPart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "getUserInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "normalize", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URI", False, "parseServerAuthority", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.net", "URI", False, "relativize", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URISyntaxException", True, "URISyntaxException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URISyntaxException", True, "getInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URISyntaxException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,int,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(String,String,int,String,URLStreamHandler)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getAuthority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getContent", "(Class[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getQuery", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getRef", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "getUserInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "openConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "openConnection", "(Proxy)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URL", False, "openConnection", "(Proxy)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "URLClassLoader", "(String,URL[],ClassLoader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "URLClassLoader", "(String,URL[],ClassLoader)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "URLClassLoader", "(String,URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "URLClassLoader", "(String,URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "URLClassLoader", "(URL[],ClassLoader)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "URLClassLoader", "(URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "getURLs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLClassLoader", True, "newInstance", "(URL[],ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getContent", "(Class[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getContentEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getContentType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getPermission", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getRequestProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getRequestProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLConnection", True, "getURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLEncoder", True, "encode", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLEncoder", True, "encode", "(String,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLEncoder", True, "encode", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "URLPermission", False, "URLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "URLPermission", False, "URLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "UnixDomainSocketAddress", False, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "UnixDomainSocketAddress", False, "of", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "UnixDomainSocketAddress", False, "of", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.net", "UnknownHostException", True, "UnknownHostException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.net", "UnknownServiceException", True, "UnknownServiceException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.net", "Authenticator", "getDefault", "()", "summary", "df-generated"]
+      - ["java.net", "Authenticator", "requestPasswordAuthentication", "(InetAddress,int,String,String,String)", "summary", "df-generated"]
+      - ["java.net", "Authenticator", "requestPasswordAuthentication", "(String,InetAddress,int,String,String,String)", "summary", "df-generated"]
+      - ["java.net", "Authenticator", "requestPasswordAuthentication", "(String,InetAddress,int,String,String,String,URL,Authenticator$RequestorType)", "summary", "df-generated"]
+      - ["java.net", "Authenticator", "setDefault", "(Authenticator)", "summary", "df-generated"]
+      - ["java.net", "CacheRequest", "abort", "()", "summary", "df-generated"]
+      - ["java.net", "CacheRequest", "getBody", "()", "summary", "df-generated"]
+      - ["java.net", "CacheResponse", "getBody", "()", "summary", "df-generated"]
+      - ["java.net", "CacheResponse", "getHeaders", "()", "summary", "df-generated"]
+      - ["java.net", "CookieHandler", "get", "(URI,Map)", "summary", "df-generated"]
+      - ["java.net", "CookieHandler", "getDefault", "()", "summary", "df-generated"]
+      - ["java.net", "CookieHandler", "put", "(URI,Map)", "summary", "df-generated"]
+      - ["java.net", "CookieHandler", "setDefault", "(CookieHandler)", "summary", "df-generated"]
+      - ["java.net", "CookiePolicy", "shouldAccept", "(URI,HttpCookie)", "summary", "df-generated"]
+      - ["java.net", "CookieStore", "remove", "(URI,HttpCookie)", "summary", "df-generated"]
+      - ["java.net", "CookieStore", "removeAll", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramPacket", "getLength", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramPacket", "getOffset", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramPacket", "getPort", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramPacket", "setLength", "(int)", "summary", "df-generated"]
+      - ["java.net", "DatagramPacket", "setPort", "(int)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "DatagramSocket", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "DatagramSocket", "(int)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "DatagramSocket", "(int,InetAddress)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "bind", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "disconnect", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getBroadcast", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getChannel", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getLocalPort", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getLocalSocketAddress", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getOption", "(SocketOption)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getPort", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getReceiveBufferSize", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getReuseAddress", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getSendBufferSize", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getSoTimeout", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "getTrafficClass", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "isBound", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "isClosed", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "isConnected", "()", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "joinGroup", "(SocketAddress,NetworkInterface)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "leaveGroup", "(SocketAddress,NetworkInterface)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "receive", "(DatagramPacket)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "setBroadcast", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "setDatagramSocketImplFactory", "(DatagramSocketImplFactory)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "setReceiveBufferSize", "(int)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "setReuseAddress", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "setSendBufferSize", "(int)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "setSoTimeout", "(int)", "summary", "df-generated"]
+      - ["java.net", "DatagramSocket", "setTrafficClass", "(int)", "summary", "df-generated"]
+      - ["java.net", "FileNameMap", "getContentTypeFor", "(String)", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "domainMatches", "(String,String)", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "getDiscard", "()", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "getMaxAge", "()", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "getSecure", "()", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "getVersion", "()", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "hasExpired", "()", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "isHttpOnly", "()", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "setDiscard", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "setHttpOnly", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "setMaxAge", "(long)", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "setSecure", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "HttpCookie", "setVersion", "(int)", "summary", "df-generated"]
+      - ["java.net", "HttpRetryException", "responseCode", "()", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "disconnect", "()", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "getErrorStream", "()", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "getFollowRedirects", "()", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "getInstanceFollowRedirects", "()", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "getResponseCode", "()", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "setAuthenticator", "(Authenticator)", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "setChunkedStreamingMode", "(int)", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "setFixedLengthStreamingMode", "(int)", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "setFixedLengthStreamingMode", "(long)", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "setFollowRedirects", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "setInstanceFollowRedirects", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "HttpURLConnection", "usingProxy", "()", "summary", "df-generated"]
+      - ["java.net", "IDN", "toASCII", "(String)", "summary", "df-generated"]
+      - ["java.net", "IDN", "toASCII", "(String,int)", "summary", "df-generated"]
+      - ["java.net", "IDN", "toUnicode", "(String)", "summary", "df-generated"]
+      - ["java.net", "IDN", "toUnicode", "(String,int)", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "getScopeId", "()", "summary", "df-generated"]
+      - ["java.net", "Inet6Address", "isIPv4CompatibleAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "getHostAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "getLocalHost", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "getLoopbackAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isAnyLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isLinkLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isLoopbackAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isMCGlobal", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isMCLinkLocal", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isMCNodeLocal", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isMCOrgLocal", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isMCSiteLocal", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isMulticastAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isReachable", "(NetworkInterface,int,int)", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isReachable", "(int)", "summary", "df-generated"]
+      - ["java.net", "InetAddress", "isSiteLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "InetSocketAddress", "InetSocketAddress", "(int)", "summary", "df-generated"]
+      - ["java.net", "InetSocketAddress", "getPort", "()", "summary", "df-generated"]
+      - ["java.net", "InetSocketAddress", "isUnresolved", "()", "summary", "df-generated"]
+      - ["java.net", "InterfaceAddress", "getNetworkPrefixLength", "()", "summary", "df-generated"]
+      - ["java.net", "JarURLConnection", "getJarFile", "()", "summary", "df-generated"]
+      - ["java.net", "JarURLConnection", "getMainAttributes", "()", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "MulticastSocket", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "MulticastSocket", "(int)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "getLoopbackMode", "()", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "getNetworkInterface", "()", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "getTTL", "()", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "getTimeToLive", "()", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "joinGroup", "(InetAddress)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "leaveGroup", "(InetAddress)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "setLoopbackMode", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "setNetworkInterface", "(NetworkInterface)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "setTTL", "(byte)", "summary", "df-generated"]
+      - ["java.net", "MulticastSocket", "setTimeToLive", "(int)", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getByIndex", "(int)", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getByInetAddress", "(InetAddress)", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getByName", "(String)", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getHardwareAddress", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getIndex", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getInetAddresses", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getMTU", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getNetworkInterfaces", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "getSubInterfaces", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "inetAddresses", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "isLoopback", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "isPointToPoint", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "isUp", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "isVirtual", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "networkInterfaces", "()", "summary", "df-generated"]
+      - ["java.net", "NetworkInterface", "supportsMulticast", "()", "summary", "df-generated"]
+      - ["java.net", "Proxy", "type", "()", "summary", "df-generated"]
+      - ["java.net", "ProxySelector", "connectFailed", "(URI,SocketAddress,IOException)", "summary", "df-generated"]
+      - ["java.net", "ProxySelector", "getDefault", "()", "summary", "df-generated"]
+      - ["java.net", "ProxySelector", "of", "(InetSocketAddress)", "summary", "df-generated"]
+      - ["java.net", "ProxySelector", "setDefault", "(ProxySelector)", "summary", "df-generated"]
+      - ["java.net", "ResponseCache", "get", "(URI,String,Map)", "summary", "df-generated"]
+      - ["java.net", "ResponseCache", "getDefault", "()", "summary", "df-generated"]
+      - ["java.net", "ResponseCache", "put", "(URI,URLConnection)", "summary", "df-generated"]
+      - ["java.net", "ResponseCache", "setDefault", "(ResponseCache)", "summary", "df-generated"]
+      - ["java.net", "SecureCacheResponse", "getCipherSuite", "()", "summary", "df-generated"]
+      - ["java.net", "SecureCacheResponse", "getLocalCertificateChain", "()", "summary", "df-generated"]
+      - ["java.net", "SecureCacheResponse", "getLocalPrincipal", "()", "summary", "df-generated"]
+      - ["java.net", "SecureCacheResponse", "getPeerPrincipal", "()", "summary", "df-generated"]
+      - ["java.net", "SecureCacheResponse", "getSSLSession", "()", "summary", "df-generated"]
+      - ["java.net", "SecureCacheResponse", "getServerCertificateChain", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "ServerSocket", "(int)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "ServerSocket", "(int,int)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "accept", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "bind", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "getChannel", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "getLocalPort", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "getOption", "(SocketOption)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "getReceiveBufferSize", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "getReuseAddress", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "getSoTimeout", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "isBound", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "isClosed", "()", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "setPerformancePreferences", "(int,int,int)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "setReceiveBufferSize", "(int)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "setReuseAddress", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "setSoTimeout", "(int)", "summary", "df-generated"]
+      - ["java.net", "ServerSocket", "setSocketFactory", "(SocketImplFactory)", "summary", "df-generated"]
+      - ["java.net", "Socket", "Socket", "(InetAddress,int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "Socket", "(InetAddress,int,boolean)", "summary", "df-generated"]
+      - ["java.net", "Socket", "Socket", "(Proxy)", "summary", "df-generated"]
+      - ["java.net", "Socket", "getChannel", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getKeepAlive", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getLocalAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getLocalPort", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getLocalSocketAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getOOBInline", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getOption", "(SocketOption)", "summary", "df-generated"]
+      - ["java.net", "Socket", "getPort", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getReceiveBufferSize", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getReuseAddress", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getSendBufferSize", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getSoLinger", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getSoTimeout", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getTcpNoDelay", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "getTrafficClass", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "isBound", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "isClosed", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "isConnected", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "isInputShutdown", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "isOutputShutdown", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "sendUrgentData", "(int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setKeepAlive", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setOOBInline", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setPerformancePreferences", "(int,int,int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setReceiveBufferSize", "(int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setReuseAddress", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setSendBufferSize", "(int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setSoLinger", "(boolean,int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setSoTimeout", "(int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setSocketImplFactory", "(SocketImplFactory)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setTcpNoDelay", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "Socket", "setTrafficClass", "(int)", "summary", "df-generated"]
+      - ["java.net", "Socket", "shutdownInput", "()", "summary", "df-generated"]
+      - ["java.net", "Socket", "shutdownOutput", "()", "summary", "df-generated"]
+      - ["java.net", "SocketOptions", "getOption", "(int)", "summary", "df-generated"]
+      - ["java.net", "URI", "URI", "(String,String,String)", "summary", "df-generated"]
+      - ["java.net", "URI", "URI", "(String,String,String,String)", "summary", "df-generated"]
+      - ["java.net", "URI", "URI", "(String,String,String,String,String)", "summary", "df-generated"]
+      - ["java.net", "URI", "getPort", "()", "summary", "df-generated"]
+      - ["java.net", "URI", "isAbsolute", "()", "summary", "df-generated"]
+      - ["java.net", "URI", "isOpaque", "()", "summary", "df-generated"]
+      - ["java.net", "URISyntaxException", "getIndex", "()", "summary", "df-generated"]
+      - ["java.net", "URL", "getDefaultPort", "()", "summary", "df-generated"]
+      - ["java.net", "URL", "getPort", "()", "summary", "df-generated"]
+      - ["java.net", "URL", "openStream", "()", "summary", "df-generated"]
+      - ["java.net", "URL", "sameFile", "(URL)", "summary", "df-generated"]
+      - ["java.net", "URL", "setURLStreamHandlerFactory", "(URLStreamHandlerFactory)", "summary", "df-generated"]
+      - ["java.net", "URLClassLoader", "URLClassLoader", "(URL[])", "summary", "df-generated"]
+      - ["java.net", "URLClassLoader", "addURL", "(URL)", "summary", "df-generated"]
+      - ["java.net", "URLClassLoader", "newInstance", "(URL[])", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "addRequestProperty", "(String,String)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "connect", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getAllowUserInteraction", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getConnectTimeout", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getContentLength", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getContentLengthLong", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getDate", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getDefaultAllowUserInteraction", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getDefaultRequestProperty", "(String)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getDefaultUseCaches", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getDefaultUseCaches", "(String)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getDoInput", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getDoOutput", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getExpiration", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getFileNameMap", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getHeaderField", "(String)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getHeaderField", "(int)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getHeaderFieldDate", "(String,long)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getHeaderFieldInt", "(String,int)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getHeaderFieldKey", "(int)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getHeaderFieldLong", "(String,long)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getHeaderFields", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getIfModifiedSince", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getInputStream", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getLastModified", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getOutputStream", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getReadTimeout", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "getUseCaches", "()", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "guessContentTypeFromName", "(String)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "guessContentTypeFromStream", "(InputStream)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setAllowUserInteraction", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setConnectTimeout", "(int)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setContentHandlerFactory", "(ContentHandlerFactory)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setDefaultAllowUserInteraction", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setDefaultRequestProperty", "(String,String)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setDefaultUseCaches", "(String,boolean)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setDefaultUseCaches", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setDoInput", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setDoOutput", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setFileNameMap", "(FileNameMap)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setIfModifiedSince", "(long)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setReadTimeout", "(int)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setRequestProperty", "(String,String)", "summary", "df-generated"]
+      - ["java.net", "URLConnection", "setUseCaches", "(boolean)", "summary", "df-generated"]
+      - ["java.net", "URLStreamHandlerFactory", "createURLStreamHandler", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.channels.model.yml b/java/ql/lib/ext/generated/java.nio.channels.model.yml
new file mode 100644
index 00000000000..4f682461328
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.channels.model.yml
@@ -0,0 +1,180 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "read", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", True, "write", "(ByteBuffer,Object,CompletionHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", True, "withCachedThreadPool", "(ExecutorService,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", True, "withThreadPool", "(ExecutorService)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "lock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "open", "(Path,Set,ExecutorService,FileAttribute[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "tryLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "open", "(AsynchronousChannelGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "open", "(AsynchronousChannelGroup)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newChannel", "(OutputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newInputStream", "(ReadableByteChannel)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newReader", "(ReadableByteChannel,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newReader", "(ReadableByteChannel,CharsetDecoder,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newReader", "(ReadableByteChannel,CharsetDecoder,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newReader", "(ReadableByteChannel,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newWriter", "(WritableByteChannel,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newWriter", "(WritableByteChannel,CharsetEncoder,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newWriter", "(WritableByteChannel,CharsetEncoder,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Channels", False, "newWriter", "(WritableByteChannel,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", True, "open", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileChannel", True, "lock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileChannel", True, "open", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileChannel", True, "open", "(Path,Set,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileChannel", True, "tryLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileLock", True, "acquiredBy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "FileLock", True, "channel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "NetworkChannel", True, "bind", "(SocketAddress)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "blockingLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "configureBlocking", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "keyFor", "(Selector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "register", "(Selector,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "register", "(Selector,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "register", "(Selector,int,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", True, "register", "(Selector,int,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", True, "attachment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Selector", True, "provider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "Selector", True, "select", "(Consumer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", True, "open", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", True, "open", "(ProtocolFamily)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", True, "open", "(SocketAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.channels", "WritableByteChannel", True, "write", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio.channels", "AsynchronousByteChannel", "read", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousByteChannel", "write", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", "awaitTermination", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", "isShutdown", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", "isTerminated", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", "shutdown", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", "shutdownNow", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousChannelGroup", "withFixedThreadPool", "(int,ThreadFactory)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "force", "(boolean)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "lock", "(Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "lock", "(long,long,boolean)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "lock", "(long,long,boolean,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "open", "(Path,OpenOption[])", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "read", "(ByteBuffer,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "read", "(ByteBuffer,long,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "size", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "truncate", "(long)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "tryLock", "(long,long,boolean)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "write", "(ByteBuffer,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousFileChannel", "write", "(ByteBuffer,long,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", "accept", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", "accept", "(Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", "bind", "(SocketAddress,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousServerSocketChannel", "open", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "connect", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "connect", "(SocketAddress,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "getRemoteAddress", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "open", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "read", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "read", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "shutdownInput", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "shutdownOutput", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "write", "(ByteBuffer,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "AsynchronousSocketChannel", "write", "(ByteBuffer[],int,int,long,TimeUnit,Object,CompletionHandler)", "summary", "df-generated"]
+      - ["java.nio.channels", "Channel", "isOpen", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Channels", "newInputStream", "(AsynchronousByteChannel)", "summary", "df-generated"]
+      - ["java.nio.channels", "Channels", "newOutputStream", "(AsynchronousByteChannel)", "summary", "df-generated"]
+      - ["java.nio.channels", "Channels", "newOutputStream", "(WritableByteChannel)", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "connect", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "disconnect", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "getRemoteAddress", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "isConnected", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "open", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "receive", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "send", "(ByteBuffer,SocketAddress)", "summary", "df-generated"]
+      - ["java.nio.channels", "DatagramChannel", "socket", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "force", "(boolean)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "lock", "(long,long,boolean)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "map", "(FileChannel$MapMode,long,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "read", "(ByteBuffer,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "transferFrom", "(ReadableByteChannel,long,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "transferTo", "(long,long,WritableByteChannel)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "tryLock", "(long,long,boolean)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileChannel", "write", "(ByteBuffer,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileLock", "isShared", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "FileLock", "isValid", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "FileLock", "overlaps", "(long,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "FileLock", "position", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "FileLock", "release", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "FileLock", "size", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "GatheringByteChannel", "write", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "GatheringByteChannel", "write", "(ByteBuffer[],int,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "block", "(InetAddress)", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "channel", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "drop", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "group", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "isValid", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "networkInterface", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "sourceAddress", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "MembershipKey", "unblock", "(InetAddress)", "summary", "df-generated"]
+      - ["java.nio.channels", "NetworkChannel", "getLocalAddress", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "NetworkChannel", "setOption", "(SocketOption,Object)", "summary", "df-generated"]
+      - ["java.nio.channels", "Pipe", "open", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Pipe", "sink", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Pipe", "source", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "ScatteringByteChannel", "read", "(ByteBuffer[])", "summary", "df-generated"]
+      - ["java.nio.channels", "ScatteringByteChannel", "read", "(ByteBuffer[],int,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "SeekableByteChannel", "position", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SeekableByteChannel", "position", "(long)", "summary", "df-generated"]
+      - ["java.nio.channels", "SeekableByteChannel", "size", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SeekableByteChannel", "truncate", "(long)", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", "isBlocking", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", "isRegistered", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectableChannel", "validOps", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "attach", "(Object)", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "cancel", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "channel", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "interestOps", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "interestOps", "(int)", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "interestOpsAnd", "(int)", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "interestOpsOr", "(int)", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "isAcceptable", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "isConnectable", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "isReadable", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "isValid", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "isWritable", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "readyOps", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SelectionKey", "selector", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "isOpen", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "keys", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "open", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "select", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "select", "(Consumer,long)", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "select", "(long)", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "selectNow", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "selectNow", "(Consumer)", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "selectedKeys", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "Selector", "wakeup", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", "accept", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", "bind", "(SocketAddress,int)", "summary", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", "open", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "ServerSocketChannel", "socket", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "connect", "(SocketAddress)", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "finishConnect", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "getRemoteAddress", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "isConnected", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "isConnectionPending", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "open", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "shutdownInput", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "shutdownOutput", "()", "summary", "df-generated"]
+      - ["java.nio.channels", "SocketChannel", "socket", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml b/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml
new file mode 100644
index 00000000000..bb85f0a62ed
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.channels.spi.model.yml
@@ -0,0 +1,21 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousChannelGroup", "(ExecutorService,int)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousChannelGroup", "(int,ThreadFactory)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousServerSocketChannel", "(AsynchronousChannelGroup)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "openAsynchronousSocketChannel", "(AsynchronousChannelGroup)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "AsynchronousChannelProvider", "provider", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "inheritedChannel", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openDatagramChannel", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openDatagramChannel", "(ProtocolFamily)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openPipe", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openSelector", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openServerSocketChannel", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openServerSocketChannel", "(ProtocolFamily)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openSocketChannel", "()", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "openSocketChannel", "(ProtocolFamily)", "summary", "df-generated"]
+      - ["java.nio.channels.spi", "SelectorProvider", "provider", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.charset.model.yml b/java/ql/lib/ext/generated/java.nio.charset.model.yml
new file mode 100644
index 00000000000..488fc3ddecf
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.charset.model.yml
@@ -0,0 +1,82 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.nio.charset", "CharsetDecoder", True, "decode", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "decode", "(ByteBuffer,CharBuffer,boolean)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "malformedInputAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "replaceWith", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "replaceWith", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "replacement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", True, "unmappableCharacterAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "encode", "(CharBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "encode", "(CharBuffer,ByteBuffer,boolean)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "encode", "(CharBuffer,ByteBuffer,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "malformedInputAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onMalformedInput", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "onUnmappableCharacter", "(CodingErrorAction)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "replaceWith", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "replaceWith", "(byte[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "replacement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", True, "unmappableCharacterAction", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "CoderMalfunctionError", True, "CoderMalfunctionError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "IllegalCharsetNameException", True, "IllegalCharsetNameException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "IllegalCharsetNameException", True, "getCharsetName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.charset", "UnsupportedCharsetException", True, "UnsupportedCharsetException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.charset", "UnsupportedCharsetException", True, "getCharsetName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio.charset", "Charset", "aliases", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "availableCharsets", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "canEncode", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "contains", "(Charset)", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "decode", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "defaultCharset", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "displayName", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "displayName", "(Locale)", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "encode", "(CharBuffer)", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "encode", "(String)", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "forName", "(String)", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "isRegistered", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "isSupported", "(String)", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "newDecoder", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "Charset", "newEncoder", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", "averageCharsPerByte", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", "charset", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", "detectedCharset", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", "flush", "(CharBuffer)", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", "isAutoDetecting", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", "isCharsetDetected", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetDecoder", "maxCharsPerByte", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", "averageBytesPerChar", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", "canEncode", "(CharSequence)", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", "canEncode", "(char)", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", "charset", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", "flush", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", "isLegalReplacement", "(byte[])", "summary", "df-generated"]
+      - ["java.nio.charset", "CharsetEncoder", "maxBytesPerChar", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "isError", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "isMalformed", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "isOverflow", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "isUnderflow", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "isUnmappable", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "length", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "malformedForLength", "(int)", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "throwException", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "CoderResult", "unmappableForLength", "(int)", "summary", "df-generated"]
+      - ["java.nio.charset", "MalformedInputException", "MalformedInputException", "(int)", "summary", "df-generated"]
+      - ["java.nio.charset", "MalformedInputException", "getInputLength", "()", "summary", "df-generated"]
+      - ["java.nio.charset", "UnmappableCharacterException", "UnmappableCharacterException", "(int)", "summary", "df-generated"]
+      - ["java.nio.charset", "UnmappableCharacterException", "getInputLength", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml b/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml
new file mode 100644
index 00000000000..131afc20afe
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.charset.spi.model.yml
@@ -0,0 +1,8 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio.charset.spi", "CharsetProvider", "charsetForName", "(String)", "summary", "df-generated"]
+      - ["java.nio.charset.spi", "CharsetProvider", "charsets", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml b/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml
new file mode 100644
index 00000000000..2f0a7c2c02c
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.file.attribute.model.yml
@@ -0,0 +1,38 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(AclEntryFlag[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setFlags", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(AclEntryPermission[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPermissions", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPrincipal", "(UserPrincipal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setPrincipal", "(UserPrincipal)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry$Builder", False, "setType", "(AclEntryType)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry", False, "flags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry", False, "newBuilder", "(AclEntry)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry", False, "permissions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry", False, "principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "FileTime", False, "from", "(Instant)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "FileTime", False, "toInstant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalNotFoundException", True, "UserPrincipalNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalNotFoundException", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio.file.attribute", "AclEntry", "newBuilder", "()", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "AclEntry", "type", "()", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "FileTime", "from", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "FileTime", "fromMillis", "(long)", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "FileTime", "to", "(TimeUnit)", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "FileTime", "toMillis", "()", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "PosixFilePermissions", "asFileAttribute", "(Set)", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "PosixFilePermissions", "fromString", "(String)", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalLookupService", "lookupPrincipalByGroupName", "(String)", "summary", "df-generated"]
+      - ["java.nio.file.attribute", "UserPrincipalLookupService", "lookupPrincipalByName", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.file.model.yml b/java/ql/lib/ext/generated/java.nio.file.model.yml
new file mode 100644
index 00000000000..d149f2e47c5
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.file.model.yml
@@ -0,0 +1,158 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.nio.file", "AccessDeniedException", True, "AccessDeniedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "AccessDeniedException", True, "AccessDeniedException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "AccessDeniedException", True, "AccessDeniedException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "AccessDeniedException", True, "AccessDeniedException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "AtomicMoveNotSupportedException", True, "AtomicMoveNotSupportedException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "AtomicMoveNotSupportedException", True, "AtomicMoveNotSupportedException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "AtomicMoveNotSupportedException", True, "AtomicMoveNotSupportedException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "DirectoryIteratorException", False, "DirectoryIteratorException", "(IOException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "DirectoryNotEmptyException", True, "DirectoryNotEmptyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileAlreadyExistsException", True, "FileAlreadyExistsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileAlreadyExistsException", True, "FileAlreadyExistsException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileAlreadyExistsException", True, "FileAlreadyExistsException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileAlreadyExistsException", True, "FileAlreadyExistsException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemAlreadyExistsException", True, "FileSystemAlreadyExistsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "FileSystemException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "getFile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "getOtherFile", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemLoopException", True, "FileSystemLoopException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystemNotFoundException", True, "FileSystemNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path,ClassLoader)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path,Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path,Map,ClassLoader)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path,Map,ClassLoader)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(Path,Map,ClassLoader)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map,ClassLoader)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map,ClassLoader)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "copy", "(Path,OutputStream)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "copy", "(Path,Path,CopyOption[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createDirectories", "(Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createDirectory", "(Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createFile", "(Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createLink", "(Path,Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createSymbolicLink", "(Path,Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempDirectory", "(Path,String,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempDirectory", "(Path,String,FileAttribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempDirectory", "(String,FileAttribute[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempFile", "(String,String,FileAttribute[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "createTempFile", "(String,String,FileAttribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "getAttribute", "(Path,String,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "getAttribute", "(Path,String,LinkOption[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "getFileStore", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "move", "(Path,Path,CopyOption[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "newDirectoryStream", "(Path,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "newInputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "newOutputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readAllBytes", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readAllLines", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readAllLines", "(Path,Charset)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readAttributes", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readString", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "readString", "(Path,Charset)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "setAttribute", "(Path,String,Object,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "setLastModifiedTime", "(Path,FileTime)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "setOwner", "(Path,UserPrincipal)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "setPosixFilePermissions", "(Path,Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "walkFileTree", "(Path,Set,int,FileVisitor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "write", "(Path,Iterable,Charset,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "write", "(Path,Iterable,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "write", "(Path,byte[],OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "writeString", "(Path,CharSequence,Charset,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Files", False, "writeString", "(Path,CharSequence,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "getInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "InvalidPathException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "LinkPermission", False, "LinkPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "LinkPermission", False, "LinkPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NoSuchFileException", True, "NoSuchFileException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NoSuchFileException", True, "NoSuchFileException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NoSuchFileException", True, "NoSuchFileException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NoSuchFileException", True, "NoSuchFileException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NotDirectoryException", True, "NotDirectoryException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "Path", True, "resolveSibling", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "Path", True, "resolveSibling", "(Path)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio.file", "ProviderMismatchException", True, "ProviderMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio.file", "ProviderNotFoundException", True, "ProviderNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio.file", "FileStore", "getAttribute", "(String)", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "getBlockSize", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "getFileStoreAttributeView", "(Class)", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "getTotalSpace", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "getUnallocatedSpace", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "getUsableSpace", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "isReadOnly", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "name", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "supportsFileAttributeView", "(Class)", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "supportsFileAttributeView", "(String)", "summary", "df-generated"]
+      - ["java.nio.file", "FileStore", "type", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "getFileStores", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "getSeparator", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "getUserPrincipalLookupService", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "isOpen", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "isReadOnly", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "newWatchService", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "provider", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystem", "supportedFileAttributeViews", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystems", "getDefault", "()", "summary", "df-generated"]
+      - ["java.nio.file", "FileSystems", "getFileSystem", "(URI)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "copy", "(InputStream,Path,CopyOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "delete", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "deleteIfExists", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "getLastModifiedTime", "(Path,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "getOwner", "(Path,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "getPosixFilePermissions", "(Path,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isDirectory", "(Path,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isExecutable", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isHidden", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isReadable", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isRegularFile", "(Path,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isSameFile", "(Path,Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isSymbolicLink", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "isWritable", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "lines", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "lines", "(Path,Charset)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "mismatch", "(Path,Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "newBufferedWriter", "(Path,Charset,OpenOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "newBufferedWriter", "(Path,OpenOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "notExists", "(Path,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "probeContentType", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "size", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file", "Files", "walk", "(Path,int,FileVisitOption[])", "summary", "df-generated"]
+      - ["java.nio.file", "InvalidPathException", "getIndex", "()", "summary", "df-generated"]
+      - ["java.nio.file", "Path", "endsWith", "(String)", "summary", "df-generated"]
+      - ["java.nio.file", "Path", "startsWith", "(String)", "summary", "df-generated"]
+      - ["java.nio.file", "Watchable", "register", "(WatchService,WatchEvent$Kind[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.file.spi.model.yml b/java/ql/lib/ext/generated/java.nio.file.spi.model.yml
new file mode 100644
index 00000000000..2e144b26abe
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.file.spi.model.yml
@@ -0,0 +1,39 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.nio.file.spi", "FileSystemProvider", True, "newInputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio.file.spi", "FileSystemProvider", "checkAccess", "(Path,AccessMode[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "copy", "(Path,Path,CopyOption[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "createDirectory", "(Path,FileAttribute[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "createLink", "(Path,Path)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "createSymbolicLink", "(Path,Path,FileAttribute[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "delete", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "deleteIfExists", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "getFileAttributeView", "(Path,Class,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "getFileStore", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "getFileSystem", "(URI)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "getPath", "(URI)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "getScheme", "()", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "installedProviders", "()", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "isHidden", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "isSameFile", "(Path,Path)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "move", "(Path,Path,CopyOption[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "newAsynchronousFileChannel", "(Path,Set,ExecutorService,FileAttribute[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "newByteChannel", "(Path,Set,FileAttribute[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "newDirectoryStream", "(Path,DirectoryStream$Filter)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "newFileChannel", "(Path,Set,FileAttribute[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "newFileSystem", "(Path,Map)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "newFileSystem", "(URI,Map)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "newOutputStream", "(Path,OpenOption[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "readAttributes", "(Path,Class,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "readAttributes", "(Path,String,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "readSymbolicLink", "(Path)", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileSystemProvider", "setAttribute", "(Path,String,Object,LinkOption[])", "summary", "df-generated"]
+      - ["java.nio.file.spi", "FileTypeDetector", "probeContentType", "(Path)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.model.yml b/java/ql/lib/ext/generated/java.nio.model.yml
new file mode 100644
index 00000000000..bd9bc410cda
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.nio.model.yml
@@ -0,0 +1,234 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.nio", "Buffer", True, "array", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "Buffer", True, "clear", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "duplicate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "Buffer", True, "flip", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "limit", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "mark", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "position", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "rewind", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "Buffer", True, "slice", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "Buffer", True, "slice", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "asCharBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "asDoubleBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "asFloatBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "asIntBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "asLongBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "asShortBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "get", "(byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "get", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "get", "(int,byte[],int,int)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "get", "(int,byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "order", "(ByteOrder)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(ByteBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(byte)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,ByteBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "put", "(int,byte[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putChar", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putChar", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putDouble", "(double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putDouble", "(int,double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putFloat", "(float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putFloat", "(int,float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putInt", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putInt", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putLong", "(int,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putLong", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putShort", "(int,short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "putShort", "(short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ByteBuffer", True, "wrap", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(char[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[])", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[],int,int)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "get", "(int,char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(CharBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(String,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,CharBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "put", "(int,char[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "wrap", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "wrap", "(CharSequence,int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "wrap", "(char[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "CharBuffer", True, "wrap", "(char[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(int,double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "get", "(int,double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(DoubleBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,DoubleBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,double[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "DoubleBuffer", True, "put", "(int,double[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(int,float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "get", "(int,float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(FloatBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,FloatBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,float)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,float[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "FloatBuffer", True, "put", "(int,float[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "get", "(int,int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "get", "(int,int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "get", "(int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(IntBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,IntBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int,int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "IntBuffer", True, "put", "(int[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(int,long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(int,long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "get", "(long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(LongBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,LongBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(int,long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(long[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "LongBuffer", True, "put", "(long[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "MappedByteBuffer", True, "force", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "MappedByteBuffer", True, "force", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "MappedByteBuffer", True, "load", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "asReadOnlyBuffer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "compact", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(int,short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(int,short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "get", "(short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(ShortBuffer)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,ShortBuffer,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(int,short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(short)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(short[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.nio", "ShortBuffer", True, "put", "(short[],int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.nio", "Buffer", "arrayOffset", "()", "summary", "df-generated"]
+      - ["java.nio", "Buffer", "capacity", "()", "summary", "df-generated"]
+      - ["java.nio", "Buffer", "hasArray", "()", "summary", "df-generated"]
+      - ["java.nio", "Buffer", "hasRemaining", "()", "summary", "df-generated"]
+      - ["java.nio", "Buffer", "isDirect", "()", "summary", "df-generated"]
+      - ["java.nio", "Buffer", "isReadOnly", "()", "summary", "df-generated"]
+      - ["java.nio", "Buffer", "limit", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "alignedSlice", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "alignmentOffset", "(int,int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "allocateDirect", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "get", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getChar", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getChar", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getDouble", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getDouble", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getFloat", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getFloat", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getInt", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getInt", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getLong", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getLong", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getShort", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "getShort", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "mismatch", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.nio", "ByteBuffer", "order", "()", "summary", "df-generated"]
+      - ["java.nio", "ByteOrder", "nativeOrder", "()", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "get", "()", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "mismatch", "(CharBuffer)", "summary", "df-generated"]
+      - ["java.nio", "CharBuffer", "order", "()", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "get", "()", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "mismatch", "(DoubleBuffer)", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "order", "()", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "wrap", "(double[])", "summary", "df-generated"]
+      - ["java.nio", "DoubleBuffer", "wrap", "(double[],int,int)", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "get", "()", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "mismatch", "(FloatBuffer)", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "order", "()", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "wrap", "(float[])", "summary", "df-generated"]
+      - ["java.nio", "FloatBuffer", "wrap", "(float[],int,int)", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "get", "()", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "get", "(int[])", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "mismatch", "(IntBuffer)", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "order", "()", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "wrap", "(int[])", "summary", "df-generated"]
+      - ["java.nio", "IntBuffer", "wrap", "(int[],int,int)", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "get", "()", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "mismatch", "(LongBuffer)", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "order", "()", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "wrap", "(long[])", "summary", "df-generated"]
+      - ["java.nio", "LongBuffer", "wrap", "(long[],int,int)", "summary", "df-generated"]
+      - ["java.nio", "MappedByteBuffer", "isLoaded", "()", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "allocate", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "get", "()", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "get", "(int)", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "mismatch", "(ShortBuffer)", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "order", "()", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "wrap", "(short[])", "summary", "df-generated"]
+      - ["java.nio", "ShortBuffer", "wrap", "(short[],int,int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.rmi.dgc.model.yml b/java/ql/lib/ext/generated/java.rmi.dgc.model.yml
new file mode 100644
index 00000000000..18040c242d0
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.rmi.dgc.model.yml
@@ -0,0 +1,14 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.rmi.dgc", "Lease", False, "Lease", "(VMID,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.dgc", "Lease", False, "getVMID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.rmi.dgc", "Lease", "getValue", "()", "summary", "df-generated"]
+      - ["java.rmi.dgc", "VMID", "isUnique", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.rmi.model.yml b/java/ql/lib/ext/generated/java.rmi.model.yml
new file mode 100644
index 00000000000..0eed9da9bab
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.rmi.model.yml
@@ -0,0 +1,56 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.rmi", "AccessException", True, "AccessException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "AccessException", True, "AccessException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "AccessException", True, "AccessException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "AlreadyBoundException", True, "AlreadyBoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectException", True, "ConnectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectException", True, "ConnectException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectException", True, "ConnectException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectIOException", True, "ConnectIOException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectIOException", True, "ConnectIOException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ConnectIOException", True, "ConnectIOException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "MarshalException", True, "MarshalException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "MarshalException", True, "MarshalException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "MarshalException", True, "MarshalException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "MarshalledObject", False, "get", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi", "Naming", False, "list", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi", "NoSuchObjectException", True, "NoSuchObjectException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "NotBoundException", True, "NotBoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "RMISecurityException", True, "RMISecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "RMISecurityException", True, "RMISecurityException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "RemoteException", True, "RemoteException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "RemoteException", True, "RemoteException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "RemoteException", True, "RemoteException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerError", True, "ServerError", "(String,Error)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerError", True, "ServerError", "(String,Error)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerException", True, "ServerException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerException", True, "ServerException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerException", True, "ServerException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerRuntimeException", True, "ServerRuntimeException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "ServerRuntimeException", True, "ServerRuntimeException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "StubNotFoundException", True, "StubNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "StubNotFoundException", True, "StubNotFoundException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "StubNotFoundException", True, "StubNotFoundException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnexpectedException", True, "UnexpectedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnexpectedException", True, "UnexpectedException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnexpectedException", True, "UnexpectedException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnknownHostException", True, "UnknownHostException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnknownHostException", True, "UnknownHostException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnknownHostException", True, "UnknownHostException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnmarshalException", True, "UnmarshalException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnmarshalException", True, "UnmarshalException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi", "UnmarshalException", True, "UnmarshalException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.rmi", "MarshalledObject", "MarshalledObject", "(Object)", "summary", "df-generated"]
+      - ["java.rmi", "Naming", "bind", "(String,Remote)", "summary", "df-generated"]
+      - ["java.rmi", "Naming", "lookup", "(String)", "summary", "df-generated"]
+      - ["java.rmi", "Naming", "rebind", "(String,Remote)", "summary", "df-generated"]
+      - ["java.rmi", "Naming", "unbind", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.rmi.registry.model.yml b/java/ql/lib/ext/generated/java.rmi.registry.model.yml
new file mode 100644
index 00000000000..5594ea1dc32
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.rmi.registry.model.yml
@@ -0,0 +1,13 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.rmi.registry", "LocateRegistry", "createRegistry", "(int)", "summary", "df-generated"]
+      - ["java.rmi.registry", "LocateRegistry", "createRegistry", "(int,RMIClientSocketFactory,RMIServerSocketFactory)", "summary", "df-generated"]
+      - ["java.rmi.registry", "LocateRegistry", "getRegistry", "()", "summary", "df-generated"]
+      - ["java.rmi.registry", "LocateRegistry", "getRegistry", "(String)", "summary", "df-generated"]
+      - ["java.rmi.registry", "LocateRegistry", "getRegistry", "(String,int)", "summary", "df-generated"]
+      - ["java.rmi.registry", "LocateRegistry", "getRegistry", "(String,int,RMIClientSocketFactory)", "summary", "df-generated"]
+      - ["java.rmi.registry", "LocateRegistry", "getRegistry", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.rmi.server.model.yml b/java/ql/lib/ext/generated/java.rmi.server.model.yml
new file mode 100644
index 00000000000..4fefb533828
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.rmi.server.model.yml
@@ -0,0 +1,71 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.rmi.server", "ExportException", True, "ExportException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "ExportException", True, "ExportException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "ExportException", True, "ExportException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "LogStream", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "LogStream", True, "log", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "LogStream", True, "setOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "Operation", True, "Operation", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "Operation", True, "getOperation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", True, "getClassLoader", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", True, "getSecurityContext", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoaderSpi", True, "getClassLoader", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RMIClientSocketFactory", True, "createSocket", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteObject", True, "getRef", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteObject", True, "toStub", "(Remote)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.rmi.server", "RemoteObjectInvocationHandler", True, "RemoteObjectInvocationHandler", "(RemoteRef)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "ServerCloneException", True, "ServerCloneException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "ServerCloneException", True, "ServerCloneException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "ServerCloneException", True, "ServerCloneException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "ServerNotActiveException", True, "ServerNotActiveException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SkeletonMismatchException", True, "SkeletonMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SkeletonNotFoundException", True, "SkeletonNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SkeletonNotFoundException", True, "SkeletonNotFoundException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SkeletonNotFoundException", True, "SkeletonNotFoundException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SocketSecurityException", True, "SocketSecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SocketSecurityException", True, "SocketSecurityException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "SocketSecurityException", True, "SocketSecurityException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.rmi.server", "UnicastRemoteObject", True, "exportObject", "(Remote,int,ObjectInputFilter)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
+      - ["java.rmi.server", "UnicastRemoteObject", True, "exportObject", "(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory,ObjectInputFilter)", "", "Argument[4]", "Argument[0]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.rmi.server", "LogStream", "getDefaultStream", "()", "summary", "df-generated"]
+      - ["java.rmi.server", "LogStream", "parseLevel", "(String)", "summary", "df-generated"]
+      - ["java.rmi.server", "LogStream", "setDefaultStream", "(PrintStream)", "summary", "df-generated"]
+      - ["java.rmi.server", "ObjID", "ObjID", "(int)", "summary", "df-generated"]
+      - ["java.rmi.server", "ObjID", "read", "(ObjectInput)", "summary", "df-generated"]
+      - ["java.rmi.server", "ObjID", "write", "(ObjectOutput)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "getClassAnnotation", "(Class)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "getDefaultProviderInstance", "()", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "loadClass", "(String)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "loadClass", "(String,String)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "loadClass", "(String,String,ClassLoader)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "loadClass", "(URL,String)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoader", "loadProxyClass", "(String,String[],ClassLoader)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoaderSpi", "getClassAnnotation", "(Class)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoaderSpi", "loadClass", "(String,String,ClassLoader)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIClassLoaderSpi", "loadProxyClass", "(String,String[],ClassLoader)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMIServerSocketFactory", "createServerSocket", "(int)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMISocketFactory", "getDefaultSocketFactory", "()", "summary", "df-generated"]
+      - ["java.rmi.server", "RMISocketFactory", "getFailureHandler", "()", "summary", "df-generated"]
+      - ["java.rmi.server", "RMISocketFactory", "getSocketFactory", "()", "summary", "df-generated"]
+      - ["java.rmi.server", "RMISocketFactory", "setFailureHandler", "(RMIFailureHandler)", "summary", "df-generated"]
+      - ["java.rmi.server", "RMISocketFactory", "setSocketFactory", "(RMISocketFactory)", "summary", "df-generated"]
+      - ["java.rmi.server", "RemoteServer", "getClientHost", "()", "summary", "df-generated"]
+      - ["java.rmi.server", "RemoteServer", "getLog", "()", "summary", "df-generated"]
+      - ["java.rmi.server", "RemoteServer", "setLog", "(OutputStream)", "summary", "df-generated"]
+      - ["java.rmi.server", "UID", "UID", "(short)", "summary", "df-generated"]
+      - ["java.rmi.server", "UID", "read", "(DataInput)", "summary", "df-generated"]
+      - ["java.rmi.server", "UID", "write", "(DataOutput)", "summary", "df-generated"]
+      - ["java.rmi.server", "UnicastRemoteObject", "exportObject", "(Remote)", "summary", "df-generated"]
+      - ["java.rmi.server", "UnicastRemoteObject", "exportObject", "(Remote,int)", "summary", "df-generated"]
+      - ["java.rmi.server", "UnicastRemoteObject", "exportObject", "(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory)", "summary", "df-generated"]
+      - ["java.rmi.server", "UnicastRemoteObject", "unexportObject", "(Remote,boolean)", "summary", "df-generated"]
+      - ["java.rmi.server", "Unreferenced", "unreferenced", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.cert.model.yml b/java/ql/lib/ext/generated/java.security.cert.model.yml
new file mode 100644
index 00000000000..4d98781cac2
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.security.cert.model.yml
@@ -0,0 +1,326 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.security.cert", "CRL", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CRLException", True, "CRLException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CRLException", True, "CRLException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CRLException", True, "CRLException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CRLException", True, "CRLException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPath", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "build", "(CertPathParameters)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderException", True, "CertPathBuilderException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderResult", True, "getCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", True, "validate", "(CertPath,CertPathParameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(String,Throwable,CertPath,int,CertPathValidatorException$Reason)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "getCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getCRLs", "(CRLSelector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getCertStoreParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getCertificates", "(CertSelector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStore", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "Certificate", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateException", True, "CertificateException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateException", True, "CertificateException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateException", True, "CertificateException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateException", True, "CertificateException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateExpiredException", True, "CertificateExpiredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "generateCRL", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "generateCertPath", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "generateCertificate", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateNotYetValidException", True, "CertificateNotYetValidException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "CertificateRevokedException", "(Date,CRLReason,X500Principal,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "CertificateRevokedException", "(Date,CRLReason,X500Principal,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "getAuthorityName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "getExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", True, "getRevocationDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "CollectionCertStoreParameters", True, "CollectionCertStoreParameters", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "CollectionCertStoreParameters", True, "getCollection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "LDAPCertStoreParameters", True, "LDAPCertStoreParameters", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "LDAPCertStoreParameters", True, "LDAPCertStoreParameters", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "LDAPCertStoreParameters", True, "getServerName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXBuilderParameters", True, "PKIXBuilderParameters", "(KeyStore,CertSelector)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXBuilderParameters", True, "PKIXBuilderParameters", "(Set,CertSelector)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXBuilderParameters", True, "PKIXBuilderParameters", "(Set,CertSelector)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathBuilderResult", True, "PKIXCertPathBuilderResult", "(CertPath,TrustAnchor,PolicyNode,PublicKey)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "PKIXCertPathValidatorResult", "(TrustAnchor,PolicyNode,PublicKey)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPolicyTree", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getTrustAnchor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "PKIXParameters", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "addCertPathChecker", "(PKIXCertPathChecker)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "addCertStore", "(CertStore)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "getCertPathCheckers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "getCertStores", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "getDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "getInitialPolicies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "getSigProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "getTargetCertConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "getTrustAnchors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setCertPathCheckers", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setCertStores", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setDate", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setInitialPolicies", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setSigProvider", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setTargetCertConstraints", "(CertSelector)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", True, "setTrustAnchors", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponderCert", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "getOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspExtensions", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponder", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponderCert", "(X509Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOcspResponses", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", True, "setOptions", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyQualifierInfo", True, "PolicyQualifierInfo", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyQualifierInfo", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyQualifierInfo", True, "getPolicyQualifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "PolicyQualifierInfo", True, "getPolicyQualifierId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(String,PublicKey,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X500Principal,PublicKey,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X509Certificate,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "TrustAnchor", "(X509Certificate,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getCA", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getCAName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getCAPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getNameConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "TrustAnchor", True, "getTrustedCert", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "URICertStoreParameters", False, "URICertStoreParameters", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "URICertStoreParameters", False, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getIssuerX500Principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRL", True, "getRevokedCertificate", "(X509Certificate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "addIssuer", "(X500Principal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "addIssuerName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "addIssuerName", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "getCertificateChecking", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "getDateAndTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "getIssuerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "getIssuers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "setCertificateChecking", "(X509Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "setIssuerNames", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", True, "setIssuers", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getAuthorityKeyIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getCertificateValid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getExtendedKeyUsage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getIssuer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getNameConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getPathToNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getPolicy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getPrivateKeyValid", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubjectAlternativeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubjectKeyIdentifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubjectPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "getSubjectPublicKeyAlgID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setAuthorityKeyIdentifier", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setCertificate", "(X509Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setCertificateValid", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setExtendedKeyUsage", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setIssuer", "(X500Principal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setNameConstraints", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setPolicy", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setPrivateKeyValid", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubject", "(X500Principal)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubjectKeyIdentifier", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubjectPublicKey", "(PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubjectPublicKey", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", True, "setSubjectPublicKeyAlgID", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getIssuerX500Principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.cert", "X509Certificate", True, "getSubjectX500Principal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.security.cert", "CRL", "isRevoked", "(Certificate)", "summary", "df-generated"]
+      - ["java.security.cert", "CRLSelector", "match", "(CRL)", "summary", "df-generated"]
+      - ["java.security.cert", "CertPath", "getCertificates", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPath", "getEncoded", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPath", "getEncoded", "(String)", "summary", "df-generated"]
+      - ["java.security.cert", "CertPath", "getEncodings", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", "getDefaultType", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathBuilder", "getRevocationChecker", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderSpi", "engineBuild", "(CertPathParameters)", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathBuilderSpi", "engineGetRevocationChecker", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathChecker", "check", "(Certificate)", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathChecker", "init", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathChecker", "isForwardCheckingSupported", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", "getDefaultType", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathValidator", "getRevocationChecker", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorException", "getIndex", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorSpi", "engineGetRevocationChecker", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertPathValidatorSpi", "engineValidate", "(CertPath,CertPathParameters)", "summary", "df-generated"]
+      - ["java.security.cert", "CertSelector", "match", "(Certificate)", "summary", "df-generated"]
+      - ["java.security.cert", "CertStore", "getDefaultType", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertStoreSpi", "CertStoreSpi", "(CertStoreParameters)", "summary", "df-generated"]
+      - ["java.security.cert", "CertStoreSpi", "engineGetCRLs", "(CRLSelector)", "summary", "df-generated"]
+      - ["java.security.cert", "CertStoreSpi", "engineGetCertificates", "(CertSelector)", "summary", "df-generated"]
+      - ["java.security.cert", "Certificate", "getEncoded", "()", "summary", "df-generated"]
+      - ["java.security.cert", "Certificate", "getPublicKey", "()", "summary", "df-generated"]
+      - ["java.security.cert", "Certificate", "verify", "(PublicKey)", "summary", "df-generated"]
+      - ["java.security.cert", "Certificate", "verify", "(PublicKey,Provider)", "summary", "df-generated"]
+      - ["java.security.cert", "Certificate", "verify", "(PublicKey,String)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", "generateCRLs", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", "generateCertPath", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", "generateCertPath", "(InputStream,String)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", "generateCertificates", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactory", "getCertPathEncodings", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCRL", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCRLs", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertPath", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertPath", "(InputStream,String)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertPath", "(List)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertificate", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertificates", "(InputStream)", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateFactorySpi", "engineGetCertPathEncodings", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", "getInvalidityDate", "()", "summary", "df-generated"]
+      - ["java.security.cert", "CertificateRevokedException", "getRevocationReason", "()", "summary", "df-generated"]
+      - ["java.security.cert", "LDAPCertStoreParameters", "getPort", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXBuilderParameters", "getMaxPathLength", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXBuilderParameters", "setMaxPathLength", "(int)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", "check", "(Certificate,Collection)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXCertPathChecker", "getSupportedExtensions", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "PKIXParameters", "(KeyStore)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "getPolicyQualifiersRejected", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "isAnyPolicyInhibited", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "isExplicitPolicyRequired", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "isPolicyMappingInhibited", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "isRevocationEnabled", "()", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "setAnyPolicyInhibited", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "setExplicitPolicyRequired", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "setPolicyMappingInhibited", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "setPolicyQualifiersRejected", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXParameters", "setRevocationEnabled", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "PKIXRevocationChecker", "getSoftFailExceptions", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getEncoded", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getIssuerDN", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getNextUpdate", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getRevokedCertificate", "(BigInteger)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getRevokedCertificates", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getSigAlgName", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getSigAlgOID", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getSigAlgParams", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getSignature", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getTBSCertList", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getThisUpdate", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "getVersion", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "verify", "(PublicKey)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "verify", "(PublicKey,Provider)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRL", "verify", "(PublicKey,String)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", "getCertificateIssuer", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", "getEncoded", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", "getRevocationDate", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", "getRevocationReason", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", "getSerialNumber", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLEntry", "hasExtensions", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", "getMaxCRL", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", "getMinCRL", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", "setDateAndTime", "(Date)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", "setMaxCRLNumber", "(BigInteger)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CRLSelector", "setMinCRLNumber", "(BigInteger)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "addPathToName", "(int,String)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "addPathToName", "(int,byte[])", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "addSubjectAlternativeName", "(int,String)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "addSubjectAlternativeName", "(int,byte[])", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getBasicConstraints", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getIssuerAsBytes", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getIssuerAsString", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getKeyUsage", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getMatchAllSubjectAltNames", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getSerialNumber", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getSubjectAsBytes", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "getSubjectAsString", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setBasicConstraints", "(int)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setIssuer", "(String)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setIssuer", "(byte[])", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setKeyUsage", "(boolean[])", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setMatchAllSubjectAltNames", "(boolean)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setPathToNames", "(Collection)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setSerialNumber", "(BigInteger)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setSubject", "(String)", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setSubject", "(byte[])", "summary", "df-generated"]
+      - ["java.security.cert", "X509CertSelector", "setSubjectAlternativeNames", "(Collection)", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "checkValidity", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "checkValidity", "(Date)", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getBasicConstraints", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getExtendedKeyUsage", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getIssuerAlternativeNames", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getIssuerDN", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getIssuerUniqueID", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getKeyUsage", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getNotAfter", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getNotBefore", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSerialNumber", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSigAlgName", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSigAlgOID", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSigAlgParams", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSignature", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSubjectAlternativeNames", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSubjectDN", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getSubjectUniqueID", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getTBSCertificate", "()", "summary", "df-generated"]
+      - ["java.security.cert", "X509Certificate", "getVersion", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.interfaces.model.yml b/java/ql/lib/ext/generated/java.security.interfaces.model.yml
new file mode 100644
index 00000000000..cced4d3efc9
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.security.interfaces.model.yml
@@ -0,0 +1,10 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.security.interfaces", "DSAParams", "getG", "()", "summary", "df-generated"]
+      - ["java.security.interfaces", "DSAParams", "getP", "()", "summary", "df-generated"]
+      - ["java.security.interfaces", "DSAParams", "getQ", "()", "summary", "df-generated"]
+      - ["java.security.interfaces", "RSAKey", "getParams", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.model.yml b/java/ql/lib/ext/generated/java.security.model.yml
new file mode 100644
index 00000000000..d170abb8188
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.security.model.yml
@@ -0,0 +1,462 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.security", "AccessControlContext", False, "AccessControlContext", "(AccessControlContext,DomainCombiner)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AccessControlContext", False, "AccessControlContext", "(AccessControlContext,DomainCombiner)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AccessControlContext", False, "AccessControlContext", "(ProtectionDomain[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AccessControlContext", False, "getDomainCombiner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessControlException", True, "AccessControlException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AccessControlException", True, "AccessControlException", "(String,Permission)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AccessControlException", True, "AccessControlException", "(String,Permission)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AccessControlException", True, "getPermission", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedAction,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedAction,AccessControlContext,Permission[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedExceptionAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedExceptionAction,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivileged", "(PrivilegedExceptionAction,AccessControlContext,Permission[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivilegedWithCombiner", "(PrivilegedAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivilegedWithCombiner", "(PrivilegedAction,AccessControlContext,Permission[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivilegedWithCombiner", "(PrivilegedExceptionAction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AccessController", False, "doPrivilegedWithCombiner", "(PrivilegedExceptionAction,AccessControlContext,Permission[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "init", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", True, "init", "(int,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getEncoded", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getParameterSpec", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "init", "(AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "init", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "AlgorithmParameters", True, "init", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "BasicPermission", True, "BasicPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "BasicPermission", True, "BasicPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "CodeSigner", False, "CodeSigner", "(CertPath,Timestamp)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "CodeSigner", False, "CodeSigner", "(CertPath,Timestamp)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "CodeSigner", False, "getSignerCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "CodeSigner", False, "getTimestamp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "CodeSource", True, "CodeSource", "(URL,Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "CodeSource", True, "CodeSource", "(URL,Certificate[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "CodeSource", True, "CodeSource", "(URL,CodeSigner[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "CodeSource", True, "CodeSource", "(URL,CodeSigner[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "CodeSource", True, "getCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "CodeSource", True, "getCodeSigners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "CodeSource", True, "getLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DigestException", True, "DigestException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestException", True, "DigestException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestException", True, "DigestException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestException", True, "DigestException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestInputStream", True, "DigestInputStream", "(InputStream,MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestInputStream", True, "DigestInputStream", "(InputStream,MessageDigest)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestInputStream", True, "getMessageDigest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DigestInputStream", True, "setMessageDigest", "(MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestOutputStream", True, "DigestOutputStream", "(OutputStream,MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestOutputStream", True, "DigestOutputStream", "(OutputStream,MessageDigest)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DigestOutputStream", True, "getMessageDigest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DigestOutputStream", True, "setMessageDigest", "(MessageDigest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DomainCombiner", True, "combine", "(ProtectionDomain[],ProtectionDomain[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "DomainLoadStoreParameter", "(URI,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "DomainLoadStoreParameter", "(URI,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "getConfiguration", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DomainLoadStoreParameter", False, "getProtectionParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DrbgParameters$Instantiation", False, "getPersonalizationString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DrbgParameters$NextBytes", False, "getAdditionalInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DrbgParameters$Reseed", False, "getAdditionalInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DrbgParameters", True, "instantiation", "(int,DrbgParameters$Capability,byte[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DrbgParameters", True, "nextBytes", "(int,boolean,byte[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "DrbgParameters", True, "reseed", "(boolean,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "GeneralSecurityException", True, "GeneralSecurityException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "GuardedObject", True, "GuardedObject", "(Object,Guard)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "GuardedObject", True, "GuardedObject", "(Object,Guard)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "GuardedObject", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "Identity", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "Identity", "(String,IdentityScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "Identity", "(String,IdentityScope)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "addCertificate", "(Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "certificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "getInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "getPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "getScope", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "setInfo", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Identity", True, "setPublicKey", "(PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "IdentityScope", True, "IdentityScope", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "IdentityScope", True, "IdentityScope", "(String,IdentityScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "IdentityScope", True, "IdentityScope", "(String,IdentityScope)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidAlgorithmParameterException", True, "InvalidAlgorithmParameterException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidAlgorithmParameterException", True, "InvalidAlgorithmParameterException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidAlgorithmParameterException", True, "InvalidAlgorithmParameterException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidAlgorithmParameterException", True, "InvalidAlgorithmParameterException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidKeyException", True, "InvalidKeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidKeyException", True, "InvalidKeyException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidKeyException", True, "InvalidKeyException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidKeyException", True, "InvalidKeyException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "InvalidParameterException", True, "InvalidParameterException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Key", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Key", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyException", True, "KeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyException", True, "KeyException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyException", True, "KeyException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyException", True, "KeyException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "generatePrivate", "(KeySpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "generatePublic", "(KeySpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getKeySpec", "(Key,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyFactory", True, "translateKey", "(Key)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyManagementException", True, "KeyManagementException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyManagementException", True, "KeyManagementException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyManagementException", True, "KeyManagementException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyManagementException", True, "KeyManagementException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyPair", False, "KeyPair", "(PublicKey,PrivateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyPair", False, "KeyPair", "(PublicKey,PrivateKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyPair", False, "getPrivate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPair", False, "getPublic", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "genKeyPair", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGenerator", True, "initialize", "(AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyPairGeneratorSpi", True, "generateKeyPair", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyPairGeneratorSpi", True, "initialize", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyPairGeneratorSpi", True, "initialize", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyPairGeneratorSpi", True, "initialize", "(int,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyRep", True, "KeyRep", "(KeyRep$Type,String,String,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyRep", True, "KeyRep", "(KeyRep$Type,String,String,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyRep", True, "KeyRep", "(KeyRep$Type,String,String,byte[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "getKeyStore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "getProtectionParameter", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "newInstance", "(File,KeyStore$ProtectionParameter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "newInstance", "(File,KeyStore$ProtectionParameter)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "newInstance", "(String,Provider,File,KeyStore$ProtectionParameter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "newInstance", "(String,Provider,File,KeyStore$ProtectionParameter)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "newInstance", "(String,Provider,File,KeyStore$ProtectionParameter)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Builder", True, "newInstance", "(String,Provider,File,KeyStore$ProtectionParameter)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$CallbackHandlerProtection", True, "CallbackHandlerProtection", "(CallbackHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$CallbackHandlerProtection", True, "getCallbackHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Entry$Attribute", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Entry$Attribute", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$Entry", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$LoadStoreParameter", True, "getProtectionParameter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "getProtectionAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PasswordProtection", True, "getProtectionParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "PrivateKeyEntry", "(PrivateKey,Certificate[],Set)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getCertificateChain", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$PrivateKeyEntry", False, "getPrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "SecretKeyEntry", "(SecretKey,Set)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$SecretKeyEntry", False, "getSecretKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate,Set)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "TrustedCertificateEntry", "(Certificate,Set)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStore$TrustedCertificateEntry", False, "getTrustedCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "aliases", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getCertificateAlias", "(Certificate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStore", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStoreException", True, "KeyStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStoreException", True, "KeyStoreException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStoreException", True, "KeyStoreException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStoreException", True, "KeyStoreException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineGetEntry", "(String,KeyStore$ProtectionParameter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "KeyStoreSpi", True, "engineSetEntry", "(String,KeyStore$Entry,KeyStore$ProtectionParameter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "digest", "(byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "update", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "update", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "MessageDigest", True, "update", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "NoSuchAlgorithmException", True, "NoSuchAlgorithmException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "NoSuchAlgorithmException", True, "NoSuchAlgorithmException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "NoSuchAlgorithmException", True, "NoSuchAlgorithmException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "NoSuchAlgorithmException", True, "NoSuchAlgorithmException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "NoSuchProviderException", True, "NoSuchProviderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "PKCS12Attribute", False, "PKCS12Attribute", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "PKCS12Attribute", False, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Permission", True, "Permission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Permission", True, "getActions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Permission", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "PermissionCollection", True, "add", "(Permission)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "PermissionCollection", True, "elements", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getInstance", "(String,Policy$Parameters,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Policy", True, "implies", "(ProtectionDomain,Permission)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Principal", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "PrivilegedActionException", True, "PrivilegedActionException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "PrivilegedActionException", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "ProtectionDomain", "(CodeSource,PermissionCollection,ClassLoader,Principal[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "getClassLoader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "getCodeSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "getPermissions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "ProtectionDomain", True, "getPrincipals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "Service", "(Provider,String,String,String,List,Map)", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider$Service", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider", True, "getInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider", True, "getService", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider", True, "getServices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Provider", True, "getVersionStr", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "ProviderException", True, "ProviderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProviderException", True, "ProviderException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProviderException", True, "ProviderException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "ProviderException", True, "ProviderException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "SecureRandom", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String,SecureRandomParameters)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String,SecureRandomParameters,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String,SecureRandomParameters,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String,SecureRandomParameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SecureRandom", True, "setSeed", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SecurityPermission", False, "SecurityPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SecurityPermission", False, "SecurityPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "initSign", "(PrivateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "initSign", "(PrivateKey,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "initSign", "(PrivateKey,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "initVerify", "(PublicKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "setParameter", "(AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "update", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signature", True, "update", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SignatureException", True, "SignatureException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SignatureException", True, "SignatureException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SignatureException", True, "SignatureException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SignatureException", True, "SignatureException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "SignedObject", "(Serializable,PrivateKey,Signature)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "verify", "(PublicKey,Signature)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.security", "SignedObject", False, "verify", "(PublicKey,Signature)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.security", "Signer", True, "Signer", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signer", True, "Signer", "(String,IdentityScope)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signer", True, "Signer", "(String,IdentityScope)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Signer", True, "getPrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "Signer", True, "setKeyPair", "(KeyPair)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Timestamp", False, "Timestamp", "(Date,CertPath)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "Timestamp", False, "getSignerCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "URIParameter", True, "URIParameter", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "URIParameter", True, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "UnrecoverableEntryException", True, "UnrecoverableEntryException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "UnrecoverableKeyException", True, "UnrecoverableKeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "UnresolvedPermission", "(String,String,String,Certificate[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedActions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedCerts", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security", "UnresolvedPermission", False, "getUnresolvedType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.security", "AccessControlContext", "checkPermission", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "AccessController", "checkPermission", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "AccessController", "getContext", "()", "summary", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", "generateParameters", "()", "summary", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", "init", "(AlgorithmParameterSpec)", "summary", "df-generated"]
+      - ["java.security", "AlgorithmParameterGenerator", "init", "(int)", "summary", "df-generated"]
+      - ["java.security", "AllPermission", "AllPermission", "(String,String)", "summary", "df-generated"]
+      - ["java.security", "AuthProvider", "login", "(Subject,CallbackHandler)", "summary", "df-generated"]
+      - ["java.security", "AuthProvider", "logout", "()", "summary", "df-generated"]
+      - ["java.security", "AuthProvider", "setCallbackHandler", "(CallbackHandler)", "summary", "df-generated"]
+      - ["java.security", "CodeSource", "implies", "(CodeSource)", "summary", "df-generated"]
+      - ["java.security", "DigestInputStream", "on", "(boolean)", "summary", "df-generated"]
+      - ["java.security", "DigestOutputStream", "on", "(boolean)", "summary", "df-generated"]
+      - ["java.security", "DrbgParameters$Capability", "supportsPredictionResistance", "()", "summary", "df-generated"]
+      - ["java.security", "DrbgParameters$Capability", "supportsReseeding", "()", "summary", "df-generated"]
+      - ["java.security", "DrbgParameters$Instantiation", "getCapability", "()", "summary", "df-generated"]
+      - ["java.security", "DrbgParameters$Instantiation", "getStrength", "()", "summary", "df-generated"]
+      - ["java.security", "DrbgParameters$NextBytes", "getPredictionResistance", "()", "summary", "df-generated"]
+      - ["java.security", "DrbgParameters$NextBytes", "getStrength", "()", "summary", "df-generated"]
+      - ["java.security", "DrbgParameters$Reseed", "getPredictionResistance", "()", "summary", "df-generated"]
+      - ["java.security", "Guard", "checkGuard", "(Object)", "summary", "df-generated"]
+      - ["java.security", "Identity", "removeCertificate", "(Certificate)", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "addIdentity", "(Identity)", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "getIdentity", "(Principal)", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "getIdentity", "(PublicKey)", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "getIdentity", "(String)", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "getSystemScope", "()", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "identities", "()", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "removeIdentity", "(Identity)", "summary", "df-generated"]
+      - ["java.security", "IdentityScope", "size", "()", "summary", "df-generated"]
+      - ["java.security", "Key", "getFormat", "()", "summary", "df-generated"]
+      - ["java.security", "KeyPairGenerator", "initialize", "(int)", "summary", "df-generated"]
+      - ["java.security", "KeyStore$Builder", "newInstance", "(KeyStore,KeyStore$ProtectionParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore$Builder", "newInstance", "(String,Provider,KeyStore$ProtectionParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "containsAlias", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "deleteEntry", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "entryInstanceOf", "(String,Class)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getCertificate", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getCertificateChain", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getCreationDate", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getDefaultType", "()", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getEntry", "(String,KeyStore$ProtectionParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getInstance", "(File,KeyStore$LoadStoreParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getInstance", "(File,char[])", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "getKey", "(String,char[])", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "isCertificateEntry", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "isKeyEntry", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "load", "(InputStream,char[])", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "load", "(KeyStore$LoadStoreParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "setCertificateEntry", "(String,Certificate)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "setEntry", "(String,KeyStore$Entry,KeyStore$ProtectionParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "setKeyEntry", "(String,Key,char[],Certificate[])", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "setKeyEntry", "(String,byte[],Certificate[])", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "size", "()", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "store", "(KeyStore$LoadStoreParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStore", "store", "(OutputStream,char[])", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineAliases", "()", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineContainsAlias", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineDeleteEntry", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineEntryInstanceOf", "(String,Class)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineGetCertificate", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineGetCertificateAlias", "(Certificate)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineGetCertificateChain", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineGetCreationDate", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineGetKey", "(String,char[])", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineIsCertificateEntry", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineIsKeyEntry", "(String)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineLoad", "(InputStream,char[])", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineLoad", "(KeyStore$LoadStoreParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineProbe", "(InputStream)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineSetCertificateEntry", "(String,Certificate)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineSetKeyEntry", "(String,byte[],Certificate[])", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineSize", "()", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineStore", "(KeyStore$LoadStoreParameter)", "summary", "df-generated"]
+      - ["java.security", "KeyStoreSpi", "engineStore", "(OutputStream,char[])", "summary", "df-generated"]
+      - ["java.security", "MessageDigest", "getDigestLength", "()", "summary", "df-generated"]
+      - ["java.security", "MessageDigest", "isEqual", "(byte[],byte[])", "summary", "df-generated"]
+      - ["java.security", "MessageDigest", "reset", "()", "summary", "df-generated"]
+      - ["java.security", "MessageDigest", "update", "(byte)", "summary", "df-generated"]
+      - ["java.security", "Permission", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "Permission", "newPermissionCollection", "()", "summary", "df-generated"]
+      - ["java.security", "PermissionCollection", "elementsAsStream", "()", "summary", "df-generated"]
+      - ["java.security", "PermissionCollection", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "PermissionCollection", "isReadOnly", "()", "summary", "df-generated"]
+      - ["java.security", "PermissionCollection", "setReadOnly", "()", "summary", "df-generated"]
+      - ["java.security", "Policy", "getPermissions", "(CodeSource)", "summary", "df-generated"]
+      - ["java.security", "Policy", "getPermissions", "(ProtectionDomain)", "summary", "df-generated"]
+      - ["java.security", "Policy", "getPolicy", "()", "summary", "df-generated"]
+      - ["java.security", "Policy", "refresh", "()", "summary", "df-generated"]
+      - ["java.security", "Policy", "setPolicy", "(Policy)", "summary", "df-generated"]
+      - ["java.security", "Principal", "implies", "(Subject)", "summary", "df-generated"]
+      - ["java.security", "ProtectionDomain", "implies", "(Permission)", "summary", "df-generated"]
+      - ["java.security", "ProtectionDomain", "staticPermissionsOnly", "()", "summary", "df-generated"]
+      - ["java.security", "Provider$Service", "newInstance", "(Object)", "summary", "df-generated"]
+      - ["java.security", "Provider$Service", "supportsParameter", "(Object)", "summary", "df-generated"]
+      - ["java.security", "Provider", "configure", "(String)", "summary", "df-generated"]
+      - ["java.security", "Provider", "getVersion", "()", "summary", "df-generated"]
+      - ["java.security", "Provider", "isConfigured", "()", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "generateSeed", "(int)", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "getInstanceStrong", "()", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "getParameters", "()", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "getSeed", "(int)", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "nextBytes", "(byte[],SecureRandomParameters)", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "reseed", "()", "summary", "df-generated"]
+      - ["java.security", "SecureRandom", "reseed", "(SecureRandomParameters)", "summary", "df-generated"]
+      - ["java.security", "Security", "addProvider", "(Provider)", "summary", "df-generated"]
+      - ["java.security", "Security", "getAlgorithmProperty", "(String,String)", "summary", "df-generated"]
+      - ["java.security", "Security", "getAlgorithms", "(String)", "summary", "df-generated"]
+      - ["java.security", "Security", "getProperty", "(String)", "summary", "df-generated"]
+      - ["java.security", "Security", "getProvider", "(String)", "summary", "df-generated"]
+      - ["java.security", "Security", "getProviders", "()", "summary", "df-generated"]
+      - ["java.security", "Security", "getProviders", "(Map)", "summary", "df-generated"]
+      - ["java.security", "Security", "getProviders", "(String)", "summary", "df-generated"]
+      - ["java.security", "Security", "insertProviderAt", "(Provider,int)", "summary", "df-generated"]
+      - ["java.security", "Security", "removeProvider", "(String)", "summary", "df-generated"]
+      - ["java.security", "Security", "setProperty", "(String,String)", "summary", "df-generated"]
+      - ["java.security", "Signature", "getParameter", "(String)", "summary", "df-generated"]
+      - ["java.security", "Signature", "initVerify", "(Certificate)", "summary", "df-generated"]
+      - ["java.security", "Signature", "setParameter", "(String,Object)", "summary", "df-generated"]
+      - ["java.security", "Signature", "sign", "()", "summary", "df-generated"]
+      - ["java.security", "Signature", "sign", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.security", "Signature", "update", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.security", "Signature", "update", "(byte)", "summary", "df-generated"]
+      - ["java.security", "Signature", "verify", "(byte[])", "summary", "df-generated"]
+      - ["java.security", "Signature", "verify", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.security", "Timestamp", "getTimestamp", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.spec.model.yml b/java/ql/lib/ext/generated/java.security.spec.model.yml
new file mode 100644
index 00000000000..ba978ed02fa
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.security.spec.model.yml
@@ -0,0 +1,146 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.security.spec", "ECGenParameterSpec", True, "ECGenParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "ECParameterSpec", "(EllipticCurve,ECPoint,BigInteger,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "ECParameterSpec", "(EllipticCurve,ECPoint,BigInteger,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "getCurve", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "ECParameterSpec", True, "getGenerator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "ECPrivateKeySpec", True, "ECPrivateKeySpec", "(BigInteger,ECParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "ECPrivateKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "ECPublicKeySpec", "(ECPoint,ECParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "ECPublicKeySpec", "(ECPoint,ECParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "ECPublicKeySpec", True, "getW", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EdDSAParameterSpec", True, "EdDSAParameterSpec", "(boolean,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EdDSAParameterSpec", True, "getContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "EdECPrivateKeySpec", "(NamedParameterSpec,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "EdECPrivateKeySpec", "(NamedParameterSpec,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPrivateKeySpec", False, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "EdECPublicKeySpec", "(NamedParameterSpec,EdECPoint)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "EdECPublicKeySpec", "(NamedParameterSpec,EdECPoint)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EdECPublicKeySpec", False, "getPoint", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "EllipticCurve", "(ECField,BigInteger,BigInteger,byte[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "getField", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EllipticCurve", True, "getSeed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EncodedKeySpec", True, "EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "EncodedKeySpec", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "EncodedKeySpec", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "InvalidKeySpecException", True, "InvalidKeySpecException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "InvalidParameterSpecException", True, "InvalidParameterSpecException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "MGF1ParameterSpec", True, "MGF1ParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "MGF1ParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "NamedParameterSpec", True, "NamedParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "NamedParameterSpec", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "PKCS8EncodedKeySpec", True, "PKCS8EncodedKeySpec", "(byte[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "PSSParameterSpec", "(String,String,AlgorithmParameterSpec,int,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "getMGFAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", True, "getMGFParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "RSAKeyGenParameterSpec", True, "RSAKeyGenParameterSpec", "(int,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "RSAKeyGenParameterSpec", True, "getKeyParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[])", "", "Argument[8].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[],AlgorithmParameterSpec)", "", "Argument[8].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "RSAMultiPrimePrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,RSAOtherPrimeInfo[],AlgorithmParameterSpec)", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", True, "getOtherPrimeInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", True, "RSAPrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "RSAPrivateKeySpec", True, "RSAPrivateKeySpec", "(BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "RSAPrivateKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "RSAPublicKeySpec", True, "RSAPublicKeySpec", "(BigInteger,BigInteger,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "RSAPublicKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "X509EncodedKeySpec", True, "X509EncodedKeySpec", "(byte[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "XECPrivateKeySpec", "(AlgorithmParameterSpec,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "XECPrivateKeySpec", "(AlgorithmParameterSpec,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "XECPrivateKeySpec", True, "getScalar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.security.spec", "XECPublicKeySpec", True, "XECPublicKeySpec", "(AlgorithmParameterSpec,BigInteger)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.security.spec", "XECPublicKeySpec", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.security.spec", "DSAGenParameterSpec", "DSAGenParameterSpec", "(int,int)", "summary", "df-generated"]
+      - ["java.security.spec", "DSAGenParameterSpec", "DSAGenParameterSpec", "(int,int,int)", "summary", "df-generated"]
+      - ["java.security.spec", "DSAGenParameterSpec", "getPrimePLength", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAGenParameterSpec", "getSeedLength", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAGenParameterSpec", "getSubprimeQLength", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAParameterSpec", "DSAParameterSpec", "(BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPrivateKeySpec", "DSAPrivateKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPrivateKeySpec", "getG", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPrivateKeySpec", "getP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPrivateKeySpec", "getQ", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPrivateKeySpec", "getX", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPublicKeySpec", "DSAPublicKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPublicKeySpec", "getG", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPublicKeySpec", "getP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPublicKeySpec", "getQ", "()", "summary", "df-generated"]
+      - ["java.security.spec", "DSAPublicKeySpec", "getY", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECField", "getFieldSize", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldF2m", "ECFieldF2m", "(int)", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldF2m", "ECFieldF2m", "(int,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldF2m", "ECFieldF2m", "(int,int[])", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldF2m", "getM", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldF2m", "getMidTermsOfReductionPolynomial", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldF2m", "getReductionPolynomial", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldFp", "ECFieldFp", "(BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "ECFieldFp", "getP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECParameterSpec", "getCofactor", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECParameterSpec", "getOrder", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECPoint", "ECPoint", "(BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "ECPoint", "getAffineX", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECPoint", "getAffineY", "()", "summary", "df-generated"]
+      - ["java.security.spec", "ECPrivateKeySpec", "getS", "()", "summary", "df-generated"]
+      - ["java.security.spec", "EdDSAParameterSpec", "EdDSAParameterSpec", "(boolean)", "summary", "df-generated"]
+      - ["java.security.spec", "EdDSAParameterSpec", "isPrehash", "()", "summary", "df-generated"]
+      - ["java.security.spec", "EdECPoint", "EdECPoint", "(boolean,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "EdECPoint", "getY", "()", "summary", "df-generated"]
+      - ["java.security.spec", "EdECPoint", "isXOdd", "()", "summary", "df-generated"]
+      - ["java.security.spec", "EllipticCurve", "getA", "()", "summary", "df-generated"]
+      - ["java.security.spec", "EllipticCurve", "getB", "()", "summary", "df-generated"]
+      - ["java.security.spec", "EncodedKeySpec", "getFormat", "()", "summary", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", "PSSParameterSpec", "(int)", "summary", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", "getSaltLength", "()", "summary", "df-generated"]
+      - ["java.security.spec", "PSSParameterSpec", "getTrailerField", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAKeyGenParameterSpec", "RSAKeyGenParameterSpec", "(int,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "RSAKeyGenParameterSpec", "getKeysize", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAKeyGenParameterSpec", "getPublicExponent", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", "getCrtCoefficient", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", "getPrimeExponentP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", "getPrimeExponentQ", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", "getPrimeP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", "getPrimeQ", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAMultiPrimePrivateCrtKeySpec", "getPublicExponent", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAOtherPrimeInfo", "RSAOtherPrimeInfo", "(BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "RSAOtherPrimeInfo", "getCrtCoefficient", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAOtherPrimeInfo", "getExponent", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAOtherPrimeInfo", "getPrime", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", "RSAPrivateCrtKeySpec", "(BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", "getCrtCoefficient", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", "getPrimeExponentP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", "getPrimeExponentQ", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", "getPrimeP", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", "getPrimeQ", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateCrtKeySpec", "getPublicExponent", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateKeySpec", "RSAPrivateKeySpec", "(BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateKeySpec", "getModulus", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPrivateKeySpec", "getPrivateExponent", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPublicKeySpec", "RSAPublicKeySpec", "(BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPublicKeySpec", "getModulus", "()", "summary", "df-generated"]
+      - ["java.security.spec", "RSAPublicKeySpec", "getPublicExponent", "()", "summary", "df-generated"]
+      - ["java.security.spec", "XECPublicKeySpec", "getU", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.sql.model.yml b/java/ql/lib/ext/generated/java.sql.model.yml
new file mode 100644
index 00000000000..310a430ab75
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.sql.model.yml
@@ -0,0 +1,465 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.sql", "Array", True, "getArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Array", True, "getArray", "(Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Array", True, "getArray", "(long,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Array", True, "getArray", "(long,int,Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Array", True, "getBaseTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,int[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,int[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,int[],Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,int[],Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,int[],Throwable)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,long[],Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,long[],Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int,long[],Throwable)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int[],Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int[],Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,String,int[],Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,int[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,int[],Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(String,int[],Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "BatchUpdateException", True, "BatchUpdateException", "(int[],Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "Blob", True, "getBinaryStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Blob", True, "getBinaryStream", "(long,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Clob", True, "getCharacterStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Clob", True, "getCharacterStream", "(long,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Clob", True, "getSubString", "(long,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "DataTruncation", True, "DataTruncation", "(int,boolean,boolean,int,int,Throwable)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "DriverPropertyInfo", True, "DriverPropertyInfo", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "DriverPropertyInfo", True, "DriverPropertyInfo", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "Ref", True, "getBaseTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Ref", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Ref", True, "setObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", True, "getCatalogName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", True, "getColumnLabel", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", True, "getColumnName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", True, "getColumnTypeName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", True, "getSchemaName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", True, "getTableName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map,Throwable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(Map,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map,Throwable)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,Map,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,Map,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "SQLClientInfoException", "(String,String,int,Map,Throwable)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLClientInfoException", True, "getFailedProperties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLDataException", True, "SQLDataException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "SQLException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "getNextException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLException", True, "getSQLState", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLFeatureNotSupportedException", True, "SQLFeatureNotSupportedException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readAsciiStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readBinaryStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readBlob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readCharacterStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readClob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readNClob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readNString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readRef", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readRowId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readSQLXML", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readTimestamp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLInput", True, "readURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLIntegrityConstraintViolationException", True, "SQLIntegrityConstraintViolationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLInvalidAuthorizationSpecException", True, "SQLInvalidAuthorizationSpecException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientConnectionException", True, "SQLNonTransientConnectionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLNonTransientException", True, "SQLNonTransientException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeAsciiStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeBinaryStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeBytes", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeCharacterStream", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeDate", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeNClob", "(NClob)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeNString", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeRowId", "(RowId)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeSQLXML", "(SQLXML)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeString", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeTime", "(Time)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLOutput", True, "writeTimestamp", "(Timestamp)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLPermission", False, "SQLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLPermission", False, "SQLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLRecoverableException", True, "SQLRecoverableException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLSyntaxErrorException", True, "SQLSyntaxErrorException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTimeoutException", True, "SQLTimeoutException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransactionRollbackException", True, "SQLTransactionRollbackException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientConnectionException", True, "SQLTransientConnectionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLTransientException", True, "SQLTransientException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,String,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "SQLWarning", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.sql", "SQLWarning", True, "getNextWarning", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Statement", True, "enquoteIdentifier", "(String,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Statement", True, "enquoteLiteral", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Statement", True, "enquoteNCharLiteral", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Struct", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Struct", True, "getAttributes", "(Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Struct", True, "getSQLTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.sql", "Wrapper", True, "unwrap", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.sql", "Array", "free", "()", "summary", "df-generated"]
+      - ["java.sql", "Array", "getBaseType", "()", "summary", "df-generated"]
+      - ["java.sql", "Array", "getResultSet", "()", "summary", "df-generated"]
+      - ["java.sql", "Array", "getResultSet", "(Map)", "summary", "df-generated"]
+      - ["java.sql", "Array", "getResultSet", "(long,int)", "summary", "df-generated"]
+      - ["java.sql", "Array", "getResultSet", "(long,int,Map)", "summary", "df-generated"]
+      - ["java.sql", "BatchUpdateException", "BatchUpdateException", "(int[])", "summary", "df-generated"]
+      - ["java.sql", "BatchUpdateException", "getLargeUpdateCounts", "()", "summary", "df-generated"]
+      - ["java.sql", "BatchUpdateException", "getUpdateCounts", "()", "summary", "df-generated"]
+      - ["java.sql", "Blob", "free", "()", "summary", "df-generated"]
+      - ["java.sql", "Blob", "getBytes", "(long,int)", "summary", "df-generated"]
+      - ["java.sql", "Blob", "length", "()", "summary", "df-generated"]
+      - ["java.sql", "Blob", "position", "(Blob,long)", "summary", "df-generated"]
+      - ["java.sql", "Blob", "position", "(byte[],long)", "summary", "df-generated"]
+      - ["java.sql", "Blob", "setBinaryStream", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Blob", "setBytes", "(long,byte[])", "summary", "df-generated"]
+      - ["java.sql", "Blob", "setBytes", "(long,byte[],int,int)", "summary", "df-generated"]
+      - ["java.sql", "Blob", "truncate", "(long)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "registerOutParameter", "(String,SQLType)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "registerOutParameter", "(String,SQLType,String)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "registerOutParameter", "(String,SQLType,int)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "registerOutParameter", "(int,SQLType)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "registerOutParameter", "(int,SQLType,String)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "registerOutParameter", "(int,SQLType,int)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "setObject", "(String,Object,SQLType)", "summary", "df-generated"]
+      - ["java.sql", "CallableStatement", "setObject", "(String,Object,SQLType,int)", "summary", "df-generated"]
+      - ["java.sql", "Clob", "free", "()", "summary", "df-generated"]
+      - ["java.sql", "Clob", "getAsciiStream", "()", "summary", "df-generated"]
+      - ["java.sql", "Clob", "length", "()", "summary", "df-generated"]
+      - ["java.sql", "Clob", "position", "(Clob,long)", "summary", "df-generated"]
+      - ["java.sql", "Clob", "position", "(String,long)", "summary", "df-generated"]
+      - ["java.sql", "Clob", "setAsciiStream", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Clob", "setCharacterStream", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Clob", "setString", "(long,String)", "summary", "df-generated"]
+      - ["java.sql", "Clob", "setString", "(long,String,int,int)", "summary", "df-generated"]
+      - ["java.sql", "Clob", "truncate", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Connection", "beginRequest", "()", "summary", "df-generated"]
+      - ["java.sql", "Connection", "endRequest", "()", "summary", "df-generated"]
+      - ["java.sql", "Connection", "setShardingKey", "(ShardingKey)", "summary", "df-generated"]
+      - ["java.sql", "Connection", "setShardingKey", "(ShardingKey,ShardingKey)", "summary", "df-generated"]
+      - ["java.sql", "Connection", "setShardingKeyIfValid", "(ShardingKey,ShardingKey,int)", "summary", "df-generated"]
+      - ["java.sql", "Connection", "setShardingKeyIfValid", "(ShardingKey,int)", "summary", "df-generated"]
+      - ["java.sql", "DataTruncation", "DataTruncation", "(int,boolean,boolean,int,int)", "summary", "df-generated"]
+      - ["java.sql", "DataTruncation", "getDataSize", "()", "summary", "df-generated"]
+      - ["java.sql", "DataTruncation", "getIndex", "()", "summary", "df-generated"]
+      - ["java.sql", "DataTruncation", "getParameter", "()", "summary", "df-generated"]
+      - ["java.sql", "DataTruncation", "getRead", "()", "summary", "df-generated"]
+      - ["java.sql", "DataTruncation", "getTransferSize", "()", "summary", "df-generated"]
+      - ["java.sql", "DatabaseMetaData", "getMaxLogicalLobSize", "()", "summary", "df-generated"]
+      - ["java.sql", "DatabaseMetaData", "supportsRefCursors", "()", "summary", "df-generated"]
+      - ["java.sql", "DatabaseMetaData", "supportsSharding", "()", "summary", "df-generated"]
+      - ["java.sql", "Date", "Date", "(int,int,int)", "summary", "df-generated"]
+      - ["java.sql", "Date", "Date", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Date", "toLocalDate", "()", "summary", "df-generated"]
+      - ["java.sql", "Date", "valueOf", "(LocalDate)", "summary", "df-generated"]
+      - ["java.sql", "Date", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "deregisterDriver", "(Driver)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "drivers", "()", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getConnection", "(String)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getConnection", "(String,Properties)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getConnection", "(String,String,String)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getDriver", "(String)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getDrivers", "()", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getLogStream", "()", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getLogWriter", "()", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "getLoginTimeout", "()", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "println", "(String)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "registerDriver", "(Driver)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "registerDriver", "(Driver,DriverAction)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "setLogStream", "(PrintStream)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "setLogWriter", "(PrintWriter)", "summary", "df-generated"]
+      - ["java.sql", "DriverManager", "setLoginTimeout", "(int)", "summary", "df-generated"]
+      - ["java.sql", "JDBCType", "valueOf", "(int)", "summary", "df-generated"]
+      - ["java.sql", "PreparedStatement", "executeLargeUpdate", "()", "summary", "df-generated"]
+      - ["java.sql", "PreparedStatement", "setObject", "(int,Object,SQLType)", "summary", "df-generated"]
+      - ["java.sql", "PreparedStatement", "setObject", "(int,Object,SQLType,int)", "summary", "df-generated"]
+      - ["java.sql", "Ref", "getObject", "(Map)", "summary", "df-generated"]
+      - ["java.sql", "ResultSet", "updateObject", "(String,Object,SQLType)", "summary", "df-generated"]
+      - ["java.sql", "ResultSet", "updateObject", "(String,Object,SQLType,int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSet", "updateObject", "(int,Object,SQLType)", "summary", "df-generated"]
+      - ["java.sql", "ResultSet", "updateObject", "(int,Object,SQLType,int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "getColumnClassName", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "getColumnCount", "()", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "getColumnDisplaySize", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "getColumnType", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "getPrecision", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "getScale", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isAutoIncrement", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isCaseSensitive", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isCurrency", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isDefinitelyWritable", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isNullable", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isReadOnly", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isSearchable", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isSigned", "(int)", "summary", "df-generated"]
+      - ["java.sql", "ResultSetMetaData", "isWritable", "(int)", "summary", "df-generated"]
+      - ["java.sql", "SQLException", "getErrorCode", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLException", "setNextException", "(SQLException)", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readBigDecimal", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readBoolean", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readByte", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readDouble", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readFloat", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readInt", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readLong", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readObject", "(Class)", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "readShort", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLInput", "wasNull", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeArray", "(Array)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeBigDecimal", "(BigDecimal)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeBlob", "(Blob)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeBoolean", "(boolean)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeByte", "(byte)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeClob", "(Clob)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeDouble", "(double)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeFloat", "(float)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeInt", "(int)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeLong", "(long)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeObject", "(Object,SQLType)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeObject", "(SQLData)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeRef", "(Ref)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeShort", "(short)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeStruct", "(Struct)", "summary", "df-generated"]
+      - ["java.sql", "SQLOutput", "writeURL", "(URL)", "summary", "df-generated"]
+      - ["java.sql", "SQLType", "getName", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLType", "getVendor", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLType", "getVendorTypeNumber", "()", "summary", "df-generated"]
+      - ["java.sql", "SQLWarning", "setNextWarning", "(SQLWarning)", "summary", "df-generated"]
+      - ["java.sql", "Statement", "executeLargeBatch", "()", "summary", "df-generated"]
+      - ["java.sql", "Statement", "executeLargeUpdate", "(String)", "summary", "df-generated"]
+      - ["java.sql", "Statement", "executeLargeUpdate", "(String,String[])", "summary", "df-generated"]
+      - ["java.sql", "Statement", "executeLargeUpdate", "(String,int)", "summary", "df-generated"]
+      - ["java.sql", "Statement", "executeLargeUpdate", "(String,int[])", "summary", "df-generated"]
+      - ["java.sql", "Statement", "getLargeMaxRows", "()", "summary", "df-generated"]
+      - ["java.sql", "Statement", "getLargeUpdateCount", "()", "summary", "df-generated"]
+      - ["java.sql", "Statement", "isSimpleIdentifier", "(String)", "summary", "df-generated"]
+      - ["java.sql", "Statement", "setLargeMaxRows", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Time", "Time", "(int,int,int)", "summary", "df-generated"]
+      - ["java.sql", "Time", "Time", "(long)", "summary", "df-generated"]
+      - ["java.sql", "Time", "toLocalTime", "()", "summary", "df-generated"]
+      - ["java.sql", "Time", "valueOf", "(LocalTime)", "summary", "df-generated"]
+      - ["java.sql", "Time", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "Timestamp", "(int,int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "after", "(Timestamp)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "before", "(Timestamp)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "compareTo", "(Timestamp)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "equals", "(Timestamp)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "from", "(Instant)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "getNanos", "()", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "setNanos", "(int)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "toLocalDateTime", "()", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "valueOf", "(LocalDateTime)", "summary", "df-generated"]
+      - ["java.sql", "Timestamp", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.sql", "Wrapper", "isWrapperFor", "(Class)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.text.model.yml b/java/ql/lib/ext/generated/java.text.model.yml
new file mode 100644
index 00000000000..6418b607358
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.text.model.yml
@@ -0,0 +1,339 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.text", "Annotation", True, "Annotation", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "Annotation", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "AttributedString", True, "AttributedString", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "AttributedString", True, "AttributedString", "(String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "AttributedString", True, "getIterator", "(AttributedCharacterIterator$Attribute[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "AttributedString", True, "getIterator", "(AttributedCharacterIterator$Attribute[],int,int)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Bidi", False, "Bidi", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "Bidi", False, "Bidi", "(char[],int,byte[],int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "BreakIterator", True, "setText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "ChoiceFormat", True, "ChoiceFormat", "(double[],String[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "ChoiceFormat", True, "getFormats", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "ChoiceFormat", True, "setChoices", "(double[],String[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "ChoiceFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "CollationKey", True, "getSourceString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Collator", True, "getCollationKey", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "Collator", True, "getCollationKey", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Collator", True, "getCollationKey", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[],String)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "CompactNumberFormat", False, "CompactNumberFormat", "(String,DecimalFormatSymbols,String[],String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "format", "(Date,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "format", "(Date,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "format", "(Date,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getCalendar", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getDateInstance", "(int,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getDateTimeInstance", "(int,int,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getNumberFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getTimeInstance", "(int,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "getTimeZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "setCalendar", "(Calendar)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "setNumberFormat", "(NumberFormat)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormat", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "DateFormatSymbols", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getAmPmStrings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getEras", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getLocalPatternChars", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getMonths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getShortMonths", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getShortWeekdays", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getWeekdays", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "getZoneStrings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setAmPmStrings", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setEras", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setLocalPatternChars", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setMonths", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setShortMonths", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setShortWeekdays", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setWeekdays", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DateFormatSymbols", True, "setZoneStrings", "(String[][])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "DecimalFormat", "(String,DecimalFormatSymbols)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "getDecimalFormatSymbols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "getNegativePrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "getNegativeSuffix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "getPositivePrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "getPositiveSuffix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "setDecimalFormatSymbols", "(DecimalFormatSymbols)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "setNegativePrefix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "setNegativeSuffix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "setPositivePrefix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "setPositiveSuffix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "toLocalizedPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "DecimalFormatSymbols", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getCurrency", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getCurrencySymbol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getExponentSeparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getInfinity", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getInternationalCurrencySymbol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "getNaN", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setCurrency", "(Currency)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setExponentSeparator", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setInfinity", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setInternationalCurrencySymbol", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", True, "setNaN", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "FieldPosition", True, "getFieldAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "format", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "format", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "MessageFormat", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[0].ArrayElement", "Argument[1]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "getFormats", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "getFormatsByArgumentIndex", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "parse", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "setFormat", "(int,Format)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "setFormatByArgumentIndex", "(int,Format)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "setFormats", "(Format[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "setFormatsByArgumentIndex", "(Format[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "MessageFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "Normalizer", False, "normalize", "(CharSequence,Normalizer$Form)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(double,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "format", "(long,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "getCompactNumberInstance", "(Locale,NumberFormat$Style)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "getCurrency", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "getCurrencyInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "getIntegerInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "getNumberInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "getPercentInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "NumberFormat", True, "setCurrency", "(Currency)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "ParseException", True, "ParseException", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "RuleBasedCollator", True, "RuleBasedCollator", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "RuleBasedCollator", True, "getCollationElementIterator", "(CharacterIterator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "RuleBasedCollator", True, "getCollationElementIterator", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "RuleBasedCollator", True, "getRules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,DateFormatSymbols)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,DateFormatSymbols)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "SimpleDateFormat", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "applyPattern", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "get2DigitYearStart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "getDateFormatSymbols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "setDateFormatSymbols", "(DateFormatSymbols)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "SimpleDateFormat", True, "toPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.text", "StringCharacterIterator", False, "StringCharacterIterator", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "StringCharacterIterator", False, "StringCharacterIterator", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "StringCharacterIterator", False, "StringCharacterIterator", "(String,int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.text", "StringCharacterIterator", False, "setText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.text", "AttributedCharacterIterator", "getAllAttributeKeys", "()", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getAttribute", "(AttributedCharacterIterator$Attribute)", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getAttributes", "()", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getRunLimit", "()", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getRunLimit", "(AttributedCharacterIterator$Attribute)", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getRunLimit", "(Set)", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getRunStart", "()", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getRunStart", "(AttributedCharacterIterator$Attribute)", "summary", "df-generated"]
+      - ["java.text", "AttributedCharacterIterator", "getRunStart", "(Set)", "summary", "df-generated"]
+      - ["java.text", "AttributedString", "AttributedString", "(AttributedCharacterIterator)", "summary", "df-generated"]
+      - ["java.text", "AttributedString", "AttributedString", "(AttributedCharacterIterator,int,int)", "summary", "df-generated"]
+      - ["java.text", "AttributedString", "AttributedString", "(AttributedCharacterIterator,int,int,AttributedCharacterIterator$Attribute[])", "summary", "df-generated"]
+      - ["java.text", "AttributedString", "addAttribute", "(AttributedCharacterIterator$Attribute,Object)", "summary", "df-generated"]
+      - ["java.text", "AttributedString", "addAttribute", "(AttributedCharacterIterator$Attribute,Object,int,int)", "summary", "df-generated"]
+      - ["java.text", "AttributedString", "addAttributes", "(Map,int,int)", "summary", "df-generated"]
+      - ["java.text", "AttributedString", "getIterator", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "Bidi", "(AttributedCharacterIterator)", "summary", "df-generated"]
+      - ["java.text", "Bidi", "baseIsLeftToRight", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "createLineBidi", "(int,int)", "summary", "df-generated"]
+      - ["java.text", "Bidi", "getBaseLevel", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "getLength", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "getLevelAt", "(int)", "summary", "df-generated"]
+      - ["java.text", "Bidi", "getRunCount", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "getRunLevel", "(int)", "summary", "df-generated"]
+      - ["java.text", "Bidi", "getRunLimit", "(int)", "summary", "df-generated"]
+      - ["java.text", "Bidi", "getRunStart", "(int)", "summary", "df-generated"]
+      - ["java.text", "Bidi", "isLeftToRight", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "isMixed", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "isRightToLeft", "()", "summary", "df-generated"]
+      - ["java.text", "Bidi", "reorderVisually", "(byte[],int,Object[],int,int)", "summary", "df-generated"]
+      - ["java.text", "Bidi", "requiresBidi", "(char[],int,int)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "current", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "first", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "following", "(int)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getCharacterInstance", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getCharacterInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getLineInstance", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getLineInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getSentenceInstance", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getSentenceInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getText", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getWordInstance", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "getWordInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "isBoundary", "(int)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "last", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "next", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "next", "(int)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "preceding", "(int)", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "previous", "()", "summary", "df-generated"]
+      - ["java.text", "BreakIterator", "setText", "(CharacterIterator)", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "current", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "first", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "getBeginIndex", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "getEndIndex", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "getIndex", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "last", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "next", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "previous", "()", "summary", "df-generated"]
+      - ["java.text", "CharacterIterator", "setIndex", "(int)", "summary", "df-generated"]
+      - ["java.text", "ChoiceFormat", "ChoiceFormat", "(String)", "summary", "df-generated"]
+      - ["java.text", "ChoiceFormat", "applyPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "ChoiceFormat", "getLimits", "()", "summary", "df-generated"]
+      - ["java.text", "ChoiceFormat", "nextDouble", "(double)", "summary", "df-generated"]
+      - ["java.text", "ChoiceFormat", "nextDouble", "(double,boolean)", "summary", "df-generated"]
+      - ["java.text", "ChoiceFormat", "previousDouble", "(double)", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "getMaxExpansion", "(int)", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "getOffset", "()", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "next", "()", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "previous", "()", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "primaryOrder", "(int)", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "reset", "()", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "secondaryOrder", "(int)", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "setOffset", "(int)", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "setText", "(CharacterIterator)", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "setText", "(String)", "summary", "df-generated"]
+      - ["java.text", "CollationElementIterator", "tertiaryOrder", "(int)", "summary", "df-generated"]
+      - ["java.text", "CollationKey", "toByteArray", "()", "summary", "df-generated"]
+      - ["java.text", "Collator", "compare", "(String,String)", "summary", "df-generated"]
+      - ["java.text", "Collator", "equals", "(String,String)", "summary", "df-generated"]
+      - ["java.text", "Collator", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.text", "Collator", "getDecomposition", "()", "summary", "df-generated"]
+      - ["java.text", "Collator", "getInstance", "()", "summary", "df-generated"]
+      - ["java.text", "Collator", "getInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text", "Collator", "getStrength", "()", "summary", "df-generated"]
+      - ["java.text", "Collator", "setDecomposition", "(int)", "summary", "df-generated"]
+      - ["java.text", "Collator", "setStrength", "(int)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "getGroupingSize", "()", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "isParseBigDecimal", "()", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setGroupingSize", "(int)", "summary", "df-generated"]
+      - ["java.text", "CompactNumberFormat", "setParseBigDecimal", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "DateFormat$Field", "getCalendarField", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormat$Field", "ofCalendarField", "(int)", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getDateInstance", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getDateInstance", "(int)", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getDateTimeInstance", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getDateTimeInstance", "(int,int)", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getInstance", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getTimeInstance", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "getTimeInstance", "(int)", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "isLenient", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "parse", "(String,ParsePosition)", "summary", "df-generated"]
+      - ["java.text", "DateFormat", "setLenient", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "DateFormatSymbols", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.text", "DateFormatSymbols", "getInstance", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "DecimalFormat", "(String)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "applyLocalizedPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "applyPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "getGroupingSize", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "getMultiplier", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "isDecimalSeparatorAlwaysShown", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "isParseBigDecimal", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setDecimalSeparatorAlwaysShown", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setGroupingSize", "(int)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setMultiplier", "(int)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormat", "setParseBigDecimal", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getDecimalSeparator", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getDigit", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getGroupingSeparator", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getInstance", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getMinusSign", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getMonetaryDecimalSeparator", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getMonetaryGroupingSeparator", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getPatternSeparator", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getPerMill", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getPercent", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "getZeroDigit", "()", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setDecimalSeparator", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setDigit", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setGroupingSeparator", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setMinusSign", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setMonetaryDecimalSeparator", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setMonetaryGroupingSeparator", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setPatternSeparator", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setPerMill", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setPercent", "(char)", "summary", "df-generated"]
+      - ["java.text", "DecimalFormatSymbols", "setZeroDigit", "(char)", "summary", "df-generated"]
+      - ["java.text", "FieldPosition", "FieldPosition", "(int)", "summary", "df-generated"]
+      - ["java.text", "FieldPosition", "getBeginIndex", "()", "summary", "df-generated"]
+      - ["java.text", "FieldPosition", "getEndIndex", "()", "summary", "df-generated"]
+      - ["java.text", "FieldPosition", "getField", "()", "summary", "df-generated"]
+      - ["java.text", "FieldPosition", "setBeginIndex", "(int)", "summary", "df-generated"]
+      - ["java.text", "FieldPosition", "setEndIndex", "(int)", "summary", "df-generated"]
+      - ["java.text", "Format", "formatToCharacterIterator", "(Object)", "summary", "df-generated"]
+      - ["java.text", "MessageFormat", "MessageFormat", "(String)", "summary", "df-generated"]
+      - ["java.text", "MessageFormat", "applyPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "Normalizer", "isNormalized", "(CharSequence,Normalizer$Form)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "format", "(double)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getCompactNumberInstance", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getCurrencyInstance", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getInstance", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getIntegerInstance", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getMaximumFractionDigits", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getMaximumIntegerDigits", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getMinimumFractionDigits", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getMinimumIntegerDigits", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getNumberInstance", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getPercentInstance", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "getRoundingMode", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "isGroupingUsed", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "isParseIntegerOnly", "()", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "parse", "(String)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "parse", "(String,ParsePosition)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setGroupingUsed", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setMaximumFractionDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setMaximumIntegerDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setMinimumFractionDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setMinimumIntegerDigits", "(int)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setParseIntegerOnly", "(boolean)", "summary", "df-generated"]
+      - ["java.text", "NumberFormat", "setRoundingMode", "(RoundingMode)", "summary", "df-generated"]
+      - ["java.text", "ParseException", "getErrorOffset", "()", "summary", "df-generated"]
+      - ["java.text", "ParsePosition", "ParsePosition", "(int)", "summary", "df-generated"]
+      - ["java.text", "ParsePosition", "getErrorIndex", "()", "summary", "df-generated"]
+      - ["java.text", "ParsePosition", "getIndex", "()", "summary", "df-generated"]
+      - ["java.text", "ParsePosition", "setErrorIndex", "(int)", "summary", "df-generated"]
+      - ["java.text", "ParsePosition", "setIndex", "(int)", "summary", "df-generated"]
+      - ["java.text", "SimpleDateFormat", "applyLocalizedPattern", "(String)", "summary", "df-generated"]
+      - ["java.text", "SimpleDateFormat", "set2DigitYearStart", "(Date)", "summary", "df-generated"]
+      - ["java.text", "SimpleDateFormat", "toLocalizedPattern", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.text.spi.model.yml b/java/ql/lib/ext/generated/java.text.spi.model.yml
new file mode 100644
index 00000000000..e802b83640a
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.text.spi.model.yml
@@ -0,0 +1,21 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.text.spi", "BreakIteratorProvider", "getCharacterInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "BreakIteratorProvider", "getLineInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "BreakIteratorProvider", "getSentenceInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "BreakIteratorProvider", "getWordInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "CollatorProvider", "getInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "DateFormatProvider", "getDateInstance", "(int,Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "DateFormatProvider", "getDateTimeInstance", "(int,int,Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "DateFormatProvider", "getTimeInstance", "(int,Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "DateFormatSymbolsProvider", "getInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "DecimalFormatSymbolsProvider", "getInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", "getCompactNumberInstance", "(Locale,NumberFormat$Style)", "summary", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", "getCurrencyInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", "getIntegerInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", "getNumberInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.text.spi", "NumberFormatProvider", "getPercentInstance", "(Locale)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.chrono.model.yml b/java/ql/lib/ext/generated/java.time.chrono.model.yml
new file mode 100644
index 00000000000..00180b2baf6
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.time.chrono.model.yml
@@ -0,0 +1,118 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.time.chrono", "ChronoLocalDate", True, "atTime", "(LocalTime)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", True, "atTime", "(LocalTime)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", True, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", True, "format", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", True, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", True, "getChronology", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", True, "getEra", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", True, "until", "(ChronoLocalDate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", True, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", True, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", True, "getChronology", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "between", "(ChronoLocalDate,ChronoLocalDate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "getChronology", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "minus", "(TemporalAmount)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "multipliedBy", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "negated", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "normalized", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", True, "plus", "(TemporalAmount)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", True, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", True, "format", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", True, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", True, "toLocalDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", True, "toLocalTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "date", "(Era,int,int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "date", "(Era,int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "date", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "date", "(TemporalAccessor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "date", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "dateEpochDay", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "dateNow", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "dateNow", "(Clock)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "dateNow", "(ZoneId)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "dateYearDay", "(Era,int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "dateYearDay", "(Era,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "dateYearDay", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "getCalendarType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "getDisplayName", "(TextStyle,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "localDateTime", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "localDateTime", "(TemporalAccessor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "period", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "resolveDate", "(Map,ResolverStyle)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "zonedDateTime", "(Instant,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Chronology", True, "zonedDateTime", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "Era", True, "getDisplayName", "(TextStyle,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", False, "withVariant", "(HijrahChronology)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", False, "of", "(JapaneseEra,int,int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.time.chrono", "ChronoLocalDate", "isAfter", "(ChronoLocalDate)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "isBefore", "(ChronoLocalDate)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "isEqual", "(ChronoLocalDate)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "isLeapYear", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "lengthOfMonth", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "lengthOfYear", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "timeLineOrder", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDate", "toEpochDay", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", "isAfter", "(ChronoLocalDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", "isBefore", "(ChronoLocalDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", "isEqual", "(ChronoLocalDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", "timeLineOrder", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", "toEpochSecond", "(ZoneOffset)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoLocalDateTime", "toInstant", "(ZoneOffset)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", "isNegative", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoPeriod", "isZero", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "getChronology", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "isAfter", "(ChronoZonedDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "isBefore", "(ChronoZonedDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "isEqual", "(ChronoZonedDateTime)", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "timeLineOrder", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ChronoZonedDateTime", "toEpochSecond", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "epochSecond", "(Era,int,int,int,int,int,int,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "epochSecond", "(int,int,int,int,int,int,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "eraOf", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "eras", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "getAvailableChronologies", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "isLeapYear", "(long)", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "of", "(String)", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "ofLocale", "(Locale)", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "prolepticYear", "(Era,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "Chronology", "range", "(ChronoField)", "summary", "df-generated"]
+      - ["java.time.chrono", "Era", "getValue", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "now", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "HijrahEra", "of", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "IsoEra", "of", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "now", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseEra", "of", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseEra", "valueOf", "(String)", "summary", "df-generated"]
+      - ["java.time.chrono", "JapaneseEra", "values", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", "now", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "MinguoEra", "of", "(int)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", "now", "()", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistDate", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time.chrono", "ThaiBuddhistEra", "of", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.format.model.yml b/java/ql/lib/ext/generated/java.time.format.model.yml
new file mode 100644
index 00000000000..f8a7a3955f5
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.time.format.model.yml
@@ -0,0 +1,104 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.time.format", "DateTimeFormatter", False, "formatTo", "(TemporalAccessor,Appendable)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "formatTo", "(TemporalAccessor,Appendable)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getChronology", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getDecimalStyle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getResolverFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "getZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "localizedBy", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "ofPattern", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "parse", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "parse", "(CharSequence,ParsePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "parse", "(CharSequence,TemporalQuery)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "parseBest", "(CharSequence,TemporalQuery[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "toFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "toFormat", "(TemporalQuery)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "toFormat", "(TemporalQuery)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withChronology", "(Chronology)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withDecimalStyle", "(DecimalStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withLocale", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withResolverFields", "(Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withResolverFields", "(TemporalField[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withResolverStyle", "(ResolverStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", False, "withZone", "(ZoneId)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "append", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendChronologyId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendChronologyText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendDayPeriodText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendFraction", "(TemporalField,int,int,boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendGenericZoneText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendGenericZoneText", "(TextStyle,Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendInstant", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendInstant", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLiteral", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLiteral", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLocalized", "(FormatStyle,FormatStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendLocalizedOffset", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOffset", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOffsetId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendOptional", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendPattern", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField,Map)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendText", "(TemporalField,TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValue", "(TemporalField,int,int,SignStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValueReduced", "(TemporalField,int,int,ChronoLocalDate)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendValueReduced", "(TemporalField,int,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneOrOffsetId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneRegionId", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneText", "(TextStyle)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "appendZoneText", "(TextStyle,Set)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "getLocalizedDateTimePattern", "(FormatStyle,FormatStyle,Chronology,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "optionalEnd", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "optionalStart", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "padNext", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "padNext", "(int,char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseCaseInsensitive", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseCaseSensitive", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseDefaulting", "(TemporalField,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseLenient", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "parseStrict", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", False, "toFormatter", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeParseException", True, "DateTimeParseException", "(String,CharSequence,int,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.format", "DateTimeParseException", True, "getParsedString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DecimalStyle", False, "of", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withDecimalSeparator", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withNegativeSign", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withPositiveSign", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.format", "DecimalStyle", False, "withZeroDigit", "(char)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.time.format", "DateTimeFormatter", "getResolverStyle", "()", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "ofLocalizedDate", "(FormatStyle)", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "ofLocalizedDateTime", "(FormatStyle)", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "ofLocalizedDateTime", "(FormatStyle,FormatStyle)", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "ofLocalizedTime", "(FormatStyle)", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "parseUnresolved", "(CharSequence,ParsePosition)", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "parsedExcessDays", "()", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatter", "parsedLeapSecond", "()", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeFormatterBuilder", "toFormatter", "()", "summary", "df-generated"]
+      - ["java.time.format", "DateTimeParseException", "getErrorIndex", "()", "summary", "df-generated"]
+      - ["java.time.format", "DecimalStyle", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.time.format", "DecimalStyle", "getDecimalSeparator", "()", "summary", "df-generated"]
+      - ["java.time.format", "DecimalStyle", "getNegativeSign", "()", "summary", "df-generated"]
+      - ["java.time.format", "DecimalStyle", "getPositiveSign", "()", "summary", "df-generated"]
+      - ["java.time.format", "DecimalStyle", "getZeroDigit", "()", "summary", "df-generated"]
+      - ["java.time.format", "DecimalStyle", "ofDefaultLocale", "()", "summary", "df-generated"]
+      - ["java.time.format", "TextStyle", "asNormal", "()", "summary", "df-generated"]
+      - ["java.time.format", "TextStyle", "asStandalone", "()", "summary", "df-generated"]
+      - ["java.time.format", "TextStyle", "isStandalone", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.model.yml b/java/ql/lib/ext/generated/java.time.model.yml
new file mode 100644
index 00000000000..464dbcc2fcd
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.time.model.yml
@@ -0,0 +1,513 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.time", "Clock", True, "fixed", "(Instant,ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "fixed", "(Instant,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "getZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "offset", "(Clock,Duration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "offset", "(Clock,Duration)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "system", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "tick", "(Clock,Duration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "tickMillis", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "tickMinutes", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Clock", True, "tickSeconds", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "DateTimeException", True, "DateTimeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time", "DateTimeException", True, "DateTimeException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time", "DateTimeException", True, "DateTimeException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time", "DayOfWeek", False, "getDisplayName", "(TextStyle,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "abs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "dividedBy", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Duration", False, "minus", "(Duration)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "minus", "(long,TemporalUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "minusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "minusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "minusMillis", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "minusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "minusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "minusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "multipliedBy", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Duration", False, "negated", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "plus", "(Duration)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "plus", "(long,TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Duration", False, "plusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "plusMillis", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Duration", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Instant", False, "atOffset", "(ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "atZone", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "minusMillis", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "minusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "minusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "now", "(Clock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "plusMillis", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Instant", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "InstantSource", True, "fixed", "(Instant)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "InstantSource", True, "instant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "InstantSource", True, "offset", "(InstantSource,Duration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "InstantSource", True, "offset", "(InstantSource,Duration)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "InstantSource", True, "tick", "(InstantSource,Duration)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "InstantSource", True, "withZone", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "InstantSource", True, "withZone", "(ZoneId)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "InstantSource", True, "withZone", "(ZoneId)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalDate", False, "atStartOfDay", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "atStartOfDay", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "atStartOfDay", "(ZoneId)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "atTime", "(OffsetTime)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "atTime", "(OffsetTime)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "atTime", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "atTime", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "atTime", "(int,int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "minusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "minusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "minusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "minusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalDate", False, "plusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDate", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalDate", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalDate", False, "withDayOfYear", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalDate", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalDate", False, "withYear", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "atOffset", "(ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "atOffset", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "minusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "of", "(LocalDate,LocalTime)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "of", "(LocalDate,LocalTime)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withDayOfYear", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withHour", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withMinute", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withNano", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withSecond", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalDateTime", False, "withYear", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "atDate", "(LocalDate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "atDate", "(LocalDate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "atOffset", "(ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "atOffset", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "minusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "minusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "minusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "minusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "LocalTime", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "withHour", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "withMinute", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "withNano", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "LocalTime", False, "withSecond", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Month", False, "getDisplayName", "(TextStyle,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "MonthDay", False, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "MonthDay", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "MonthDay", False, "with", "(Month)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "MonthDay", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "MonthDay", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "atZoneSameInstant", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "atZoneSameInstant", "(ZoneId)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "atZoneSimilarLocal", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "atZoneSimilarLocal", "(ZoneId)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "format", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "getOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "minusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "now", "(Clock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "now", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "of", "(LocalDate,LocalTime,ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "of", "(LocalDate,LocalTime,ZoneOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "of", "(LocalDate,LocalTime,ZoneOffset)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "of", "(LocalDateTime,ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "of", "(LocalDateTime,ZoneOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "of", "(int,int,int,int,int,int,int,ZoneOffset)", "", "Argument[7]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "ofInstant", "(Instant,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "toLocalDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "toLocalDateTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "toLocalTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "toOffsetTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "toZonedDateTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withDayOfYear", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withHour", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withMinute", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withNano", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withOffsetSameInstant", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withOffsetSameLocal", "(ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withOffsetSameLocal", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withSecond", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetDateTime", False, "withYear", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "atDate", "(LocalDate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "atDate", "(LocalDate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "format", "(DateTimeFormatter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "getOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "minusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "minusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "minusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "minusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "now", "(Clock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "now", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "of", "(LocalTime,ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "of", "(LocalTime,ZoneOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "of", "(int,int,int,int,ZoneOffset)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "ofInstant", "(Instant,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "toLocalTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "withHour", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "withMinute", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "withNano", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "withOffsetSameInstant", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "OffsetTime", False, "withOffsetSameLocal", "(ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "withOffsetSameLocal", "(ZoneOffset)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "OffsetTime", False, "withSecond", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Period", False, "from", "(TemporalAmount)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Period", False, "minusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Period", False, "minusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Period", False, "minusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Period", False, "plusDays", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Period", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Period", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Period", False, "withDays", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Period", False, "withMonths", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Period", False, "withYears", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "Year", False, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Year", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Year", False, "minusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "Year", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "YearMonth", False, "format", "(DateTimeFormatter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "YearMonth", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "YearMonth", False, "minusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "YearMonth", False, "minusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "YearMonth", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "YearMonth", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "YearMonth", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "YearMonth", False, "withYear", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "getDisplayName", "(TextStyle,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "getId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "getRules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "normalized", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time", "ZoneId", True, "of", "(String,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "of", "(String,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "ofOffset", "(String,ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneId", True, "ofOffset", "(String,ZoneOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZoneOffset", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "from", "(TemporalAccessor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "minusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "now", "(Clock)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "now", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "of", "(LocalDate,LocalTime,ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "of", "(LocalDate,LocalTime,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "of", "(LocalDate,LocalTime,ZoneId)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "of", "(LocalDateTime,ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "of", "(LocalDateTime,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "of", "(int,int,int,int,int,int,int,ZoneId)", "", "Argument[7]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofInstant", "(Instant,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofInstant", "(LocalDateTime,ZoneOffset,ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofInstant", "(LocalDateTime,ZoneOffset,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofInstant", "(LocalDateTime,ZoneOffset,ZoneId)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofLocal", "(LocalDateTime,ZoneId,ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofLocal", "(LocalDateTime,ZoneId,ZoneOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofLocal", "(LocalDateTime,ZoneId,ZoneOffset)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofStrict", "(LocalDateTime,ZoneOffset,ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofStrict", "(LocalDateTime,ZoneOffset,ZoneId)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "ofStrict", "(LocalDateTime,ZoneOffset,ZoneId)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusDays", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusHours", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusMinutes", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusMonths", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusNanos", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusSeconds", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusWeeks", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "plusYears", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "toOffsetDateTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "truncatedTo", "(TemporalUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withDayOfMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withDayOfYear", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withFixedOffsetZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withHour", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withMinute", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withMonth", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withNano", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withSecond", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time", "ZonedDateTime", False, "withYear", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.time", "Clock", "systemDefaultZone", "()", "summary", "df-generated"]
+      - ["java.time", "Clock", "systemUTC", "()", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "from", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "getValue", "()", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "minus", "(long)", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "of", "(int)", "summary", "df-generated"]
+      - ["java.time", "DayOfWeek", "plus", "(long)", "summary", "df-generated"]
+      - ["java.time", "Duration", "between", "(Temporal,Temporal)", "summary", "df-generated"]
+      - ["java.time", "Duration", "dividedBy", "(Duration)", "summary", "df-generated"]
+      - ["java.time", "Duration", "from", "(TemporalAmount)", "summary", "df-generated"]
+      - ["java.time", "Duration", "getNano", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "getSeconds", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "isNegative", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "isZero", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "of", "(long,TemporalUnit)", "summary", "df-generated"]
+      - ["java.time", "Duration", "ofDays", "(long)", "summary", "df-generated"]
+      - ["java.time", "Duration", "ofHours", "(long)", "summary", "df-generated"]
+      - ["java.time", "Duration", "ofNanos", "(long)", "summary", "df-generated"]
+      - ["java.time", "Duration", "ofSeconds", "(long,long)", "summary", "df-generated"]
+      - ["java.time", "Duration", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "Duration", "toDays", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toDaysPart", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toHours", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toHoursPart", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toMillisPart", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toMinutes", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toMinutesPart", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toNanos", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toNanosPart", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toSeconds", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "toSecondsPart", "()", "summary", "df-generated"]
+      - ["java.time", "Duration", "withNanos", "(int)", "summary", "df-generated"]
+      - ["java.time", "Duration", "withSeconds", "(long)", "summary", "df-generated"]
+      - ["java.time", "Instant", "getEpochSecond", "()", "summary", "df-generated"]
+      - ["java.time", "Instant", "getNano", "()", "summary", "df-generated"]
+      - ["java.time", "Instant", "isAfter", "(Instant)", "summary", "df-generated"]
+      - ["java.time", "Instant", "isBefore", "(Instant)", "summary", "df-generated"]
+      - ["java.time", "Instant", "ofEpochSecond", "(long)", "summary", "df-generated"]
+      - ["java.time", "Instant", "ofEpochSecond", "(long,long)", "summary", "df-generated"]
+      - ["java.time", "InstantSource", "millis", "()", "summary", "df-generated"]
+      - ["java.time", "InstantSource", "system", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "datesUntil", "(LocalDate)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "datesUntil", "(LocalDate,Period)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "getDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "getDayOfWeek", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "getDayOfYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "getMonth", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "getMonthValue", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "of", "(int,Month,int)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "ofEpochDay", "(long)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "ofInstant", "(Instant,ZoneId)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "ofYearDay", "(int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "LocalDate", "toEpochSecond", "(LocalTime,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getDayOfWeek", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getDayOfYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getMinute", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getMonth", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getMonthValue", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getNano", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getSecond", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "of", "(int,Month,int,int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "of", "(int,Month,int,int,int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "of", "(int,Month,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "of", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "of", "(int,int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "ofEpochSecond", "(long,int,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "ofInstant", "(Instant,ZoneId)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "LocalDateTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "getMinute", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "getNano", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "getSecond", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "isAfter", "(LocalTime)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "isBefore", "(LocalTime)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "now", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "of", "(int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "of", "(int,int,int,int)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "ofInstant", "(Instant,ZoneId)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "ofNanoOfDay", "(long)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "ofSecondOfDay", "(long)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "toEpochSecond", "(LocalDate,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "toNanoOfDay", "()", "summary", "df-generated"]
+      - ["java.time", "LocalTime", "toSecondOfDay", "()", "summary", "df-generated"]
+      - ["java.time", "Month", "firstDayOfYear", "(boolean)", "summary", "df-generated"]
+      - ["java.time", "Month", "firstMonthOfQuarter", "()", "summary", "df-generated"]
+      - ["java.time", "Month", "from", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time", "Month", "getValue", "()", "summary", "df-generated"]
+      - ["java.time", "Month", "length", "(boolean)", "summary", "df-generated"]
+      - ["java.time", "Month", "maxLength", "()", "summary", "df-generated"]
+      - ["java.time", "Month", "minLength", "()", "summary", "df-generated"]
+      - ["java.time", "Month", "minus", "(long)", "summary", "df-generated"]
+      - ["java.time", "Month", "of", "(int)", "summary", "df-generated"]
+      - ["java.time", "Month", "plus", "(long)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "atYear", "(int)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "getDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "getMonth", "()", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "getMonthValue", "()", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "isAfter", "(MonthDay)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "isBefore", "(MonthDay)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "isValidYear", "(int)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "now", "()", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "of", "(Month,int)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "of", "(int,int)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "MonthDay", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getDayOfWeek", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getDayOfYear", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getMinute", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getMonth", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getMonthValue", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getNano", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getSecond", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "isAfter", "(OffsetDateTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "isBefore", "(OffsetDateTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "isEqual", "(OffsetDateTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "now", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "timeLineOrder", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "toEpochSecond", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetDateTime", "toInstant", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "getMinute", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "getNano", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "getSecond", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "isAfter", "(OffsetTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "isBefore", "(OffsetTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "isEqual", "(OffsetTime)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "now", "()", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "OffsetTime", "toEpochSecond", "(LocalDate)", "summary", "df-generated"]
+      - ["java.time", "Period", "between", "(LocalDate,LocalDate)", "summary", "df-generated"]
+      - ["java.time", "Period", "getDays", "()", "summary", "df-generated"]
+      - ["java.time", "Period", "getMonths", "()", "summary", "df-generated"]
+      - ["java.time", "Period", "getYears", "()", "summary", "df-generated"]
+      - ["java.time", "Period", "of", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time", "Period", "ofDays", "(int)", "summary", "df-generated"]
+      - ["java.time", "Period", "ofMonths", "(int)", "summary", "df-generated"]
+      - ["java.time", "Period", "ofWeeks", "(int)", "summary", "df-generated"]
+      - ["java.time", "Period", "ofYears", "(int)", "summary", "df-generated"]
+      - ["java.time", "Period", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "Period", "toTotalMonths", "()", "summary", "df-generated"]
+      - ["java.time", "Year", "atDay", "(int)", "summary", "df-generated"]
+      - ["java.time", "Year", "atMonth", "(Month)", "summary", "df-generated"]
+      - ["java.time", "Year", "atMonth", "(int)", "summary", "df-generated"]
+      - ["java.time", "Year", "atMonthDay", "(MonthDay)", "summary", "df-generated"]
+      - ["java.time", "Year", "getValue", "()", "summary", "df-generated"]
+      - ["java.time", "Year", "isAfter", "(Year)", "summary", "df-generated"]
+      - ["java.time", "Year", "isBefore", "(Year)", "summary", "df-generated"]
+      - ["java.time", "Year", "isLeap", "()", "summary", "df-generated"]
+      - ["java.time", "Year", "isLeap", "(long)", "summary", "df-generated"]
+      - ["java.time", "Year", "isValidMonthDay", "(MonthDay)", "summary", "df-generated"]
+      - ["java.time", "Year", "length", "()", "summary", "df-generated"]
+      - ["java.time", "Year", "now", "()", "summary", "df-generated"]
+      - ["java.time", "Year", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time", "Year", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time", "Year", "of", "(int)", "summary", "df-generated"]
+      - ["java.time", "Year", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "Year", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "atDay", "(int)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "atEndOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "getMonth", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "getMonthValue", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "isAfter", "(YearMonth)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "isBefore", "(YearMonth)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "isLeapYear", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "isValidDay", "(int)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "lengthOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "lengthOfYear", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "now", "()", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "now", "(Clock)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "now", "(ZoneId)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "of", "(int,Month)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "of", "(int,int)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "YearMonth", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
+      - ["java.time", "ZoneId", "getAvailableZoneIds", "()", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "getTotalSeconds", "()", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "of", "(String)", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "ofHours", "(int)", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "ofHoursMinutes", "(int,int)", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "ofHoursMinutesSeconds", "(int,int,int)", "summary", "df-generated"]
+      - ["java.time", "ZoneOffset", "ofTotalSeconds", "(int)", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getDayOfWeek", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getDayOfYear", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getHour", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getMinute", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getMonth", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getMonthValue", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getNano", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getSecond", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "getYear", "()", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "parse", "(CharSequence)", "summary", "df-generated"]
+      - ["java.time", "ZonedDateTime", "parse", "(CharSequence,DateTimeFormatter)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.temporal.model.yml b/java/ql/lib/ext/generated/java.time.temporal.model.yml
new file mode 100644
index 00000000000..d0b17982238
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.time.temporal.model.yml
@@ -0,0 +1,97 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.time.temporal", "Temporal", True, "minus", "(TemporalAmount)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "Temporal", True, "minus", "(long,TemporalUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "Temporal", True, "plus", "(TemporalAmount)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "Temporal", True, "plus", "(long,TemporalUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "Temporal", True, "with", "(TemporalAdjuster)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "Temporal", True, "with", "(TemporalAdjuster)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "Temporal", True, "with", "(TemporalField,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "Temporal", True, "with", "(TemporalField,long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.time.temporal", "TemporalAccessor", True, "query", "(TemporalQuery)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalAccessor", True, "range", "(TemporalField)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjuster", True, "adjustInto", "(Temporal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalAmount", True, "addTo", "(Temporal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalAmount", True, "subtractFrom", "(Temporal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "adjustInto", "(Temporal,long)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "getBaseUnit", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "getDisplayName", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "getDisplayName", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "getRangeUnit", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "range", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "rangeRefinedBy", "(TemporalAccessor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalField", True, "resolve", "(Map,TemporalAccessor,ResolverStyle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "TemporalUnit", True, "addTo", "(Temporal,long)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "UnsupportedTemporalTypeException", True, "UnsupportedTemporalTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.temporal", "UnsupportedTemporalTypeException", True, "UnsupportedTemporalTypeException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.temporal", "UnsupportedTemporalTypeException", True, "UnsupportedTemporalTypeException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.temporal", "WeekFields", False, "dayOfWeek", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "WeekFields", False, "weekBasedYear", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "WeekFields", False, "weekOfMonth", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "WeekFields", False, "weekOfWeekBasedYear", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.temporal", "WeekFields", False, "weekOfYear", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.time.temporal", "ChronoField", "checkValidIntValue", "(long)", "summary", "df-generated"]
+      - ["java.time.temporal", "ChronoField", "checkValidValue", "(long)", "summary", "df-generated"]
+      - ["java.time.temporal", "Temporal", "isSupported", "(TemporalUnit)", "summary", "df-generated"]
+      - ["java.time.temporal", "Temporal", "until", "(Temporal,TemporalUnit)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAccessor", "get", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAccessor", "getLong", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAccessor", "isSupported", "(TemporalField)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "dayOfWeekInMonth", "(int,DayOfWeek)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "firstDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "firstDayOfNextMonth", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "firstDayOfNextYear", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "firstDayOfYear", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "firstInMonth", "(DayOfWeek)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "lastDayOfMonth", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "lastDayOfYear", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "lastInMonth", "(DayOfWeek)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "next", "(DayOfWeek)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "nextOrSame", "(DayOfWeek)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "ofDateAdjuster", "(UnaryOperator)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "previous", "(DayOfWeek)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAdjusters", "previousOrSame", "(DayOfWeek)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAmount", "get", "(TemporalUnit)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalAmount", "getUnits", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalField", "getFrom", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalField", "isDateBased", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalField", "isSupportedBy", "(TemporalAccessor)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalField", "isTimeBased", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalQueries", "chronology", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalQueries", "localDate", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalQueries", "localTime", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalQueries", "offset", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalQueries", "precision", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalQueries", "zone", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalQueries", "zoneId", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalUnit", "between", "(Temporal,Temporal)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalUnit", "getDuration", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalUnit", "isDateBased", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalUnit", "isDurationEstimated", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalUnit", "isSupportedBy", "(Temporal)", "summary", "df-generated"]
+      - ["java.time.temporal", "TemporalUnit", "isTimeBased", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "checkValidIntValue", "(long,TemporalField)", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "checkValidValue", "(long,TemporalField)", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "getLargestMinimum", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "getMaximum", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "getMinimum", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "getSmallestMaximum", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "isFixed", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "isIntValue", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "isValidIntValue", "(long)", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "isValidValue", "(long)", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "of", "(long,long)", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "of", "(long,long,long)", "summary", "df-generated"]
+      - ["java.time.temporal", "ValueRange", "of", "(long,long,long,long)", "summary", "df-generated"]
+      - ["java.time.temporal", "WeekFields", "getFirstDayOfWeek", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "WeekFields", "getMinimalDaysInFirstWeek", "()", "summary", "df-generated"]
+      - ["java.time.temporal", "WeekFields", "of", "(DayOfWeek,int)", "summary", "df-generated"]
+      - ["java.time.temporal", "WeekFields", "of", "(Locale)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.time.zone.model.yml b/java/ql/lib/ext/generated/java.time.zone.model.yml
new file mode 100644
index 00000000000..1501f58c140
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.time.zone.model.yml
@@ -0,0 +1,63 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.time.zone", "ZoneOffsetTransition", False, "getDateTimeAfter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", False, "getDateTimeBefore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", False, "getOffsetAfter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", False, "getOffsetBefore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", False, "of", "(LocalDateTime,ZoneOffset,ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", False, "of", "(LocalDateTime,ZoneOffset,ZoneOffset)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", False, "of", "(LocalDateTime,ZoneOffset,ZoneOffset)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule$TimeDefinition", False, "createDateTime", "(LocalDateTime,ZoneOffset,ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "createTransition", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "getLocalTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "getOffsetAfter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "getOffsetBefore", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "getStandardOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "of", "(Month,int,DayOfWeek,LocalTime,boolean,ZoneOffsetTransitionRule$TimeDefinition,ZoneOffset,ZoneOffset,ZoneOffset)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "of", "(Month,int,DayOfWeek,LocalTime,boolean,ZoneOffsetTransitionRule$TimeDefinition,ZoneOffset,ZoneOffset,ZoneOffset)", "", "Argument[6]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "of", "(Month,int,DayOfWeek,LocalTime,boolean,ZoneOffsetTransitionRule$TimeDefinition,ZoneOffset,ZoneOffset,ZoneOffset)", "", "Argument[7]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", False, "of", "(Month,int,DayOfWeek,LocalTime,boolean,ZoneOffsetTransitionRule$TimeDefinition,ZoneOffset,ZoneOffset,ZoneOffset)", "", "Argument[8]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "getOffset", "(Instant)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "getOffset", "(LocalDateTime)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "getStandardOffset", "(Instant)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "getTransition", "(LocalDateTime)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "getTransitionRules", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "getTransitions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "getValidOffsets", "(LocalDateTime)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "nextTransition", "(Instant)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "of", "(ZoneOffset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "of", "(ZoneOffset,ZoneOffset,List,List,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "of", "(ZoneOffset,ZoneOffset,List,List,List)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "of", "(ZoneOffset,ZoneOffset,List,List,List)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRules", False, "previousTransition", "(Instant)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRulesException", True, "ZoneRulesException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRulesException", True, "ZoneRulesException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.time.zone", "ZoneRulesException", True, "ZoneRulesException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.time.zone", "ZoneOffsetTransition", "getDuration", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", "getInstant", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", "isGap", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", "isOverlap", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", "isValidOffset", "(ZoneOffset)", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransition", "toEpochSecond", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", "getDayOfMonthIndicator", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", "getDayOfWeek", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", "getMonth", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", "getTimeDefinition", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneOffsetTransitionRule", "isMidnightEndOfDay", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRules", "getDaylightSavings", "(Instant)", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRules", "isDaylightSavings", "(Instant)", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRules", "isFixedOffset", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRules", "isValidOffset", "(LocalDateTime,ZoneOffset)", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRulesProvider", "getAvailableZoneIds", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRulesProvider", "getRules", "(String,boolean)", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRulesProvider", "getVersions", "(String)", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRulesProvider", "refresh", "()", "summary", "df-generated"]
+      - ["java.time.zone", "ZoneRulesProvider", "registerProvider", "(ZoneRulesProvider)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml b/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml
new file mode 100644
index 00000000000..7f40c376f34
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.concurrent.atomic.model.yml
@@ -0,0 +1,271 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "AtomicMarkableReference", "(Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "get", "(boolean[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "getReference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", True, "set", "(Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", True, "getAndAccumulate", "(Object,BinaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", True, "getAndUpdate", "(UnaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", True, "updateAndGet", "(UnaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", True, "AtomicReferenceArray", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "AtomicStampedReference", "(Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "get", "(int[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "getReference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", True, "set", "(Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "compareAndExchange", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "compareAndExchangeAcquire", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "compareAndExchangeRelease", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "getAcquire", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "getAndSet", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "getOpaque", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "getPlain", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "lazySet", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "setOpaque", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "setPlain", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "setRelease", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "weakCompareAndSet", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "weakCompareAndSetAcquire", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "weakCompareAndSetPlain", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "weakCompareAndSetRelease", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicBoolean", "weakCompareAndSetVolatile", "(boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "accumulateAndGet", "(int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "addAndGet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "compareAndExchange", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "compareAndExchangeAcquire", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "compareAndExchangeRelease", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "compareAndSet", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "decrementAndGet", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getAcquire", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getAndAccumulate", "(int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getAndAdd", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getAndDecrement", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getAndIncrement", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getAndSet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getAndUpdate", "(IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getOpaque", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "getPlain", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "lazySet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "set", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "setOpaque", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "setPlain", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "setRelease", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "updateAndGet", "(IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "weakCompareAndSet", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "weakCompareAndSetAcquire", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "weakCompareAndSetPlain", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "weakCompareAndSetRelease", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicInteger", "weakCompareAndSetVolatile", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "AtomicIntegerArray", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "AtomicIntegerArray", "(int[])", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "accumulateAndGet", "(int,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "addAndGet", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "compareAndExchange", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "compareAndExchangeAcquire", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "compareAndExchangeRelease", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "compareAndSet", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "decrementAndGet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "get", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getAcquire", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getAndAccumulate", "(int,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getAndAdd", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getAndDecrement", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getAndIncrement", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getAndSet", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getAndUpdate", "(int,IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getOpaque", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "getPlain", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "incrementAndGet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "lazySet", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "length", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "set", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "setOpaque", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "setPlain", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "setRelease", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "updateAndGet", "(int,IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "weakCompareAndSet", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "weakCompareAndSetAcquire", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "weakCompareAndSetPlain", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "weakCompareAndSetRelease", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerArray", "weakCompareAndSetVolatile", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "accumulateAndGet", "(Object,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "addAndGet", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "compareAndSet", "(Object,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "decrementAndGet", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "get", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "getAndAccumulate", "(Object,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "getAndAdd", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "getAndDecrement", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "getAndIncrement", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "getAndSet", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "getAndUpdate", "(Object,IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "incrementAndGet", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "lazySet", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "newUpdater", "(Class,String)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "set", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "updateAndGet", "(Object,IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicIntegerFieldUpdater", "weakCompareAndSet", "(Object,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "accumulateAndGet", "(long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "compareAndExchange", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "compareAndExchangeAcquire", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "compareAndExchangeRelease", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "compareAndSet", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "decrementAndGet", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getAcquire", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getAndAccumulate", "(long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getAndAdd", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getAndDecrement", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getAndIncrement", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getAndSet", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getAndUpdate", "(LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getOpaque", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "getPlain", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "lazySet", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "set", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "setOpaque", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "setPlain", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "setRelease", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "updateAndGet", "(LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "weakCompareAndSet", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "weakCompareAndSetAcquire", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "weakCompareAndSetPlain", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "weakCompareAndSetRelease", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLong", "weakCompareAndSetVolatile", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "AtomicLongArray", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "AtomicLongArray", "(long[])", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "accumulateAndGet", "(int,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "addAndGet", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "compareAndExchange", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "compareAndExchangeAcquire", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "compareAndExchangeRelease", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "compareAndSet", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "decrementAndGet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "get", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getAcquire", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getAndAccumulate", "(int,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getAndAdd", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getAndDecrement", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getAndIncrement", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getAndSet", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getAndUpdate", "(int,LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getOpaque", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "getPlain", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "incrementAndGet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "lazySet", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "length", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "set", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "setOpaque", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "setPlain", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "setRelease", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "updateAndGet", "(int,LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "weakCompareAndSet", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "weakCompareAndSetAcquire", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "weakCompareAndSetPlain", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "weakCompareAndSetRelease", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongArray", "weakCompareAndSetVolatile", "(int,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "accumulateAndGet", "(Object,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "addAndGet", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "compareAndSet", "(Object,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "decrementAndGet", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "get", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "getAndAccumulate", "(Object,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "getAndAdd", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "getAndDecrement", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "getAndIncrement", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "getAndSet", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "getAndUpdate", "(Object,LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "incrementAndGet", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "lazySet", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "newUpdater", "(Class,String)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "set", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "updateAndGet", "(Object,LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicLongFieldUpdater", "weakCompareAndSet", "(Object,long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", "attemptMark", "(Object,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", "compareAndSet", "(Object,Object,boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", "isMarked", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicMarkableReference", "weakCompareAndSet", "(Object,Object,boolean,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "accumulateAndGet", "(Object,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "compareAndExchange", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "compareAndExchangeAcquire", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "compareAndExchangeRelease", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "compareAndSet", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "getAcquire", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "getAndSet", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "getOpaque", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "getPlain", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "lazySet", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "setOpaque", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "setPlain", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "setRelease", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "weakCompareAndSet", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "weakCompareAndSetAcquire", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "weakCompareAndSetPlain", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "weakCompareAndSetRelease", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReference", "weakCompareAndSetVolatile", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "AtomicReferenceArray", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "accumulateAndGet", "(int,Object,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "compareAndExchange", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "compareAndExchangeAcquire", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "compareAndExchangeRelease", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "compareAndSet", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "get", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "getAcquire", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "getAndAccumulate", "(int,Object,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "getAndSet", "(int,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "getAndUpdate", "(int,UnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "getOpaque", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "getPlain", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "lazySet", "(int,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "length", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "set", "(int,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "setOpaque", "(int,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "setPlain", "(int,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "setRelease", "(int,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "updateAndGet", "(int,UnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "weakCompareAndSet", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "weakCompareAndSetAcquire", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "weakCompareAndSetPlain", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "weakCompareAndSetRelease", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceArray", "weakCompareAndSetVolatile", "(int,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "accumulateAndGet", "(Object,Object,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "compareAndSet", "(Object,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "get", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "getAndAccumulate", "(Object,Object,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "getAndSet", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "getAndUpdate", "(Object,UnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "lazySet", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "newUpdater", "(Class,Class,String)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "set", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "updateAndGet", "(Object,UnaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicReferenceFieldUpdater", "weakCompareAndSet", "(Object,Object,Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", "attemptStamp", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", "compareAndSet", "(Object,Object,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", "getStamp", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "AtomicStampedReference", "weakCompareAndSet", "(Object,Object,int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAccumulator", "DoubleAccumulator", "(DoubleBinaryOperator,double)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAccumulator", "accumulate", "(double)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAccumulator", "get", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAccumulator", "getThenReset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAccumulator", "reset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAdder", "add", "(double)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAdder", "reset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAdder", "sum", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "DoubleAdder", "sumThenReset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAccumulator", "LongAccumulator", "(LongBinaryOperator,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAccumulator", "accumulate", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAccumulator", "get", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAccumulator", "getThenReset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAccumulator", "reset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAdder", "add", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAdder", "decrement", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAdder", "increment", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAdder", "reset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAdder", "sum", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.atomic", "LongAdder", "sumThenReset", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml b/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml
new file mode 100644
index 00000000000..e8f78f593d0
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.concurrent.locks.model.yml
@@ -0,0 +1,128 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", True, "getExclusiveQueuedThreads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", True, "getFirstQueuedThread", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", True, "getQueuedThreads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", True, "getSharedQueuedThreads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", True, "getWaitingThreads", "(AbstractQueuedLongSynchronizer$ConditionObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", True, "getExclusiveQueuedThreads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", True, "getFirstQueuedThread", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", True, "getQueuedThreads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", True, "getSharedQueuedThreads", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", True, "getWaitingThreads", "(AbstractQueuedSynchronizer$ConditionObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "ReadWriteLock", True, "readLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "ReadWriteLock", True, "writeLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", True, "asReadLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", True, "asReadWriteLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", True, "asWriteLock", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "acquire", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "acquireInterruptibly", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "acquireShared", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "acquireSharedInterruptibly", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "getQueueLength", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "getWaitQueueLength", "(AbstractQueuedLongSynchronizer$ConditionObject)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "hasContended", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "hasQueuedPredecessors", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "hasQueuedThreads", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "hasWaiters", "(AbstractQueuedLongSynchronizer$ConditionObject)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "isQueued", "(Thread)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "owns", "(AbstractQueuedLongSynchronizer$ConditionObject)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "release", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "releaseShared", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "tryAcquireNanos", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedLongSynchronizer", "tryAcquireSharedNanos", "(long,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "acquire", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "acquireInterruptibly", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "acquireShared", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "acquireSharedInterruptibly", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "getQueueLength", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "getWaitQueueLength", "(AbstractQueuedSynchronizer$ConditionObject)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "hasContended", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "hasQueuedPredecessors", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "hasQueuedThreads", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "hasWaiters", "(AbstractQueuedSynchronizer$ConditionObject)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "isQueued", "(Thread)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "owns", "(AbstractQueuedSynchronizer$ConditionObject)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "release", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "releaseShared", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "tryAcquireNanos", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "AbstractQueuedSynchronizer", "tryAcquireSharedNanos", "(int,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Condition", "await", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Condition", "await", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Condition", "awaitNanos", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Condition", "awaitUninterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Condition", "awaitUntil", "(Date)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Condition", "signal", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Condition", "signalAll", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Lock", "lock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Lock", "lockInterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Lock", "newCondition", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Lock", "tryLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Lock", "tryLock", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "Lock", "unlock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "getBlocker", "(Thread)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "park", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "park", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "parkNanos", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "parkNanos", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "parkUntil", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "parkUntil", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "setCurrentBlocker", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "LockSupport", "unpark", "(Thread)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "ReentrantLock", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "getHoldCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "getQueueLength", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "getWaitQueueLength", "(Condition)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "hasQueuedThread", "(Thread)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "hasQueuedThreads", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "hasWaiters", "(Condition)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "isFair", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "isHeldByCurrentThread", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantLock", "isLocked", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "getHoldCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock$WriteLock", "isHeldByCurrentThread", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "ReentrantReadWriteLock", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "getQueueLength", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "getReadHoldCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "getReadLockCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "getWaitQueueLength", "(Condition)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "getWriteHoldCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "hasQueuedThread", "(Thread)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "hasQueuedThreads", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "hasWaiters", "(Condition)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "isFair", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "isWriteLocked", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "ReentrantReadWriteLock", "isWriteLockedByCurrentThread", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "getReadLockCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "isLockStamp", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "isOptimisticReadStamp", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "isReadLockStamp", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "isReadLocked", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "isWriteLockStamp", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "isWriteLocked", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "readLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "readLockInterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryConvertToOptimisticRead", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryConvertToReadLock", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryConvertToWriteLock", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryOptimisticRead", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryReadLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryReadLock", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryUnlockRead", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryUnlockWrite", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryWriteLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "tryWriteLock", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "unlock", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "unlockRead", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "unlockWrite", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "validate", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "writeLock", "()", "summary", "df-generated"]
+      - ["java.util.concurrent.locks", "StampedLock", "writeLockInterruptibly", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.concurrent.model.yml b/java/ql/lib/ext/generated/java.util.concurrent.model.yml
new file mode 100644
index 00000000000..528a8eb3183
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.concurrent.model.yml
@@ -0,0 +1,374 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.concurrent", "BrokenBarrierException", True, "BrokenBarrierException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CancellationException", True, "CancellationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "allOf", "(CompletableFuture[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "anyOf", "(CompletableFuture[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "completeAsync", "(Supplier)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "completeAsync", "(Supplier,Executor)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "completeOnTimeout", "(Object,long,TimeUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "copy", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "delayedExecutor", "(long,TimeUnit,Executor)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "getNow", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "getNow", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "obtrudeException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "obtrudeValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", True, "orTimeout", "(long,TimeUnit)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "CompletionException", True, "CompletionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletionException", True, "CompletionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletionException", True, "CompletionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletionStage", True, "exceptionallyAsync", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletionStage", True, "exceptionallyAsync", "(Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletionStage", True, "exceptionallyCompose", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletionStage", True, "exceptionallyComposeAsync", "(Function)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CompletionStage", True, "exceptionallyComposeAsync", "(Function,Executor)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap$KeySetView", True, "getMappedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", True, "ConcurrentHashMap", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", True, "keySet", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", True, "keySet", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", True, "keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "ConcurrentSkipListMap", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", True, "ConcurrentSkipListMap", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListSet", True, "ConcurrentSkipListSet", "(SortedSet)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", True, "CopyOnWriteArrayList", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", True, "CopyOnWriteArrayList", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", True, "addAllAbsent", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", True, "addIfAbsent", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArraySet", True, "CopyOnWriteArraySet", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", True, "firstComplete", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", True, "getCompleter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", True, "getRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", True, "nextComplete", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", True, "CyclicBarrier", "(int,Runnable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "DelayQueue", True, "DelayQueue", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "Exchanger", True, "exchange", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Exchanger", True, "exchange", "(Object,long,TimeUnit)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutionException", True, "ExecutionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutionException", True, "ExecutionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutionException", True, "ExecutionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executor", True, "execute", "(Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "ExecutorCompletionService", "(Executor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "ExecutorCompletionService", "(Executor,BlockingQueue)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorCompletionService", True, "ExecutorCompletionService", "(Executor,BlockingQueue)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", True, "invokeAll", "(Collection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", True, "invokeAll", "(Collection,long,TimeUnit)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", True, "shutdownNow", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", True, "submit", "(Callable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", True, "submit", "(Runnable,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", True, "submit", "(Runnable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "callable", "(Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "callable", "(Runnable,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "callable", "(Runnable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "newCachedThreadPool", "(ThreadFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "newFixedThreadPool", "(int,ThreadFactory)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "newScheduledThreadPool", "(int,ThreadFactory)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "newSingleThreadExecutor", "(ThreadFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "newSingleThreadScheduledExecutor", "(ThreadFactory)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "privilegedCallable", "(Callable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "privilegedCallableUsingCurrentClassLoader", "(Callable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "unconfigurableExecutorService", "(ExecutorService)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Executors", True, "unconfigurableScheduledExecutorService", "(ScheduledExecutorService)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool$ForkJoinWorkerThreadFactory", True, "newThread", "(ForkJoinPool)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "ForkJoinPool", "(int,ForkJoinPool$ForkJoinWorkerThreadFactory,Thread$UncaughtExceptionHandler,boolean,int,int,int,Predicate,long,TimeUnit)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "getFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "getUncaughtExceptionHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "invoke", "(ForkJoinTask)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", True, "submit", "(ForkJoinTask)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Callable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Runnable,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "adapt", "(Runnable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "complete", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "fork", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "invoke", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", True, "invokeAll", "(Collection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinWorkerThread", True, "getPool", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "FutureTask", True, "FutureTask", "(Callable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "FutureTask", True, "FutureTask", "(Runnable,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "FutureTask", True, "FutureTask", "(Runnable,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", True, "LinkedBlockingDeque", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingQueue", True, "LinkedBlockingQueue", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "Phaser", True, "Phaser", "(Phaser)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "Phaser", True, "Phaser", "(Phaser,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "Phaser", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "Phaser", True, "getRoot", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", True, "PriorityBlockingQueue", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", True, "PriorityBlockingQueue", "(int,Comparator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", True, "comparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "RejectedExecutionException", True, "RejectedExecutionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "RejectedExecutionHandler", True, "rejectedExecution", "(Runnable,ThreadPoolExecutor)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledExecutorService", True, "schedule", "(Callable,long,TimeUnit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledExecutorService", True, "schedule", "(Runnable,long,TimeUnit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledExecutorService", True, "scheduleAtFixedRate", "(Runnable,long,long,TimeUnit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledExecutorService", True, "scheduleWithFixedDelay", "(Runnable,long,long,TimeUnit)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", True, "ScheduledThreadPoolExecutor", "(int,RejectedExecutionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", True, "ScheduledThreadPoolExecutor", "(int,ThreadFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", True, "ScheduledThreadPoolExecutor", "(int,ThreadFactory,RejectedExecutionHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", True, "ScheduledThreadPoolExecutor", "(int,ThreadFactory,RejectedExecutionHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int,BiConsumer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "SubmissionPublisher", "(Executor,int,BiConsumer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "closeExceptionally", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "getClosedException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "getExecutor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", True, "getSubscribers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadFactory", True, "newThread", "(Runnable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadFactory", True, "newThread", "(Runnable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,RejectedExecutionHandler)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,RejectedExecutionHandler)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "ThreadPoolExecutor", "(int,int,long,TimeUnit,BlockingQueue,ThreadFactory,RejectedExecutionHandler)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getQueue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getRejectedExecutionHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "getThreadFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "setRejectedExecutionHandler", "(RejectedExecutionHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", True, "setThreadFactory", "(ThreadFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.concurrent", "TimeoutException", True, "TimeoutException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.concurrent", "ArrayBlockingQueue", "ArrayBlockingQueue", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ArrayBlockingQueue", "ArrayBlockingQueue", "(int,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ArrayBlockingQueue", "ArrayBlockingQueue", "(int,boolean,Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "completedStage", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "defaultExecutor", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "delayedExecutor", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "failedFuture", "(Throwable)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "failedStage", "(Throwable)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "getNumberOfDependents", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "isCompletedExceptionally", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "minimalCompletionStage", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "newIncompleteFuture", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "runAsync", "(Runnable)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "runAsync", "(Runnable,Executor)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "supplyAsync", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CompletableFuture", "supplyAsync", "(Supplier,Executor)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "ConcurrentHashMap", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "ConcurrentHashMap", "(int,float)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "ConcurrentHashMap", "(int,float,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "contains", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEach", "(long,BiConsumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEach", "(long,BiFunction,Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEachEntry", "(long,Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEachEntry", "(long,Function,Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEachKey", "(long,Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEachKey", "(long,Function,Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEachValue", "(long,Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "forEachValue", "(long,Function,Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "mappingCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "newKeySet", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "newKeySet", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduce", "(long,BiFunction,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceEntries", "(long,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceEntries", "(long,Function,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceEntriesToDouble", "(long,ToDoubleFunction,double,DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceEntriesToInt", "(long,ToIntFunction,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceEntriesToLong", "(long,ToLongFunction,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceKeys", "(long,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceKeys", "(long,Function,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceKeysToDouble", "(long,ToDoubleFunction,double,DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceKeysToInt", "(long,ToIntFunction,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceKeysToLong", "(long,ToLongFunction,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceToDouble", "(long,ToDoubleBiFunction,double,DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceToInt", "(long,ToIntBiFunction,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceToLong", "(long,ToLongBiFunction,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceValues", "(long,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceValues", "(long,Function,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceValuesToDouble", "(long,ToDoubleFunction,double,DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceValuesToInt", "(long,ToIntFunction,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "reduceValuesToLong", "(long,ToLongFunction,long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "search", "(long,BiFunction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "searchEntries", "(long,Function)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "searchKeys", "(long,Function)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentHashMap", "searchValues", "(long,Function)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedDeque", "ConcurrentLinkedDeque", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentLinkedQueue", "ConcurrentLinkedQueue", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ConcurrentSkipListMap", "ConcurrentSkipListMap", "(SortedMap)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", "indexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CopyOnWriteArrayList", "lastIndexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "addToPendingCount", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "compareAndSetPendingCount", "(int,int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "compute", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "decrementPendingCountUnlessZero", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "getPendingCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "helpComplete", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "onCompletion", "(CountedCompleter)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "onExceptionalCompletion", "(Throwable,CountedCompleter)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "propagateCompletion", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "quietlyCompleteRoot", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "setPendingCount", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CountedCompleter", "tryComplete", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", "CyclicBarrier", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", "await", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", "await", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", "getNumberWaiting", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", "getParties", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", "isBroken", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "CyclicBarrier", "reset", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Delayed", "getDelay", "(TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", "awaitTermination", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", "invokeAny", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", "invokeAny", "(Collection,long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", "isShutdown", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", "isTerminated", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ExecutorService", "shutdown", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "callable", "(PrivilegedAction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "callable", "(PrivilegedExceptionAction)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "defaultThreadFactory", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "newCachedThreadPool", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "newFixedThreadPool", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "newScheduledThreadPool", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "newSingleThreadExecutor", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "newSingleThreadScheduledExecutor", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "newWorkStealingPool", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "newWorkStealingPool", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Executors", "privilegedThreadFactory", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Flow$Subscription", "cancel", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Flow$Subscription", "request", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Flow", "defaultBufferSize", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool$ManagedBlocker", "block", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool$ManagedBlocker", "isReleasable", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "ForkJoinPool", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "awaitQuiescence", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "commonPool", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "execute", "(ForkJoinTask)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getActiveThreadCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getAsyncMode", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getCommonPoolParallelism", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getParallelism", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getPoolSize", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getQueuedSubmissionCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getQueuedTaskCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getRunningThreadCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "getStealCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "hasQueuedSubmissions", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "isQuiescent", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "isTerminating", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinPool", "managedBlock", "(ForkJoinPool$ManagedBlocker)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "compareAndSetForkJoinTaskTag", "(short,short)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "completeExceptionally", "(Throwable)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "getForkJoinTaskTag", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "getPool", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "getQueuedTaskCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "getRawResult", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "getSurplusQueuedTaskCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "helpQuiesce", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "inForkJoinPool", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "invokeAll", "(ForkJoinTask,ForkJoinTask)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "invokeAll", "(ForkJoinTask[])", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "isCompletedAbnormally", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "isCompletedNormally", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "join", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "quietlyComplete", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "quietlyInvoke", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "quietlyJoin", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "reinitialize", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "setForkJoinTaskTag", "(short)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinTask", "tryUnfork", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ForkJoinWorkerThread", "getPoolIndex", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingDeque", "LinkedBlockingDeque", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedBlockingQueue", "LinkedBlockingQueue", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "LinkedTransferQueue", "LinkedTransferQueue", "(Collection)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "Phaser", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "arrive", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "arriveAndAwaitAdvance", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "arriveAndDeregister", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "awaitAdvance", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "awaitAdvanceInterruptibly", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "awaitAdvanceInterruptibly", "(int,long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "bulkRegister", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "forceTermination", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "getArrivedParties", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "getPhase", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "getRegisteredParties", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "getUnarrivedParties", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "isTerminated", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Phaser", "register", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "PriorityBlockingQueue", "PriorityBlockingQueue", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "ScheduledThreadPoolExecutor", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "getContinueExistingPeriodicTasksAfterShutdownPolicy", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "getExecuteExistingDelayedTasksAfterShutdownPolicy", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "getRemoveOnCancelPolicy", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "setContinueExistingPeriodicTasksAfterShutdownPolicy", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "setExecuteExistingDelayedTasksAfterShutdownPolicy", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ScheduledThreadPoolExecutor", "setRemoveOnCancelPolicy", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "Semaphore", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "Semaphore", "(int,boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "acquire", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "acquire", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "acquireUninterruptibly", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "acquireUninterruptibly", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "availablePermits", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "drainPermits", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "getQueueLength", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "hasQueuedThreads", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "isFair", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "release", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "release", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "tryAcquire", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "tryAcquire", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "tryAcquire", "(int,long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "Semaphore", "tryAcquire", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "consume", "(Consumer)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "estimateMaximumLag", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "estimateMinimumDemand", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "getMaxBufferCapacity", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "getNumberOfSubscribers", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "hasSubscribers", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "isClosed", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "isSubscribed", "(Flow$Subscriber)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "offer", "(Object,BiPredicate)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "offer", "(Object,long,TimeUnit,BiPredicate)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SubmissionPublisher", "submit", "(Object)", "summary", "df-generated"]
+      - ["java.util.concurrent", "SynchronousQueue", "SynchronousQueue", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadLocalRandom", "current", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "allowCoreThreadTimeOut", "(boolean)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "allowsCoreThreadTimeOut", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getActiveCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getCompletedTaskCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getCorePoolSize", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getKeepAliveTime", "(TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getLargestPoolSize", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getMaximumPoolSize", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getPoolSize", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "getTaskCount", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "isTerminating", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "prestartAllCoreThreads", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "prestartCoreThread", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "purge", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "remove", "(Runnable)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "setCorePoolSize", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "setKeepAliveTime", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "ThreadPoolExecutor", "setMaximumPoolSize", "(int)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "convert", "(Duration)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "convert", "(long,TimeUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "of", "(ChronoUnit)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "sleep", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "timedJoin", "(Thread,long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "timedWait", "(Object,long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "toChronoUnit", "()", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "toDays", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "toHours", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "toMicros", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "toMinutes", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "toNanos", "(long)", "summary", "df-generated"]
+      - ["java.util.concurrent", "TimeUnit", "toSeconds", "(long)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.function.model.yml b/java/ql/lib/ext/generated/java.util.function.model.yml
new file mode 100644
index 00000000000..5080eeeacc7
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.function.model.yml
@@ -0,0 +1,46 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.function", "BiConsumer", "andThen", "(BiConsumer)", "summary", "df-generated"]
+      - ["java.util.function", "BiFunction", "andThen", "(Function)", "summary", "df-generated"]
+      - ["java.util.function", "BiPredicate", "and", "(BiPredicate)", "summary", "df-generated"]
+      - ["java.util.function", "BiPredicate", "negate", "()", "summary", "df-generated"]
+      - ["java.util.function", "BiPredicate", "or", "(BiPredicate)", "summary", "df-generated"]
+      - ["java.util.function", "BinaryOperator", "maxBy", "(Comparator)", "summary", "df-generated"]
+      - ["java.util.function", "BinaryOperator", "minBy", "(Comparator)", "summary", "df-generated"]
+      - ["java.util.function", "Consumer", "andThen", "(Consumer)", "summary", "df-generated"]
+      - ["java.util.function", "DoubleConsumer", "accept", "(double)", "summary", "df-generated"]
+      - ["java.util.function", "DoubleConsumer", "andThen", "(DoubleConsumer)", "summary", "df-generated"]
+      - ["java.util.function", "DoublePredicate", "and", "(DoublePredicate)", "summary", "df-generated"]
+      - ["java.util.function", "DoublePredicate", "negate", "()", "summary", "df-generated"]
+      - ["java.util.function", "DoublePredicate", "or", "(DoublePredicate)", "summary", "df-generated"]
+      - ["java.util.function", "DoubleUnaryOperator", "andThen", "(DoubleUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.function", "DoubleUnaryOperator", "compose", "(DoubleUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.function", "DoubleUnaryOperator", "identity", "()", "summary", "df-generated"]
+      - ["java.util.function", "Function", "andThen", "(Function)", "summary", "df-generated"]
+      - ["java.util.function", "Function", "compose", "(Function)", "summary", "df-generated"]
+      - ["java.util.function", "IntConsumer", "accept", "(int)", "summary", "df-generated"]
+      - ["java.util.function", "IntConsumer", "andThen", "(IntConsumer)", "summary", "df-generated"]
+      - ["java.util.function", "IntPredicate", "and", "(IntPredicate)", "summary", "df-generated"]
+      - ["java.util.function", "IntPredicate", "negate", "()", "summary", "df-generated"]
+      - ["java.util.function", "IntPredicate", "or", "(IntPredicate)", "summary", "df-generated"]
+      - ["java.util.function", "IntUnaryOperator", "andThen", "(IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.function", "IntUnaryOperator", "compose", "(IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.function", "IntUnaryOperator", "identity", "()", "summary", "df-generated"]
+      - ["java.util.function", "LongConsumer", "accept", "(long)", "summary", "df-generated"]
+      - ["java.util.function", "LongConsumer", "andThen", "(LongConsumer)", "summary", "df-generated"]
+      - ["java.util.function", "LongPredicate", "and", "(LongPredicate)", "summary", "df-generated"]
+      - ["java.util.function", "LongPredicate", "negate", "()", "summary", "df-generated"]
+      - ["java.util.function", "LongPredicate", "or", "(LongPredicate)", "summary", "df-generated"]
+      - ["java.util.function", "LongUnaryOperator", "andThen", "(LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.function", "LongUnaryOperator", "compose", "(LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.function", "LongUnaryOperator", "identity", "()", "summary", "df-generated"]
+      - ["java.util.function", "Predicate", "and", "(Predicate)", "summary", "df-generated"]
+      - ["java.util.function", "Predicate", "isEqual", "(Object)", "summary", "df-generated"]
+      - ["java.util.function", "Predicate", "negate", "()", "summary", "df-generated"]
+      - ["java.util.function", "Predicate", "not", "(Predicate)", "summary", "df-generated"]
+      - ["java.util.function", "Predicate", "or", "(Predicate)", "summary", "df-generated"]
+      - ["java.util.function", "UnaryOperator", "identity", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.jar.model.yml b/java/ql/lib/ext/generated/java.util.jar.model.yml
new file mode 100644
index 00000000000..9b4df579bd0
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.jar.model.yml
@@ -0,0 +1,54 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.jar", "Attributes$Name", True, "Name", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "Attributes", True, "Attributes", "(Attributes)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "Attributes", True, "getValue", "(Attributes$Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "Attributes", True, "getValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "Attributes", True, "putValue", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarEntry", True, "JarEntry", "(JarEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarEntry", True, "JarEntry", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarEntry", True, "JarEntry", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarEntry", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarEntry", True, "getCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarEntry", True, "getCodeSigners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarEntry", True, "getRealName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarException", True, "JarException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(File,boolean,int,Runtime$Version)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "JarFile", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "getJarEntry", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "getJarEntry", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "getManifest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarFile", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarInputStream", True, "JarInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarInputStream", True, "JarInputStream", "(InputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarInputStream", True, "getManifest", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarInputStream", True, "getNextJarEntry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "JarOutputStream", True, "JarOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "JarOutputStream", True, "JarOutputStream", "(OutputStream,Manifest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "Manifest", True, "Manifest", "(Manifest)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.jar", "Manifest", True, "getAttributes", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "Manifest", True, "getEntries", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.jar", "Manifest", True, "getMainAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.jar", "Attributes", "Attributes", "(int)", "summary", "df-generated"]
+      - ["java.util.jar", "JarFile", "baseVersion", "()", "summary", "df-generated"]
+      - ["java.util.jar", "JarFile", "isMultiRelease", "()", "summary", "df-generated"]
+      - ["java.util.jar", "JarFile", "runtimeVersion", "()", "summary", "df-generated"]
+      - ["java.util.jar", "JarFile", "versionedStream", "()", "summary", "df-generated"]
+      - ["java.util.jar", "Manifest", "Manifest", "(InputStream)", "summary", "df-generated"]
+      - ["java.util.jar", "Manifest", "clear", "()", "summary", "df-generated"]
+      - ["java.util.jar", "Manifest", "read", "(InputStream)", "summary", "df-generated"]
+      - ["java.util.jar", "Manifest", "write", "(OutputStream)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.logging.model.yml b/java/ql/lib/ext/generated/java.util.logging.model.yml
new file mode 100644
index 00000000000..2ad409bc45e
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.logging.model.yml
@@ -0,0 +1,155 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.logging", "ErrorManager", True, "error", "(String,Exception,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "FileHandler", True, "FileHandler", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "FileHandler", True, "FileHandler", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "FileHandler", True, "FileHandler", "(String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "FileHandler", True, "FileHandler", "(String,int,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "FileHandler", True, "FileHandler", "(String,long,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Formatter", True, "format", "(LogRecord)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Formatter", True, "format", "(LogRecord)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Formatter", True, "formatMessage", "(LogRecord)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Formatter", True, "getHead", "(Handler)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "getEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "getErrorManager", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "getFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "getFormatter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "getLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "publish", "(LogRecord)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "setEncoding", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "setErrorManager", "(ErrorManager)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "setFilter", "(Filter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "setFormatter", "(Formatter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Handler", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Level", True, "getLocalizedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Level", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Level", True, "getResourceBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogManager", True, "addConfigurationListener", "(Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogManager", True, "addConfigurationListener", "(Runnable)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.logging", "LogManager", True, "getLoggerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogManager", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getInstant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getLoggerName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getResourceBundle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getResourceBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getSourceClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getSourceMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "getThrown", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setInstant", "(Instant)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setLoggerName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setLongThreadID", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setMessage", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setParameters", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setResourceBundle", "(ResourceBundle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setResourceBundleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setSourceClassName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setSourceMethodName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LogRecord", True, "setThrown", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getAnonymousLogger", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getHandlers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getLogger", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getLogger", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getResourceBundle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "getResourceBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String,Object[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "logrb", "(Level,String,String,String,String,Throwable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "setFilter", "(Filter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "setLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "setParent", "(Logger)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "Logger", True, "setResourceBundle", "(ResourceBundle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "LoggingPermission", False, "LoggingPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", True, "MemoryHandler", "(Handler,int,Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", True, "MemoryHandler", "(Handler,int,Level)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", True, "getPushLevel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", True, "setPushLevel", "(Level)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.logging", "SocketHandler", True, "SocketHandler", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.logging", "Formatter", "getTail", "(Handler)", "summary", "df-generated"]
+      - ["java.util.logging", "Handler", "close", "()", "summary", "df-generated"]
+      - ["java.util.logging", "Handler", "flush", "()", "summary", "df-generated"]
+      - ["java.util.logging", "Handler", "isLoggable", "(LogRecord)", "summary", "df-generated"]
+      - ["java.util.logging", "Level", "intValue", "()", "summary", "df-generated"]
+      - ["java.util.logging", "Level", "parse", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "addLogger", "(Logger)", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "checkAccess", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "getLogManager", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "getLogger", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "getLoggingMXBean", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "readConfiguration", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "readConfiguration", "(InputStream)", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "removeConfigurationListener", "(Runnable)", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "reset", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "updateConfiguration", "(Function)", "summary", "df-generated"]
+      - ["java.util.logging", "LogManager", "updateConfiguration", "(InputStream,Function)", "summary", "df-generated"]
+      - ["java.util.logging", "LogRecord", "getLongThreadID", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogRecord", "getMillis", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogRecord", "getSequenceNumber", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogRecord", "getThreadID", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LogRecord", "setMillis", "(long)", "summary", "df-generated"]
+      - ["java.util.logging", "LogRecord", "setSequenceNumber", "(long)", "summary", "df-generated"]
+      - ["java.util.logging", "LogRecord", "setThreadID", "(int)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "addHandler", "(Handler)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "config", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "config", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "entering", "(String,String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "entering", "(String,String,Object)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "entering", "(String,String,Object[])", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "exiting", "(String,String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "exiting", "(String,String,Object)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "fine", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "fine", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "finer", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "finer", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "finest", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "finest", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "getAnonymousLogger", "()", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "getGlobal", "()", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "getUseParentHandlers", "()", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "info", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "info", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "log", "(Level,String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "log", "(Level,String,Object)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "log", "(Level,String,Object[])", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "log", "(Level,String,Throwable)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "log", "(Level,Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "log", "(Level,Throwable,Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "log", "(LogRecord)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logp", "(Level,String,String,String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logp", "(Level,String,String,String,Object)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logp", "(Level,String,String,String,Object[])", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logp", "(Level,String,String,String,Throwable)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logp", "(Level,String,String,Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logp", "(Level,String,String,Throwable,Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logrb", "(Level,ResourceBundle,String,Object[])", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logrb", "(Level,ResourceBundle,String,Throwable)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logrb", "(Level,String,String,ResourceBundle,String,Object[])", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "logrb", "(Level,String,String,ResourceBundle,String,Throwable)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "removeHandler", "(Handler)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "setUseParentHandlers", "(boolean)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "severe", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "severe", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "throwing", "(String,String,Throwable)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "warning", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "Logger", "warning", "(Supplier)", "summary", "df-generated"]
+      - ["java.util.logging", "LoggingMXBean", "getLoggerLevel", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "LoggingMXBean", "getLoggerNames", "()", "summary", "df-generated"]
+      - ["java.util.logging", "LoggingMXBean", "getParentLoggerName", "(String)", "summary", "df-generated"]
+      - ["java.util.logging", "LoggingMXBean", "setLoggerLevel", "(String,String)", "summary", "df-generated"]
+      - ["java.util.logging", "MemoryHandler", "push", "()", "summary", "df-generated"]
+      - ["java.util.logging", "StreamHandler", "StreamHandler", "(OutputStream,Formatter)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.model.yml b/java/ql/lib/ext/generated/java.util.model.yml
new file mode 100644
index 00000000000..a8532c297ad
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.model.yml
@@ -0,0 +1,866 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util", "Arrays", True, "deepToString", "(Object[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Base64$Encoder", True, "withoutPadding", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Base64", True, "getMimeEncoder", "(int,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "set", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setCalendarType", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setCalendarType", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setDate", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setFields", "(int[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setInstant", "(Date)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setInstant", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setLenient", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setLocale", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeOfDay", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeOfDay", "(int,int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setTimeZone", "(TimeZone)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setWeekDate", "(int,int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar$Builder", True, "setWeekDefinition", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Calendar", True, "getDisplayName", "(int,int,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar", True, "getInstance", "(TimeZone)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar", True, "getInstance", "(TimeZone,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar", True, "getTimeZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Calendar", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Collections", True, "asLifoQueue", "(Deque)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Collections", True, "checkedQueue", "(Queue,Class)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Collections", True, "newSetFromMap", "(Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Collections", True, "reverseOrder", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Comparator", True, "nullsFirst", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Comparator", True, "nullsLast", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Comparator", True, "reversed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "ConcurrentModificationException", True, "ConcurrentModificationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getCurrencyCode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getDisplayName", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getDisplayName", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getInstance", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getSymbol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getSymbol", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Currency", False, "getSymbol", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "DuplicateFormatFlagsException", True, "DuplicateFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "DuplicateFormatFlagsException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "complementOf", "(EnumSet)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "copyOf", "(Collection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "copyOf", "(EnumSet)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EnumSet", True, "of", "(Enum,Enum[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "EventListenerProxy", True, "EventListenerProxy", "(EventListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "EventListenerProxy", True, "getListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "FormatFlagsConversionMismatchException", True, "FormatFlagsConversionMismatchException", "(String,char)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "FormatFlagsConversionMismatchException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Appendable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Appendable,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Appendable,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(File,Charset,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(File,String,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(OutputStream,Charset,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(OutputStream,String,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(PrintStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(String,Charset,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "Formatter", "(String,String,Locale)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "format", "(Locale,String,Object[])", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "format", "(String,Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "ioException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "locale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Formatter", False, "out", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "GregorianCalendar", True, "GregorianCalendar", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "GregorianCalendar", True, "GregorianCalendar", "(TimeZone,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "GregorianCalendar", True, "from", "(ZonedDateTime)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "GregorianCalendar", True, "toZonedDateTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "delimiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[])", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(Appendable,byte[],int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "formatHex", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "ofDelimiter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "prefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "suffix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "toHexDigits", "(Appendable,byte)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withDelimiter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withDelimiter", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withLowerCase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withPrefix", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withPrefix", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withSuffix", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withSuffix", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "HexFormat", False, "withUpperCase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "IllegalFormatFlagsException", True, "IllegalFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "IllegalFormatFlagsException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "IllformedLocaleException", True, "IllformedLocaleException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "IllformedLocaleException", True, "IllformedLocaleException", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "InputMismatchException", True, "InputMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "InvalidPropertiesFormatException", True, "InvalidPropertiesFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "InvalidPropertiesFormatException", True, "InvalidPropertiesFormatException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "addUnicodeLocaleAttribute", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "clear", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "clearExtensions", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "removeUnicodeLocaleAttribute", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setExtension", "(char,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setLanguage", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setLanguageTag", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setLocale", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setRegion", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setScript", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setUnicodeLocaleKeyword", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setVariant", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale$Builder", False, "setVariant", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "LanguageRange", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "LanguageRange", "(String,double)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "getRange", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "mapEquivalents", "(List,Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "mapEquivalents", "(List,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "parse", "(String,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", False, "parse", "(String,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "Locale", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "Locale", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "Locale", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "Locale", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "Locale", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "Locale", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "filterTags", "(List,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "filterTags", "(List,Collection,Locale$FilteringMode)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getCountry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayCountry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayCountry", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayCountry", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayLanguage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayLanguage", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayLanguage", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayName", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayName", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayScript", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayScript", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayScript", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayVariant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayVariant", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getDisplayVariant", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getExtensionKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getISO3Language", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getLanguage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getScript", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "getVariant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "lookupTag", "(List,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "stripExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Locale", False, "toLanguageTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Map$Entry", True, "copyOf", "(Map$Entry)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Map", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Map", True, "compute", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Map", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Map", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "MissingFormatArgumentException", True, "MissingFormatArgumentException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "MissingFormatArgumentException", True, "getFormatSpecifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "MissingFormatWidthException", True, "MissingFormatWidthException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "MissingFormatWidthException", True, "getFormatSpecifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "MissingResourceException", True, "MissingResourceException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "MissingResourceException", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "MissingResourceException", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "NoSuchElementException", True, "NoSuchElementException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Observable", True, "addObserver", "(Observer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "PriorityQueue", True, "PriorityQueue", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "PriorityQueue", True, "PriorityQueue", "(int,Comparator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "PriorityQueue", True, "comparator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Properties", True, "Properties", "(Properties)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Properties", True, "list", "(PrintStream)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "Properties", True, "list", "(PrintWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "Properties", True, "propertyNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Properties", True, "store", "(Writer,String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "Properties", True, "stringPropertyNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "PropertyPermission", False, "PropertyPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "getFormats", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "newBundle", "(String,Locale,String,ClassLoader,boolean)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "newBundle", "(String,Locale,String,ClassLoader,boolean)", "", "Argument[1]", "Argument[3]", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "toBundleName", "(String,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "toBundleName", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBaseBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader,ResourceBundle$Control)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader,ResourceBundle$Control)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ResourceBundle$Control)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ResourceBundle$Control)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getBundle", "(String,ResourceBundle$Control)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getObject", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getStringArray", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "getStringArray", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "handleGetObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ResourceBundle", True, "keySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "delimiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "findAll", "(Pattern)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "findAll", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "findAll", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "hasNext", "(Pattern)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "hasNext", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "ioException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "locale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Scanner", False, "match", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "ServiceLoader", False, "findFirst", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ServiceLoader", False, "load", "(Class,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ServiceLoader", False, "load", "(ModuleLayer,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "ServiceLoader", False, "stream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "SimpleTimeZone", True, "SimpleTimeZone", "(int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "SimpleTimeZone", True, "SimpleTimeZone", "(int,String,int,int,int,int,int,int,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "SimpleTimeZone", True, "SimpleTimeZone", "(int,String,int,int,int,int,int,int,int,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "SimpleTimeZone", True, "SimpleTimeZone", "(int,String,int,int,int,int,int,int,int,int,int,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Spliterator", True, "forEachRemaining", "(Consumer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Spliterator", True, "forEachRemaining", "(Consumer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliterator", "(Collection,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliterator", "(Iterator,long,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliterator", "(Object[],int)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliterator", "(Object[],int,int,int)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliterator", "(PrimitiveIterator$OfDouble,long,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliterator", "(PrimitiveIterator$OfInt,long,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliterator", "(PrimitiveIterator$OfLong,long,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliteratorUnknownSize", "(Iterator,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliteratorUnknownSize", "(PrimitiveIterator$OfDouble,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliteratorUnknownSize", "(PrimitiveIterator$OfInt,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Spliterators", False, "spliteratorUnknownSize", "(PrimitiveIterator$OfLong,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getDisplayName", "(boolean,int,Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "getTimeZone", "(ZoneId)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "setID", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "TimeZone", True, "toZoneId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "Timer", True, "Timer", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "Timer", True, "Timer", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "TooManyListenersException", True, "TooManyListenersException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "TreeMap", True, "TreeMap", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "TreeSet", True, "TreeSet", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "UnknownFormatConversionException", True, "UnknownFormatConversionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "UnknownFormatConversionException", True, "getConversion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util", "UnknownFormatFlagsException", True, "UnknownFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util", "UnknownFormatFlagsException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util", "ArrayDeque", "ArrayDeque", "(int)", "summary", "df-generated"]
+      - ["java.util", "ArrayList", "ensureCapacity", "(int)", "summary", "df-generated"]
+      - ["java.util", "ArrayList", "trimToSize", "()", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(Object[],Object)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(Object[],Object,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(Object[],int,int,Object)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(Object[],int,int,Object,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(byte[],byte)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(byte[],int,int,byte)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(char[],char)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(char[],int,int,char)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(double[],double)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(double[],int,int,double)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(float[],float)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(float[],int,int,float)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(int[],int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(int[],int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(long[],int,int,long)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(long[],long)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(short[],int,int,short)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "binarySearch", "(short[],short)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(Comparable[],Comparable[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(Comparable[],int,int,Comparable[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(Object[],Object[],Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(Object[],int,int,Object[],int,int,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(boolean[],boolean[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(boolean[],int,int,boolean[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(byte[],byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(byte[],int,int,byte[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(char[],char[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(char[],int,int,char[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(double[],double[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(double[],int,int,double[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(float[],float[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(float[],int,int,float[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(int[],int,int,int[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(int[],int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(long[],int,int,long[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(long[],long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(short[],int,int,short[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compare", "(short[],short[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(byte[],byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(byte[],int,int,byte[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(int[],int,int,int[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(int[],int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(long[],int,int,long[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(long[],long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(short[],int,int,short[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "compareUnsigned", "(short[],short[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "deepEquals", "(Object[],Object[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "deepHashCode", "(Object[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(Object[],Object[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(Object[],Object[],Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(Object[],int,int,Object[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(Object[],int,int,Object[],int,int,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(boolean[],boolean[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(boolean[],int,int,boolean[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(byte[],byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(byte[],int,int,byte[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(char[],char[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(char[],int,int,char[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(double[],double[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(double[],int,int,double[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(float[],float[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(float[],int,int,float[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(int[],int,int,int[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(int[],int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(long[],int,int,long[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(long[],long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(short[],int,int,short[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "equals", "(short[],short[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(Object[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(boolean[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(char[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(double[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(float[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "hashCode", "(short[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(Object[],Object[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(Object[],Object[],Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(Object[],int,int,Object[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(Object[],int,int,Object[],int,int,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(boolean[],boolean[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(boolean[],int,int,boolean[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(byte[],byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(byte[],int,int,byte[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(char[],char[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(char[],int,int,char[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(double[],double[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(double[],int,int,double[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(float[],float[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(float[],int,int,float[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(int[],int,int,int[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(int[],int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(long[],int,int,long[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(long[],long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(short[],int,int,short[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "mismatch", "(short[],short[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(Object[],BinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(Object[],int,int,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(double[],DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(double[],int,int,DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(int[],IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(int[],int,int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(long[],LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelPrefix", "(long[],int,int,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSetAll", "(Object[],IntFunction)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSetAll", "(double[],IntToDoubleFunction)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSetAll", "(int[],IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSetAll", "(long[],IntToLongFunction)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(Comparable[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(Comparable[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(Object[],Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(Object[],int,int,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(char[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(char[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(double[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(double[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(float[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(float[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(int[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(long[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(short[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "parallelSort", "(short[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "setAll", "(Object[],IntFunction)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "setAll", "(double[],IntToDoubleFunction)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "setAll", "(int[],IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "setAll", "(long[],IntToLongFunction)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(Object[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(Object[],Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(Object[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(Object[],int,int,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(char[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(char[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(double[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(double[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(float[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(float[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(int[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(int[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(long[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(long[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(short[])", "summary", "df-generated"]
+      - ["java.util", "Arrays", "sort", "(short[],int,int)", "summary", "df-generated"]
+      - ["java.util", "Base64$Decoder", "decode", "(byte[],byte[])", "summary", "df-generated"]
+      - ["java.util", "Base64$Encoder", "encode", "(byte[],byte[])", "summary", "df-generated"]
+      - ["java.util", "Base64", "getDecoder", "()", "summary", "df-generated"]
+      - ["java.util", "Base64", "getEncoder", "()", "summary", "df-generated"]
+      - ["java.util", "Base64", "getMimeDecoder", "()", "summary", "df-generated"]
+      - ["java.util", "Base64", "getMimeEncoder", "()", "summary", "df-generated"]
+      - ["java.util", "Base64", "getUrlDecoder", "()", "summary", "df-generated"]
+      - ["java.util", "Base64", "getUrlEncoder", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "BitSet", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "and", "(BitSet)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "andNot", "(BitSet)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "cardinality", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "clear", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "clear", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "clear", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "flip", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "flip", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "get", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "get", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "intersects", "(BitSet)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "isEmpty", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "length", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "nextClearBit", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "nextSetBit", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "or", "(BitSet)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "previousClearBit", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "previousSetBit", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "set", "(int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "set", "(int,boolean)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "set", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "set", "(int,int,boolean)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "size", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "stream", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "toByteArray", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "toLongArray", "()", "summary", "df-generated"]
+      - ["java.util", "BitSet", "valueOf", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "valueOf", "(LongBuffer)", "summary", "df-generated"]
+      - ["java.util", "BitSet", "valueOf", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "BitSet", "valueOf", "(long[])", "summary", "df-generated"]
+      - ["java.util", "BitSet", "xor", "(BitSet)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "add", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "after", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "before", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "clear", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "clear", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getActualMaximum", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getActualMinimum", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getAvailableCalendarTypes", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getCalendarType", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getDisplayNames", "(int,int,Locale)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getFirstDayOfWeek", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getGreatestMinimum", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getInstance", "(Locale)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getLeastMaximum", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getMaximum", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getMinimalDaysInFirstWeek", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getMinimum", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getWeekYear", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "getWeeksInWeekYear", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "isLenient", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "isSet", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "isWeekDateSupported", "()", "summary", "df-generated"]
+      - ["java.util", "Calendar", "roll", "(int,boolean)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "roll", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "set", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "set", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "set", "(int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "setFirstDayOfWeek", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "setLenient", "(boolean)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "setMinimalDaysInFirstWeek", "(int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "setTimeInMillis", "(long)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "setWeekDate", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Calendar", "toInstant", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "binarySearch", "(List,Object)", "summary", "df-generated"]
+      - ["java.util", "Collections", "binarySearch", "(List,Object,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Collections", "disjoint", "(Collection,Collection)", "summary", "df-generated"]
+      - ["java.util", "Collections", "emptyEnumeration", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "emptyIterator", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "emptyListIterator", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "emptyNavigableMap", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "emptyNavigableSet", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "emptySortedMap", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "emptySortedSet", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "frequency", "(Collection,Object)", "summary", "df-generated"]
+      - ["java.util", "Collections", "indexOfSubList", "(List,List)", "summary", "df-generated"]
+      - ["java.util", "Collections", "lastIndexOfSubList", "(List,List)", "summary", "df-generated"]
+      - ["java.util", "Collections", "reverse", "(List)", "summary", "df-generated"]
+      - ["java.util", "Collections", "reverseOrder", "()", "summary", "df-generated"]
+      - ["java.util", "Collections", "rotate", "(List,int)", "summary", "df-generated"]
+      - ["java.util", "Collections", "shuffle", "(List)", "summary", "df-generated"]
+      - ["java.util", "Collections", "shuffle", "(List,Random)", "summary", "df-generated"]
+      - ["java.util", "Collections", "swap", "(List,int,int)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "comparing", "(Function)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "comparing", "(Function,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "comparingDouble", "(ToDoubleFunction)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "comparingInt", "(ToIntFunction)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "comparingLong", "(ToLongFunction)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "naturalOrder", "()", "summary", "df-generated"]
+      - ["java.util", "Comparator", "reverseOrder", "()", "summary", "df-generated"]
+      - ["java.util", "Comparator", "thenComparing", "(Comparator)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "thenComparing", "(Function)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "thenComparing", "(Function,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "thenComparingDouble", "(ToDoubleFunction)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "thenComparingInt", "(ToIntFunction)", "summary", "df-generated"]
+      - ["java.util", "Comparator", "thenComparingLong", "(ToLongFunction)", "summary", "df-generated"]
+      - ["java.util", "Currency", "getAvailableCurrencies", "()", "summary", "df-generated"]
+      - ["java.util", "Currency", "getDefaultFractionDigits", "()", "summary", "df-generated"]
+      - ["java.util", "Currency", "getNumericCode", "()", "summary", "df-generated"]
+      - ["java.util", "Currency", "getNumericCodeAsString", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "Date", "(String)", "summary", "df-generated"]
+      - ["java.util", "Date", "Date", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Date", "Date", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Date", "Date", "(int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Date", "UTC", "(int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Date", "after", "(Date)", "summary", "df-generated"]
+      - ["java.util", "Date", "before", "(Date)", "summary", "df-generated"]
+      - ["java.util", "Date", "getDate", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "getDay", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "getHours", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "getMinutes", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "getMonth", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "getSeconds", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "getTimezoneOffset", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "getYear", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "parse", "(String)", "summary", "df-generated"]
+      - ["java.util", "Date", "setDate", "(int)", "summary", "df-generated"]
+      - ["java.util", "Date", "setHours", "(int)", "summary", "df-generated"]
+      - ["java.util", "Date", "setMinutes", "(int)", "summary", "df-generated"]
+      - ["java.util", "Date", "setMonth", "(int)", "summary", "df-generated"]
+      - ["java.util", "Date", "setSeconds", "(int)", "summary", "df-generated"]
+      - ["java.util", "Date", "setTime", "(long)", "summary", "df-generated"]
+      - ["java.util", "Date", "setYear", "(int)", "summary", "df-generated"]
+      - ["java.util", "Date", "toGMTString", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "toInstant", "()", "summary", "df-generated"]
+      - ["java.util", "Date", "toLocaleString", "()", "summary", "df-generated"]
+      - ["java.util", "Dictionary", "isEmpty", "()", "summary", "df-generated"]
+      - ["java.util", "Dictionary", "size", "()", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "DoubleSummaryStatistics", "(long,double,double,double)", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "combine", "(DoubleSummaryStatistics)", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "getAverage", "()", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "getCount", "()", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "getMax", "()", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "getMin", "()", "summary", "df-generated"]
+      - ["java.util", "DoubleSummaryStatistics", "getSum", "()", "summary", "df-generated"]
+      - ["java.util", "EnumMap", "EnumMap", "(Class)", "summary", "df-generated"]
+      - ["java.util", "EnumSet", "allOf", "(Class)", "summary", "df-generated"]
+      - ["java.util", "EnumSet", "noneOf", "(Class)", "summary", "df-generated"]
+      - ["java.util", "EnumSet", "range", "(Enum,Enum)", "summary", "df-generated"]
+      - ["java.util", "FormatFlagsConversionMismatchException", "getConversion", "()", "summary", "df-generated"]
+      - ["java.util", "Formatter", "Formatter", "(File)", "summary", "df-generated"]
+      - ["java.util", "Formatter", "Formatter", "(File,String)", "summary", "df-generated"]
+      - ["java.util", "Formatter", "Formatter", "(OutputStream)", "summary", "df-generated"]
+      - ["java.util", "Formatter", "Formatter", "(OutputStream,String)", "summary", "df-generated"]
+      - ["java.util", "Formatter", "Formatter", "(String)", "summary", "df-generated"]
+      - ["java.util", "Formatter", "Formatter", "(String,String)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "GregorianCalendar", "(Locale)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "GregorianCalendar", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "GregorianCalendar", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "GregorianCalendar", "(int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "getGregorianChange", "()", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "isLeapYear", "(int)", "summary", "df-generated"]
+      - ["java.util", "GregorianCalendar", "setGregorianChange", "(Date)", "summary", "df-generated"]
+      - ["java.util", "HashMap", "HashMap", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "HashSet", "HashSet", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "Hashtable", "Hashtable", "(int)", "summary", "df-generated"]
+      - ["java.util", "Hashtable", "Hashtable", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "Hashtable", "contains", "(Object)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "fromHexDigit", "(int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "fromHexDigits", "(CharSequence)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "fromHexDigits", "(CharSequence,int,int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "fromHexDigitsToLong", "(CharSequence)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "fromHexDigitsToLong", "(CharSequence,int,int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "isHexDigit", "(int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "isUpperCase", "()", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "of", "()", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "parseHex", "(CharSequence)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "parseHex", "(CharSequence,int,int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "parseHex", "(char[],int,int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toHexDigits", "(byte)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toHexDigits", "(char)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toHexDigits", "(int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toHexDigits", "(long)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toHexDigits", "(long,int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toHexDigits", "(short)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toHighHexDigit", "(int)", "summary", "df-generated"]
+      - ["java.util", "HexFormat", "toLowHexDigit", "(int)", "summary", "df-generated"]
+      - ["java.util", "IdentityHashMap", "IdentityHashMap", "(int)", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatCodePointException", "IllegalFormatCodePointException", "(int)", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatCodePointException", "getCodePoint", "()", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatConversionException", "IllegalFormatConversionException", "(char,Class)", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatConversionException", "getArgumentClass", "()", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatConversionException", "getConversion", "()", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatPrecisionException", "IllegalFormatPrecisionException", "(int)", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatPrecisionException", "getPrecision", "()", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatWidthException", "IllegalFormatWidthException", "(int)", "summary", "df-generated"]
+      - ["java.util", "IllegalFormatWidthException", "getWidth", "()", "summary", "df-generated"]
+      - ["java.util", "IllformedLocaleException", "getErrorIndex", "()", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "IntSummaryStatistics", "(long,int,int,long)", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "combine", "(IntSummaryStatistics)", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "getAverage", "()", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "getCount", "()", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "getMax", "()", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "getMin", "()", "summary", "df-generated"]
+      - ["java.util", "IntSummaryStatistics", "getSum", "()", "summary", "df-generated"]
+      - ["java.util", "LinkedHashMap", "LinkedHashMap", "(int)", "summary", "df-generated"]
+      - ["java.util", "LinkedHashMap", "LinkedHashMap", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "LinkedHashMap", "LinkedHashMap", "(int,float,boolean)", "summary", "df-generated"]
+      - ["java.util", "LinkedHashSet", "LinkedHashSet", "(int)", "summary", "df-generated"]
+      - ["java.util", "LinkedHashSet", "LinkedHashSet", "(int,float)", "summary", "df-generated"]
+      - ["java.util", "List", "replaceAll", "(UnaryOperator)", "summary", "df-generated"]
+      - ["java.util", "ListResourceBundle", "getContents", "()", "summary", "df-generated"]
+      - ["java.util", "Locale$LanguageRange", "getWeight", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "filter", "(List,Collection)", "summary", "df-generated"]
+      - ["java.util", "Locale", "filter", "(List,Collection,Locale$FilteringMode)", "summary", "df-generated"]
+      - ["java.util", "Locale", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "getDefault", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "getDefault", "(Locale$Category)", "summary", "df-generated"]
+      - ["java.util", "Locale", "getExtension", "(char)", "summary", "df-generated"]
+      - ["java.util", "Locale", "getISO3Country", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "getISOCountries", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "getISOCountries", "(Locale$IsoCountryCode)", "summary", "df-generated"]
+      - ["java.util", "Locale", "getISOLanguages", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "getUnicodeLocaleAttributes", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "getUnicodeLocaleKeys", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "getUnicodeLocaleType", "(String)", "summary", "df-generated"]
+      - ["java.util", "Locale", "hasExtensions", "()", "summary", "df-generated"]
+      - ["java.util", "Locale", "lookup", "(List,Collection)", "summary", "df-generated"]
+      - ["java.util", "Locale", "setDefault", "(Locale$Category,Locale)", "summary", "df-generated"]
+      - ["java.util", "Locale", "setDefault", "(Locale)", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "LongSummaryStatistics", "(long,long,long,long)", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "combine", "(LongSummaryStatistics)", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "getAverage", "()", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "getCount", "()", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "getMax", "()", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "getMin", "()", "summary", "df-generated"]
+      - ["java.util", "LongSummaryStatistics", "getSum", "()", "summary", "df-generated"]
+      - ["java.util", "Map$Entry", "comparingByKey", "()", "summary", "df-generated"]
+      - ["java.util", "Map$Entry", "comparingByKey", "(Comparator)", "summary", "df-generated"]
+      - ["java.util", "Map$Entry", "comparingByValue", "()", "summary", "df-generated"]
+      - ["java.util", "Map$Entry", "comparingByValue", "(Comparator)", "summary", "df-generated"]
+      - ["java.util", "Map", "remove", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util", "Map", "replaceAll", "(BiFunction)", "summary", "df-generated"]
+      - ["java.util", "Objects", "checkFromIndexSize", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Objects", "checkFromIndexSize", "(long,long,long)", "summary", "df-generated"]
+      - ["java.util", "Objects", "checkFromToIndex", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Objects", "checkFromToIndex", "(long,long,long)", "summary", "df-generated"]
+      - ["java.util", "Objects", "checkIndex", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "Objects", "checkIndex", "(long,long)", "summary", "df-generated"]
+      - ["java.util", "Objects", "compare", "(Object,Object,Comparator)", "summary", "df-generated"]
+      - ["java.util", "Objects", "deepEquals", "(Object,Object)", "summary", "df-generated"]
+      - ["java.util", "Observable", "countObservers", "()", "summary", "df-generated"]
+      - ["java.util", "Observable", "deleteObserver", "(Observer)", "summary", "df-generated"]
+      - ["java.util", "Observable", "deleteObservers", "()", "summary", "df-generated"]
+      - ["java.util", "Observable", "hasChanged", "()", "summary", "df-generated"]
+      - ["java.util", "Observable", "notifyObservers", "()", "summary", "df-generated"]
+      - ["java.util", "Observable", "notifyObservers", "(Object)", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "empty", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "getAsDouble", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "ifPresent", "(DoubleConsumer)", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "ifPresentOrElse", "(DoubleConsumer,Runnable)", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "isEmpty", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "isPresent", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "of", "(double)", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "orElse", "(double)", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "orElseGet", "(DoubleSupplier)", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "orElseThrow", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "orElseThrow", "(Supplier)", "summary", "df-generated"]
+      - ["java.util", "OptionalDouble", "stream", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "empty", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "getAsInt", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "ifPresent", "(IntConsumer)", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "ifPresentOrElse", "(IntConsumer,Runnable)", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "isEmpty", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "isPresent", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "of", "(int)", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "orElse", "(int)", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "orElseGet", "(IntSupplier)", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "orElseThrow", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "orElseThrow", "(Supplier)", "summary", "df-generated"]
+      - ["java.util", "OptionalInt", "stream", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "empty", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "getAsLong", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "ifPresent", "(LongConsumer)", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "ifPresentOrElse", "(LongConsumer,Runnable)", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "isEmpty", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "isPresent", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "of", "(long)", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "orElse", "(long)", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "orElseGet", "(LongSupplier)", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "orElseThrow", "()", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "orElseThrow", "(Supplier)", "summary", "df-generated"]
+      - ["java.util", "OptionalLong", "stream", "()", "summary", "df-generated"]
+      - ["java.util", "PrimitiveIterator$OfDouble", "nextDouble", "()", "summary", "df-generated"]
+      - ["java.util", "PrimitiveIterator$OfInt", "nextInt", "()", "summary", "df-generated"]
+      - ["java.util", "PrimitiveIterator$OfLong", "nextLong", "()", "summary", "df-generated"]
+      - ["java.util", "PriorityQueue", "PriorityQueue", "(int)", "summary", "df-generated"]
+      - ["java.util", "Properties", "Properties", "(int)", "summary", "df-generated"]
+      - ["java.util", "Properties", "load", "(InputStream)", "summary", "df-generated"]
+      - ["java.util", "Properties", "load", "(Reader)", "summary", "df-generated"]
+      - ["java.util", "Properties", "loadFromXML", "(InputStream)", "summary", "df-generated"]
+      - ["java.util", "Properties", "save", "(OutputStream,String)", "summary", "df-generated"]
+      - ["java.util", "Properties", "store", "(OutputStream,String)", "summary", "df-generated"]
+      - ["java.util", "Properties", "storeToXML", "(OutputStream,String)", "summary", "df-generated"]
+      - ["java.util", "Properties", "storeToXML", "(OutputStream,String,Charset)", "summary", "df-generated"]
+      - ["java.util", "Properties", "storeToXML", "(OutputStream,String,String)", "summary", "df-generated"]
+      - ["java.util", "PropertyResourceBundle", "PropertyResourceBundle", "(InputStream)", "summary", "df-generated"]
+      - ["java.util", "PropertyResourceBundle", "PropertyResourceBundle", "(Reader)", "summary", "df-generated"]
+      - ["java.util", "Random", "Random", "(long)", "summary", "df-generated"]
+      - ["java.util", "Random", "setSeed", "(long)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", "getCandidateLocales", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", "getControl", "(List)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", "getFallbackLocale", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", "getNoFallbackControl", "(List)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", "getTimeToLive", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle$Control", "needsReload", "(String,Locale,String,ClassLoader,ResourceBundle,long)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle", "clearCache", "()", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle", "clearCache", "(ClassLoader)", "summary", "df-generated"]
+      - ["java.util", "ResourceBundle", "containsKey", "(String)", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextBigDecimal", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextBigInteger", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextBigInteger", "(int)", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextBoolean", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextByte", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextByte", "(int)", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextDouble", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextFloat", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextInt", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextInt", "(int)", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextLine", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextLong", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextLong", "(int)", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextShort", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "hasNextShort", "(int)", "summary", "df-generated"]
+      - ["java.util", "Scanner", "radix", "()", "summary", "df-generated"]
+      - ["java.util", "Scanner", "tokens", "()", "summary", "df-generated"]
+      - ["java.util", "ServiceLoader", "load", "(Class)", "summary", "df-generated"]
+      - ["java.util", "ServiceLoader", "loadInstalled", "(Class)", "summary", "df-generated"]
+      - ["java.util", "ServiceLoader", "reload", "()", "summary", "df-generated"]
+      - ["java.util", "Set", "of", "()", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setDSTSavings", "(int)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setEndRule", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setEndRule", "(int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setEndRule", "(int,int,int,int,boolean)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setStartRule", "(int,int,int)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setStartRule", "(int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setStartRule", "(int,int,int,int,boolean)", "summary", "df-generated"]
+      - ["java.util", "SimpleTimeZone", "setStartYear", "(int)", "summary", "df-generated"]
+      - ["java.util", "Spliterator$OfPrimitive", "forEachRemaining", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Spliterator", "getComparator", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterator", "getExactSizeIfKnown", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterator", "hasCharacteristics", "(int)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "emptyDoubleSpliterator", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "emptyIntSpliterator", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "emptyLongSpliterator", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "emptySpliterator", "()", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "iterator", "(Spliterator$OfDouble)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "iterator", "(Spliterator$OfInt)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "iterator", "(Spliterator$OfLong)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "iterator", "(Spliterator)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "spliterator", "(double[],int)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "spliterator", "(double[],int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "spliterator", "(int[],int)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "spliterator", "(int[],int,int,int)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "spliterator", "(long[],int)", "summary", "df-generated"]
+      - ["java.util", "Spliterators", "spliterator", "(long[],int,int,int)", "summary", "df-generated"]
+      - ["java.util", "SplittableRandom", "SplittableRandom", "(long)", "summary", "df-generated"]
+      - ["java.util", "Stack", "empty", "()", "summary", "df-generated"]
+      - ["java.util", "Stack", "search", "(Object)", "summary", "df-generated"]
+      - ["java.util", "StringJoiner", "length", "()", "summary", "df-generated"]
+      - ["java.util", "StringTokenizer", "countTokens", "()", "summary", "df-generated"]
+      - ["java.util", "StringTokenizer", "hasMoreTokens", "()", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "getAvailableIDs", "()", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "getAvailableIDs", "(int)", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "getDSTSavings", "()", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "getDefault", "()", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "getOffset", "(int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "getOffset", "(long)", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "getRawOffset", "()", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "hasSameRules", "(TimeZone)", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "inDaylightTime", "(Date)", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "observesDaylightTime", "()", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "setDefault", "(TimeZone)", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "setRawOffset", "(int)", "summary", "df-generated"]
+      - ["java.util", "TimeZone", "useDaylightTime", "()", "summary", "df-generated"]
+      - ["java.util", "Timer", "Timer", "(boolean)", "summary", "df-generated"]
+      - ["java.util", "Timer", "cancel", "()", "summary", "df-generated"]
+      - ["java.util", "Timer", "purge", "()", "summary", "df-generated"]
+      - ["java.util", "Timer", "schedule", "(TimerTask,Date)", "summary", "df-generated"]
+      - ["java.util", "Timer", "schedule", "(TimerTask,Date,long)", "summary", "df-generated"]
+      - ["java.util", "Timer", "schedule", "(TimerTask,long)", "summary", "df-generated"]
+      - ["java.util", "Timer", "schedule", "(TimerTask,long,long)", "summary", "df-generated"]
+      - ["java.util", "Timer", "scheduleAtFixedRate", "(TimerTask,Date,long)", "summary", "df-generated"]
+      - ["java.util", "Timer", "scheduleAtFixedRate", "(TimerTask,long,long)", "summary", "df-generated"]
+      - ["java.util", "TimerTask", "cancel", "()", "summary", "df-generated"]
+      - ["java.util", "TimerTask", "scheduledExecutionTime", "()", "summary", "df-generated"]
+      - ["java.util", "UUID", "UUID", "(long,long)", "summary", "df-generated"]
+      - ["java.util", "UUID", "clockSequence", "()", "summary", "df-generated"]
+      - ["java.util", "UUID", "getLeastSignificantBits", "()", "summary", "df-generated"]
+      - ["java.util", "UUID", "getMostSignificantBits", "()", "summary", "df-generated"]
+      - ["java.util", "UUID", "nameUUIDFromBytes", "(byte[])", "summary", "df-generated"]
+      - ["java.util", "UUID", "node", "()", "summary", "df-generated"]
+      - ["java.util", "UUID", "timestamp", "()", "summary", "df-generated"]
+      - ["java.util", "UUID", "variant", "()", "summary", "df-generated"]
+      - ["java.util", "UUID", "version", "()", "summary", "df-generated"]
+      - ["java.util", "Vector", "Vector", "(int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "Vector", "(int,int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "capacity", "()", "summary", "df-generated"]
+      - ["java.util", "Vector", "ensureCapacity", "(int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "indexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "lastIndexOf", "(Object,int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "removeAllElements", "()", "summary", "df-generated"]
+      - ["java.util", "Vector", "removeElement", "(Object)", "summary", "df-generated"]
+      - ["java.util", "Vector", "removeElementAt", "(int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "setSize", "(int)", "summary", "df-generated"]
+      - ["java.util", "Vector", "trimToSize", "()", "summary", "df-generated"]
+      - ["java.util", "WeakHashMap", "WeakHashMap", "(int)", "summary", "df-generated"]
+      - ["java.util", "WeakHashMap", "WeakHashMap", "(int,float)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.prefs.model.yml b/java/ql/lib/ext/generated/java.util.prefs.model.yml
new file mode 100644
index 00000000000..bb056466a61
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.prefs.model.yml
@@ -0,0 +1,69 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.prefs", "BackingStoreException", True, "BackingStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "BackingStoreException", True, "BackingStoreException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "InvalidPreferencesFormatException", True, "InvalidPreferencesFormatException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "NodeChangeEvent", "(Preferences,Preferences)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "NodeChangeEvent", "(Preferences,Preferences)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "getChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "NodeChangeEvent", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "PreferenceChangeEvent", "(Preferences,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "getNewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "PreferenceChangeEvent", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "absolutePath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "addNodeChangeListener", "(NodeChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "addPreferenceChangeListener", "(PreferenceChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "childrenNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "get", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "get", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "getByteArray", "(String,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "node", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "node", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "parent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "put", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "put", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "putBoolean", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "putByteArray", "(String,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "putDouble", "(String,double)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "putFloat", "(String,float)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "putInt", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.prefs", "Preferences", True, "putLong", "(String,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.prefs", "Preferences", "clear", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "exportNode", "(OutputStream)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "exportSubtree", "(OutputStream)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "flush", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "getBoolean", "(String,boolean)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "getDouble", "(String,double)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "getFloat", "(String,float)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "getInt", "(String,int)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "getLong", "(String,long)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "importPreferences", "(InputStream)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "isUserNode", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "nodeExists", "(String)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "remove", "(String)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "removeNode", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "removeNodeChangeListener", "(NodeChangeListener)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "removePreferenceChangeListener", "(PreferenceChangeListener)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "sync", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "systemNodeForPackage", "(Class)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "systemRoot", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "userNodeForPackage", "(Class)", "summary", "df-generated"]
+      - ["java.util.prefs", "Preferences", "userRoot", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "PreferencesFactory", "systemRoot", "()", "summary", "df-generated"]
+      - ["java.util.prefs", "PreferencesFactory", "userRoot", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.random.model.yml b/java/ql/lib/ext/generated/java.util.random.model.yml
new file mode 100644
index 00000000000..2e543aebe8f
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.random.model.yml
@@ -0,0 +1,88 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "(RandomGenerator$SplittableGenerator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "(RandomGenerator$SplittableGenerator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "(long,RandomGenerator$SplittableGenerator)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", True, "splits", "(long,RandomGenerator$SplittableGenerator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "doubles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "doubles", "(double,double)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "doubles", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "doubles", "(long,double,double)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "ints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "ints", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "ints", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "ints", "(long,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "longs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "longs", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "longs", "(long,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.random", "RandomGenerator", True, "longs", "(long,long,long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "copyAndJump", "(double)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "jumps", "(double)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "jumps", "(long,double)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$ArbitrarilyJumpableGenerator", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", "copyAndJump", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", "jump", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", "jumps", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", "jumps", "(long)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$JumpableGenerator", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$LeapableGenerator", "copyAndLeap", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$LeapableGenerator", "leap", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$LeapableGenerator", "leaps", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$LeapableGenerator", "leaps", "(long)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$LeapableGenerator", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", "split", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$SplittableGenerator", "split", "(RandomGenerator$SplittableGenerator)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$StreamableGenerator", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$StreamableGenerator", "rngs", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator$StreamableGenerator", "rngs", "(long)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "getDefault", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "isDeprecated", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextBoolean", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextBytes", "(byte[])", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextDouble", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextDouble", "(double)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextDouble", "(double,double)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextExponential", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextFloat", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextFloat", "(float)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextFloat", "(float,float)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextGaussian", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextGaussian", "(double,double)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextInt", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextInt", "(int)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextInt", "(int,int)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextLong", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextLong", "(long)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "nextLong", "(long,long)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGenerator", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "all", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "create", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "create", "(byte[])", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "create", "(long)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "equidistribution", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "getDefault", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "group", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isArbitrarilyJumpable", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isDeprecated", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isHardware", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isJumpable", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isLeapable", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isSplittable", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isStatistical", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isStochastic", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "isStreamable", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "name", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "of", "(String)", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "period", "()", "summary", "df-generated"]
+      - ["java.util.random", "RandomGeneratorFactory", "stateBits", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.regex.model.yml b/java/ql/lib/ext/generated/java.util.regex.model.yml
new file mode 100644
index 00000000000..6796f7ba32a
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.regex.model.yml
@@ -0,0 +1,63 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.regex", "MatchResult", True, "group", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "MatchResult", True, "group", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuffer,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuffer,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuilder,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuilder,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuffer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "pattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "quoteReplacement", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "region", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "reset", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "toMatchResult", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "useAnchoringBounds", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "usePattern", "(Pattern)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "usePattern", "(Pattern)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.regex", "Matcher", False, "useTransparentBounds", "(boolean)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.regex", "Pattern", False, "compile", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "Pattern", False, "pattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "PatternSyntaxException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "PatternSyntaxException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.regex", "PatternSyntaxException", True, "getPattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.regex", "MatchResult", "end", "()", "summary", "df-generated"]
+      - ["java.util.regex", "MatchResult", "end", "(int)", "summary", "df-generated"]
+      - ["java.util.regex", "MatchResult", "groupCount", "()", "summary", "df-generated"]
+      - ["java.util.regex", "MatchResult", "start", "()", "summary", "df-generated"]
+      - ["java.util.regex", "MatchResult", "start", "(int)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "end", "(String)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "find", "(int)", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "hasAnchoringBounds", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "hasTransparentBounds", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "hitEnd", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "lookingAt", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "matches", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "regionEnd", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "regionStart", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "requireEnd", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "results", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Matcher", "start", "(String)", "summary", "df-generated"]
+      - ["java.util.regex", "Pattern", "asMatchPredicate", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Pattern", "asPredicate", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Pattern", "flags", "()", "summary", "df-generated"]
+      - ["java.util.regex", "Pattern", "matches", "(String,CharSequence)", "summary", "df-generated"]
+      - ["java.util.regex", "Pattern", "splitAsStream", "(CharSequence)", "summary", "df-generated"]
+      - ["java.util.regex", "PatternSyntaxException", "getIndex", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.spi.model.yml b/java/ql/lib/ext/generated/java.util.spi.model.yml
new file mode 100644
index 00000000000..b2bdab212b0
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.spi.model.yml
@@ -0,0 +1,25 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.spi", "CalendarDataProvider", "getFirstDayOfWeek", "(Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "CalendarDataProvider", "getMinimalDaysInFirstWeek", "(Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "CalendarNameProvider", "getDisplayName", "(String,int,int,int,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "CalendarNameProvider", "getDisplayNames", "(String,int,int,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "CurrencyNameProvider", "getDisplayName", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "CurrencyNameProvider", "getSymbol", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleNameProvider", "getDisplayCountry", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleNameProvider", "getDisplayLanguage", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleNameProvider", "getDisplayScript", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleNameProvider", "getDisplayUnicodeExtensionKey", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleNameProvider", "getDisplayUnicodeExtensionType", "(String,String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleNameProvider", "getDisplayVariant", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleServiceProvider", "getAvailableLocales", "()", "summary", "df-generated"]
+      - ["java.util.spi", "LocaleServiceProvider", "isSupportedLocale", "(Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "ResourceBundleProvider", "getBundle", "(String,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "TimeZoneNameProvider", "getDisplayName", "(String,boolean,int,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "TimeZoneNameProvider", "getGenericDisplayName", "(String,int,Locale)", "summary", "df-generated"]
+      - ["java.util.spi", "ToolProvider", "findFirst", "(String)", "summary", "df-generated"]
+      - ["java.util.spi", "ToolProvider", "run", "(PrintStream,PrintStream,String[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.stream.model.yml b/java/ql/lib/ext/generated/java.util.stream.model.yml
new file mode 100644
index 00000000000..edd36e33405
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.stream.model.yml
@@ -0,0 +1,216 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.stream", "Collector", True, "of", "(Supplier,BiConsumer,BinaryOperator,Collector$Characteristics[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collector", True, "of", "(Supplier,BiConsumer,BinaryOperator,Collector$Characteristics[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collector", True, "of", "(Supplier,BiConsumer,BinaryOperator,Collector$Characteristics[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collector", True, "of", "(Supplier,BiConsumer,BinaryOperator,Function,Collector$Characteristics[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collector", True, "of", "(Supplier,BiConsumer,BinaryOperator,Function,Collector$Characteristics[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collector", True, "of", "(Supplier,BiConsumer,BinaryOperator,Function,Collector$Characteristics[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collector", True, "of", "(Supplier,BiConsumer,BinaryOperator,Function,Collector$Characteristics[])", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "collectingAndThen", "(Collector,Function)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "filtering", "(Predicate,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "flatMapping", "(Function,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "groupingBy", "(Function,Supplier,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "groupingByConcurrent", "(Function,Supplier,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "mapping", "(Function,Collector)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "teeing", "(Collector,Collector,BiFunction)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "toCollection", "(Supplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "toConcurrentMap", "(Function,Function,BinaryOperator,Supplier)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Collectors", False, "toMap", "(Function,Function,BinaryOperator,Supplier)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream$Builder", True, "add", "(double)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "DoubleStream$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "boxed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "concat", "(DoubleStream,DoubleStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "concat", "(DoubleStream,DoubleStream)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "distinct", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "dropWhile", "(DoublePredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "dropWhile", "(DoublePredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "filter", "(DoublePredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "flatMap", "(DoubleFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "generate", "(DoubleSupplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "limit", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "map", "(DoubleUnaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "mapMulti", "(DoubleStream$DoubleMapMultiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "mapToInt", "(DoubleToIntFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "mapToLong", "(DoubleToLongFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "mapToObj", "(DoubleFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "peek", "(DoubleConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "sorted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "takeWhile", "(DoublePredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "DoubleStream", True, "takeWhile", "(DoublePredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream$Builder", True, "add", "(int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "IntStream$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "asDoubleStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "asLongStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "boxed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "concat", "(IntStream,IntStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "concat", "(IntStream,IntStream)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "distinct", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "dropWhile", "(IntPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "dropWhile", "(IntPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "filter", "(IntPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "flatMap", "(IntFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "generate", "(IntSupplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "limit", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "map", "(IntUnaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "mapMulti", "(IntStream$IntMapMultiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "mapToDouble", "(IntToDoubleFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "mapToLong", "(IntToLongFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "mapToObj", "(IntFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "peek", "(IntConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "sorted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "takeWhile", "(IntPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "IntStream", True, "takeWhile", "(IntPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream$Builder", True, "add", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "LongStream$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "asDoubleStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "boxed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "concat", "(LongStream,LongStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "concat", "(LongStream,LongStream)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "distinct", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "dropWhile", "(LongPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "dropWhile", "(LongPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "filter", "(LongPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "flatMap", "(LongFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "generate", "(LongSupplier)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "limit", "(long)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "map", "(LongUnaryOperator)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "mapMulti", "(LongStream$LongMapMultiConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "mapToDouble", "(LongToDoubleFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "mapToInt", "(LongToIntFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "mapToObj", "(LongFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "peek", "(LongConsumer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "skip", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "sorted", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "takeWhile", "(LongPredicate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "LongStream", True, "takeWhile", "(LongPredicate)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedDouble", True, "ChainedDouble", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedInt", True, "ChainedInt", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedLong", True, "ChainedLong", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.stream", "Sink$ChainedReference", True, "ChainedReference", "(Sink)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.stream", "Stream$Builder", True, "add", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.stream", "Stream$Builder", True, "add", "(Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "doubleStream", "(Spliterator$OfDouble,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "doubleStream", "(Supplier,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "intStream", "(Spliterator$OfInt,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "intStream", "(Supplier,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "longStream", "(Spliterator$OfLong,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "longStream", "(Supplier,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "stream", "(Spliterator,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.stream", "StreamSupport", False, "stream", "(Supplier,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.stream", "Collectors", "averagingDouble", "(ToDoubleFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "averagingInt", "(ToIntFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "averagingLong", "(ToLongFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "counting", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "groupingBy", "(Function)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "groupingBy", "(Function,Collector)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "groupingByConcurrent", "(Function)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "groupingByConcurrent", "(Function,Collector)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "joining", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "joining", "(CharSequence)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "joining", "(CharSequence,CharSequence,CharSequence)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "maxBy", "(Comparator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "minBy", "(Comparator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "partitioningBy", "(Predicate)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "partitioningBy", "(Predicate,Collector)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "reducing", "(BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "reducing", "(Object,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "reducing", "(Object,Function,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "summarizingDouble", "(ToDoubleFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "summarizingInt", "(ToIntFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "summarizingLong", "(ToLongFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "summingDouble", "(ToDoubleFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "summingInt", "(ToIntFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "summingLong", "(ToLongFunction)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toConcurrentMap", "(Function,Function)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toConcurrentMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toMap", "(Function,Function)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toUnmodifiableList", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toUnmodifiableMap", "(Function,Function)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toUnmodifiableMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "Collectors", "toUnmodifiableSet", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "allMatch", "(DoublePredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "anyMatch", "(DoublePredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "average", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "builder", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "collect", "(Supplier,ObjDoubleConsumer,BiConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "count", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "empty", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "findAny", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "findFirst", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "forEach", "(DoubleConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "forEachOrdered", "(DoubleConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "iterate", "(double,DoublePredicate,DoubleUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "iterate", "(double,DoubleUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "max", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "min", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "noneMatch", "(DoublePredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "of", "(double)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "of", "(double[])", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "reduce", "(DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "reduce", "(double,DoubleBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "sum", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "summaryStatistics", "()", "summary", "df-generated"]
+      - ["java.util.stream", "DoubleStream", "toArray", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "allMatch", "(IntPredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "anyMatch", "(IntPredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "average", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "builder", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "collect", "(Supplier,ObjIntConsumer,BiConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "count", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "empty", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "findAny", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "findFirst", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "forEach", "(IntConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "forEachOrdered", "(IntConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "iterate", "(int,IntPredicate,IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "iterate", "(int,IntUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "max", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "min", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "noneMatch", "(IntPredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "of", "(int)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "of", "(int[])", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "rangeClosed", "(int,int)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "reduce", "(IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "reduce", "(int,IntBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "sum", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "summaryStatistics", "()", "summary", "df-generated"]
+      - ["java.util.stream", "IntStream", "toArray", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "allMatch", "(LongPredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "anyMatch", "(LongPredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "average", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "builder", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "collect", "(Supplier,ObjLongConsumer,BiConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "count", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "empty", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "findAny", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "findFirst", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "forEach", "(LongConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "forEachOrdered", "(LongConsumer)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "iterate", "(long,LongPredicate,LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "iterate", "(long,LongUnaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "max", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "min", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "noneMatch", "(LongPredicate)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "of", "(long)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "of", "(long[])", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "range", "(long,long)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "rangeClosed", "(long,long)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "reduce", "(LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "reduce", "(long,LongBinaryOperator)", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "sum", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "summaryStatistics", "()", "summary", "df-generated"]
+      - ["java.util.stream", "LongStream", "toArray", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Stream", "builder", "()", "summary", "df-generated"]
+      - ["java.util.stream", "Stream", "empty", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.zip.model.yml b/java/ql/lib/ext/generated/java.util.zip.model.yml
new file mode 100644
index 00000000000..8aaf1118ad6
--- /dev/null
+++ b/java/ql/lib/ext/generated/java.util.zip.model.yml
@@ -0,0 +1,155 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.util.zip", "CheckedInputStream", True, "CheckedInputStream", "(InputStream,Checksum)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "CheckedInputStream", True, "CheckedInputStream", "(InputStream,Checksum)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "CheckedInputStream", True, "getChecksum", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "CheckedOutputStream", True, "CheckedOutputStream", "(OutputStream,Checksum)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "CheckedOutputStream", True, "CheckedOutputStream", "(OutputStream,Checksum)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "CheckedOutputStream", True, "getChecksum", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "DataFormatException", True, "DataFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "Deflater", True, "setInput", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "Deflater", True, "setInput", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "Deflater", True, "setInput", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream,Deflater)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream,Deflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream,Deflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterInputStream", True, "DeflaterInputStream", "(InputStream,Deflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,Deflater,int,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", True, "DeflaterOutputStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "GZIPOutputStream", True, "GZIPOutputStream", "(OutputStream,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "Inflater", True, "setInput", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "Inflater", True, "setInput", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "Inflater", True, "setInput", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream,Inflater)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream,Inflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream,Inflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterInputStream", True, "InflaterInputStream", "(InputStream,Inflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "InflaterOutputStream", True, "InflaterOutputStream", "(OutputStream,Inflater,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "ZipEntry", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getComment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getCreationTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getExtra", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getLastAccessTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getLastModifiedTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setComment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setCreationTime", "(FileTime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setCreationTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setExtra", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastAccessTime", "(FileTime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastAccessTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastModifiedTime", "(FileTime)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipEntry", True, "setLastModifiedTime", "(FileTime)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["java.util.zip", "ZipError", True, "ZipError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipException", True, "ZipException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,int,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "getEntry", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "getEntry", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "getInputStream", "(ZipEntry)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipFile", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipInputStream", True, "getNextEntry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", True, "ZipOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", True, "ZipOutputStream", "(OutputStream,Charset)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", True, "putNextEntry", "(ZipEntry)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", True, "setComment", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.util.zip", "Checksum", "getValue", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Checksum", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Checksum", "update", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "Checksum", "update", "(byte[])", "summary", "df-generated"]
+      - ["java.util.zip", "Checksum", "update", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "Checksum", "update", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "Deflater", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "Deflater", "(int,boolean)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "deflate", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "deflate", "(ByteBuffer,int)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "deflate", "(byte[])", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "deflate", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "deflate", "(byte[],int,int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "end", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "finish", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "finished", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "getAdler", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "getBytesRead", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "getBytesWritten", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "getTotalIn", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "getTotalOut", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "needsInput", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "setDictionary", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "setDictionary", "(byte[])", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "setDictionary", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "setLevel", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "Deflater", "setStrategy", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "DeflaterOutputStream", "finish", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "Inflater", "(boolean)", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "end", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "finished", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "getAdler", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "getBytesRead", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "getBytesWritten", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "getRemaining", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "getTotalIn", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "getTotalOut", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "inflate", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "inflate", "(byte[])", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "inflate", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "needsDictionary", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "needsInput", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "reset", "()", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "setDictionary", "(ByteBuffer)", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "setDictionary", "(byte[])", "summary", "df-generated"]
+      - ["java.util.zip", "Inflater", "setDictionary", "(byte[],int,int)", "summary", "df-generated"]
+      - ["java.util.zip", "InflaterOutputStream", "finish", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "getCompressedSize", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "getCrc", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "getMethod", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "getSize", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "getTime", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "getTimeLocal", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "isDirectory", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "setCompressedSize", "(long)", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "setCrc", "(long)", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "setMethod", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "setSize", "(long)", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "setTime", "(long)", "summary", "df-generated"]
+      - ["java.util.zip", "ZipEntry", "setTimeLocal", "(LocalDateTime)", "summary", "df-generated"]
+      - ["java.util.zip", "ZipFile", "entries", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipFile", "getComment", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipFile", "size", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipFile", "stream", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipInputStream", "closeEntry", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", "closeEntry", "()", "summary", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", "setLevel", "(int)", "summary", "df-generated"]
+      - ["java.util.zip", "ZipOutputStream", "setMethod", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.accessibility.model.yml b/java/ql/lib/ext/generated/javax.accessibility.model.yml
new file mode 100644
index 00000000000..ff17aaf81e1
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.accessibility.model.yml
@@ -0,0 +1,75 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.accessibility", "Accessible", True, "getAccessibleContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleAttributeSequence", True, "AccessibleAttributeSequence", "(int,int,AttributeSet)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleBundle", True, "toDisplayString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleBundle", True, "toDisplayString", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleBundle", True, "toDisplayString", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "getAccessibleRelationSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleDescription", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", True, "setAccessibleParent", "(Accessible)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "AccessibleRelation", "(String,Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "getTarget", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "setTarget", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelation", True, "setTarget", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "AccessibleRelationSet", "(AccessibleRelation[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "add", "(AccessibleRelation)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "addAll", "(AccessibleRelation[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "AccessibleStateSet", "(AccessibleState[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "add", "(AccessibleState)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "addAll", "(AccessibleState[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.accessibility", "AccessibleTextSequence", True, "AccessibleTextSequence", "(int,int,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.accessibility", "AccessibilityProvider", "activate", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibilityProvider", "getName", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleAction", "doAccessibleAction", "(int)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleAction", "getAccessibleActionCount", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleAction", "getAccessibleActionDescription", "(int)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "addPropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "firePropertyChange", "(String,Object,Object)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleAction", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleChild", "(int)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleChildrenCount", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleComponent", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleEditableText", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleIcon", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleIndexInParent", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleRole", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleSelection", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleStateSet", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleTable", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleText", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getAccessibleValue", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "getLocale", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleContext", "removePropertyChangeListener", "(PropertyChangeListener)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "getAccessibleActionAnchor", "(int)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "getAccessibleActionObject", "(int)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "getEndIndex", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "getStartIndex", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleHyperlink", "isValid", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", "clear", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", "contains", "(String)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", "remove", "(AccessibleRelation)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleRelationSet", "size", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", "clear", "()", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", "contains", "(AccessibleState)", "summary", "df-generated"]
+      - ["javax.accessibility", "AccessibleStateSet", "remove", "(AccessibleState)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.annotation.processing.model.yml b/java/ql/lib/ext/generated/javax.annotation.processing.model.yml
new file mode 100644
index 00000000000..6f80ce5dce9
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.annotation.processing.model.yml
@@ -0,0 +1,25 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.annotation.processing", "Completion", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Completion", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Completions", True, "of", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Completions", True, "of", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Completions", True, "of", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "FilerException", True, "FilerException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.annotation.processing", "Processor", True, "init", "(ProcessingEnvironment)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.annotation.processing", "RoundEnvironment", True, "getElementsAnnotatedWithAny", "(Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.annotation.processing", "RoundEnvironment", True, "getElementsAnnotatedWithAny", "(TypeElement[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.annotation.processing", "ProcessingEnvironment", "isPreviewEnabled", "()", "summary", "df-generated"]
+      - ["javax.annotation.processing", "Processor", "getCompletions", "(Element,AnnotationMirror,ExecutableElement,String)", "summary", "df-generated"]
+      - ["javax.annotation.processing", "Processor", "getSupportedAnnotationTypes", "()", "summary", "df-generated"]
+      - ["javax.annotation.processing", "Processor", "getSupportedOptions", "()", "summary", "df-generated"]
+      - ["javax.annotation.processing", "Processor", "getSupportedSourceVersion", "()", "summary", "df-generated"]
+      - ["javax.annotation.processing", "Processor", "process", "(Set,RoundEnvironment)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.crypto.model.yml b/java/ql/lib/ext/generated/javax.crypto.model.yml
new file mode 100644
index 00000000000..84a2a5c724b
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.crypto.model.yml
@@ -0,0 +1,180 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.crypto", "AEADBadTagException", True, "AEADBadTagException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "BadPaddingException", True, "BadPaddingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getExemptionMechanism", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Certificate,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters,SecureRandom)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "init", "(int,Key,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "unwrap", "(byte[],String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "unwrap", "(byte[],String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "unwrap", "(byte[],String,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "updateAAD", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "updateAAD", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "updateAAD", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "wrap", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Cipher", True, "wrap", "(Key)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "CipherInputStream", True, "CipherInputStream", "(InputStream,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "CipherInputStream", True, "CipherInputStream", "(InputStream,Cipher)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "CipherOutputStream", True, "CipherOutputStream", "(OutputStream,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "CipherOutputStream", True, "CipherOutputStream", "(OutputStream,Cipher)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(AlgorithmParameters,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(AlgorithmParameters,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(String,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "EncryptedPrivateKeyInfo", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getAlgParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getEncryptedData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Cipher)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Cipher)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Cipher)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Key)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Key,Provider)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", True, "getKeySpec", "(Key,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "init", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "init", "(Key,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", True, "init", "(Key,AlgorithmParameters)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanismException", True, "ExemptionMechanismException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "IllegalBlockSizeException", True, "IllegalBlockSizeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "doPhase", "(Key,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "generateSecret", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "generateSecret", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "generateSecret", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "generateSecret", "(byte[],int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "init", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "init", "(Key,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "init", "(Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyAgreement", True, "init", "(Key,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "generateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "init", "(AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "init", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "init", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "init", "(SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", True, "init", "(int,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "doFinal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "doFinal", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "doFinal", "(byte[],int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "init", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "Mac", True, "init", "(Key,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "NoSuchPaddingException", True, "NoSuchPaddingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "SealedObject", "(Serializable,Cipher)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "SealedObject", "(Serializable,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "SealedObject", "(Serializable,Cipher)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "getObject", "(Cipher)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "getObject", "(Cipher)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "getObject", "(Cipher)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "getObject", "(Key)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SealedObject", True, "getObject", "(Key,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "generateSecret", "(KeySpec)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "generateSecret", "(KeySpec)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getKeySpec", "(SecretKey,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getKeySpec", "(SecretKey,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "translateKey", "(SecretKey)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "SecretKeyFactory", True, "translateKey", "(SecretKey)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto", "ShortBufferException", True, "ShortBufferException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.crypto", "Cipher", "getBlockSize", "()", "summary", "df-generated"]
+      - ["javax.crypto", "Cipher", "getMaxAllowedKeyLength", "(String)", "summary", "df-generated"]
+      - ["javax.crypto", "Cipher", "getMaxAllowedParameterSpec", "(String)", "summary", "df-generated"]
+      - ["javax.crypto", "Cipher", "getOutputSize", "(int)", "summary", "df-generated"]
+      - ["javax.crypto", "Cipher", "init", "(int,Certificate)", "summary", "df-generated"]
+      - ["javax.crypto", "CipherSpi", "engineSetMode", "(String)", "summary", "df-generated"]
+      - ["javax.crypto", "CipherSpi", "engineSetPadding", "(String)", "summary", "df-generated"]
+      - ["javax.crypto", "EncryptedPrivateKeyInfo", "getAlgName", "()", "summary", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", "genExemptionBlob", "()", "summary", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", "genExemptionBlob", "(byte[])", "summary", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", "genExemptionBlob", "(byte[],int)", "summary", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", "getOutputSize", "(int)", "summary", "df-generated"]
+      - ["javax.crypto", "ExemptionMechanism", "isCryptoAllowed", "(Key)", "summary", "df-generated"]
+      - ["javax.crypto", "KeyGenerator", "init", "(int)", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "getMacLength", "()", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "reset", "()", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "update", "(ByteBuffer)", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "update", "(byte)", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "update", "(byte[])", "summary", "df-generated"]
+      - ["javax.crypto", "Mac", "update", "(byte[],int,int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.crypto.spec.model.yml b/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
new file mode 100644
index 00000000000..d8eab143d30
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
@@ -0,0 +1,78 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.crypto.spec", "ChaCha20ParameterSpec", False, "ChaCha20ParameterSpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "ChaCha20ParameterSpec", False, "getNonce", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", True, "DESKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", True, "DESKeySpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "DESedeKeySpec", True, "DESedeKeySpec", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "DESedeKeySpec", True, "DESedeKeySpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "DESedeKeySpec", True, "getKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "GCMParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "IvParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "OAEPParameterSpec", "(String,String,AlgorithmParameterSpec,PSource)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getDigestAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getMGFAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getMGFParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "OAEPParameterSpec", True, "getPSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "PBEKeySpec", "(char[],byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", True, "getSalt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "PBEParameterSpec", "(byte[],int,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "getParameterSpec", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", True, "getSalt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PSource$PSpecified", False, "PSpecified", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PSource$PSpecified", False, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "PSource", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "RC2ParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "RC5ParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],int,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],int,int,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.crypto.spec", "ChaCha20ParameterSpec", "getCounter", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", "isParityAdjusted", "(byte[],int)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DESKeySpec", "isWeak", "(byte[],int)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DESedeKeySpec", "isParityAdjusted", "(byte[],int)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHGenParameterSpec", "DHGenParameterSpec", "(int,int)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHGenParameterSpec", "getExponentSize", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHGenParameterSpec", "getPrimeSize", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHParameterSpec", "DHParameterSpec", "(BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHParameterSpec", "DHParameterSpec", "(BigInteger,BigInteger,int)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHParameterSpec", "getG", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHParameterSpec", "getL", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHParameterSpec", "getP", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPrivateKeySpec", "DHPrivateKeySpec", "(BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPrivateKeySpec", "getG", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPrivateKeySpec", "getP", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPrivateKeySpec", "getX", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPublicKeySpec", "DHPublicKeySpec", "(BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPublicKeySpec", "getG", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPublicKeySpec", "getP", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "DHPublicKeySpec", "getY", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "GCMParameterSpec", "getTLen", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", "clearPassword", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", "getIterationCount", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "PBEKeySpec", "getKeyLength", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "PBEParameterSpec", "getIterationCount", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "RC2ParameterSpec", "getEffectiveKeyBits", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "RC5ParameterSpec", "getRounds", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "RC5ParameterSpec", "getVersion", "()", "summary", "df-generated"]
+      - ["javax.crypto.spec", "RC5ParameterSpec", "getWordSize", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml b/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml
new file mode 100644
index 00000000000..961bbceb1bd
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.imageio.metadata.model.yml
@@ -0,0 +1,65 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Throwable,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Throwable,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "IIOInvalidTreeException", "(String,Throwable,Node)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOInvalidTreeException", True, "getOffendingNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "getController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "getDefaultController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "getExtraMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "getMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "getNativeMetadataFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "setController", "(IIOMetadataController)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", True, "setFromTree", "(String,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getAttributeDescription", "(String,String,Locale)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getAttributeDescription", "(String,String,Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getAttributeNames", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getChildNames", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getElementDescription", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getElementDescription", "(String,Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", True, "getRootName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", True, "IIOMetadataFormatImpl", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", True, "IIOMetadataFormatImpl", "(String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "IIOMetadataNode", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "getUserObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataNode", True, "setUserObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.imageio.metadata", "IIOMetadata", "activateController", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", "getAsTree", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", "getMetadataFormat", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", "hasController", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", "isReadOnly", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", "isStandardMetadataFormatSupported", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", "mergeTree", "(String,Node)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadata", "reset", "()", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "canNodeAppear", "(String,ImageTypeSpecifier)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeDataType", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeDefaultValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeEnumerations", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeListMaxLength", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeListMinLength", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeMaxValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeMinValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getAttributeValueType", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getChildPolicy", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getElementMaxChildren", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getElementMinChildren", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectArrayMaxLength", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectArrayMinLength", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectClass", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectDefaultValue", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectEnumerations", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectMaxValue", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectMinValue", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "getObjectValueType", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormat", "isAttributeRequired", "(String,String)", "summary", "df-generated"]
+      - ["javax.imageio.metadata", "IIOMetadataFormatImpl", "getStandardFormatInstance", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.model.yml b/java/ql/lib/ext/generated/javax.imageio.model.yml
new file mode 100644
index 00000000000..a1be538932d
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.imageio.model.yml
@@ -0,0 +1,251 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.imageio", "IIOException", True, "IIOException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOException", True, "IIOException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOException", True, "IIOException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(Raster,List,IIOMetadata)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "IIOImage", "(RenderedImage,List,IIOMetadata)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "getMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "getRaster", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "getRenderedImage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "getThumbnail", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "getThumbnails", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "setMetadata", "(IIOMetadata)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "setRaster", "(Raster)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "setRenderedImage", "(RenderedImage)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOImage", True, "setThumbnails", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "getController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "getDefaultController", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "getDestinationOffset", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "getDestinationType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "getSourceRegion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "setController", "(IIOParamController)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "setDestinationOffset", "(Point)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "setDestinationType", "(ImageTypeSpecifier)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "IIOParam", True, "setSourceRegion", "(Rectangle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageIO", False, "createImageInputStream", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageIO", False, "createImageOutputStream", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "getDestination", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "getSourceRenderSize", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "setDestination", "(BufferedImage)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", True, "setSourceRenderSize", "(Dimension)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "addIIOReadProgressListener", "(IIOReadProgressListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "addIIOReadUpdateListener", "(IIOReadUpdateListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "addIIOReadWarningListener", "(IIOReadWarningListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getAvailableLocales", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getImageMetadata", "(int,String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getInput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getOriginatingProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getRawImageType", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "getStreamMetadata", "(String,Set)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "read", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAll", "(Iterator)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAll", "(int,ImageReadParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAll", "(int,ImageReadParam)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAll", "(int,ImageReadParam)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAsRenderedImage", "(int,ImageReadParam)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAsRenderedImage", "(int,ImageReadParam)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readAsRenderedImage", "(int,ImageReadParam)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readTile", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "readTileRaster", "(int,int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "setInput", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "setInput", "(Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "setInput", "(Object,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageReader", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(ColorModel,SampleModel)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(ColorModel,SampleModel)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "ImageTypeSpecifier", "(RenderedImage)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createBanded", "(ColorSpace,int[],int[],int,boolean,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createBufferedImage", "(int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createFromRenderedImage", "(RenderedImage)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createIndexed", "(byte[],byte[],byte[],byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createIndexed", "(byte[],byte[],byte[],byte[],int,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createIndexed", "(byte[],byte[],byte[],byte[],int,int)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createIndexed", "(byte[],byte[],byte[],byte[],int,int)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createInterleaved", "(ColorSpace,int[],int,boolean,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "createPacked", "(ColorSpace,int,int,int,int,int,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "getColorModel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", True, "getSampleModel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "ImageWriteParam", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getCompressionQualityDescriptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getCompressionType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getCompressionTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "getLocalizedCompressionTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", True, "setCompressionType", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "addIIOWriteProgressListener", "(IIOWriteProgressListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "addIIOWriteWarningListener", "(IIOWriteWarningListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getAvailableLocales", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getDefaultWriteParam", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getOriginatingProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "getOutput", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio", "ImageWriter", True, "setOutput", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.imageio", "IIOImage", "getNumThumbnails", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOImage", "hasRaster", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "activateController", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "getSourceBands", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "getSourceXSubsampling", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "getSourceYSubsampling", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "getSubsamplingXOffset", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "getSubsamplingYOffset", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "hasController", "()", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "setSourceBands", "(int[])", "summary", "df-generated"]
+      - ["javax.imageio", "IIOParam", "setSourceSubsampling", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getCacheDirectory", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageReader", "(ImageWriter)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageReaders", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageReadersByFormatName", "(String)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageReadersByMIMEType", "(String)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageReadersBySuffix", "(String)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageTranscoders", "(ImageReader,ImageWriter)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageWriter", "(ImageReader)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageWriters", "(ImageTypeSpecifier,String)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageWritersByFormatName", "(String)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageWritersByMIMEType", "(String)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getImageWritersBySuffix", "(String)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getReaderFileSuffixes", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getReaderFormatNames", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getReaderMIMETypes", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getUseCache", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getWriterFileSuffixes", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getWriterFormatNames", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "getWriterMIMETypes", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "read", "(File)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "read", "(ImageInputStream)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "read", "(InputStream)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "read", "(URL)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "scanForPlugins", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "setCacheDirectory", "(File)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "setUseCache", "(boolean)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "write", "(RenderedImage,String,File)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "write", "(RenderedImage,String,ImageOutputStream)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageIO", "write", "(RenderedImage,String,OutputStream)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", "canSetSourceRenderSize", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", "getDestinationBands", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", "getSourceMaxProgressivePass", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", "getSourceMinProgressivePass", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", "getSourceNumProgressivePasses", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", "setDestinationBands", "(int[])", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReadParam", "setSourceProgressivePasses", "(int,int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "abort", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "canReadRaster", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "dispose", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getAspectRatio", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getDefaultReadParam", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getHeight", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getImageMetadata", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getImageTypes", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getMinIndex", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getNumImages", "(boolean)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getNumThumbnails", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getStreamMetadata", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getThumbnailHeight", "(int,int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getThumbnailWidth", "(int,int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getTileGridXOffset", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getTileGridYOffset", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getTileHeight", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getTileWidth", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "getWidth", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "hasThumbnails", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "isIgnoringMetadata", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "isImageTiled", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "isRandomAccessEasy", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "isSeekForwardOnly", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "read", "(int,ImageReadParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "readRaster", "(int,ImageReadParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "readThumbnail", "(int,int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "readerSupportsThumbnails", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "removeAllIIOReadProgressListeners", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "removeAllIIOReadUpdateListeners", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "removeAllIIOReadWarningListeners", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "removeIIOReadProgressListener", "(IIOReadProgressListener)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "removeIIOReadUpdateListener", "(IIOReadUpdateListener)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "removeIIOReadWarningListener", "(IIOReadWarningListener)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageReader", "reset", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTranscoder", "convertImageMetadata", "(IIOMetadata,ImageTypeSpecifier,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTranscoder", "convertStreamMetadata", "(IIOMetadata,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "createFromBufferedImageType", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "createGrayscale", "(int,int,boolean)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "createGrayscale", "(int,int,boolean,boolean)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "getBitsPerBand", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "getBufferedImageType", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "getNumBands", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "getNumComponents", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageTypeSpecifier", "getSampleModel", "(int,int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "canOffsetTiles", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "canWriteCompressed", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "canWriteProgressive", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "canWriteTiles", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getBitRate", "(float)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getCompressionMode", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getCompressionQuality", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getCompressionQualityValues", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getPreferredTileSizes", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getProgressiveMode", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getTileGridXOffset", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getTileGridYOffset", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getTileHeight", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getTileWidth", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "getTilingMode", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "isCompressionLossless", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "setCompressionMode", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "setCompressionQuality", "(float)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "setProgressiveMode", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "setTiling", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "setTilingMode", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "unsetCompression", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriteParam", "unsetTiling", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "abort", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canInsertEmpty", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canInsertImage", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canRemoveImage", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canReplaceImageMetadata", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canReplacePixels", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canReplaceStreamMetadata", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canWriteEmpty", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canWriteRasters", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "canWriteSequence", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "dispose", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "endInsertEmpty", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "endReplacePixels", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "endWriteEmpty", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "endWriteSequence", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "getDefaultImageMetadata", "(ImageTypeSpecifier,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "getDefaultStreamMetadata", "(ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "getNumThumbnailsSupported", "(ImageTypeSpecifier,ImageWriteParam,IIOMetadata,IIOMetadata)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "getPreferredThumbnailSizes", "(ImageTypeSpecifier,ImageWriteParam,IIOMetadata,IIOMetadata)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "prepareInsertEmpty", "(int,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "prepareReplacePixels", "(int,Rectangle)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "prepareWriteEmpty", "(IIOMetadata,ImageTypeSpecifier,int,int,IIOMetadata,List,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "prepareWriteSequence", "(IIOMetadata)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "removeAllIIOWriteProgressListeners", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "removeAllIIOWriteWarningListeners", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "removeIIOWriteProgressListener", "(IIOWriteProgressListener)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "removeIIOWriteWarningListener", "(IIOWriteWarningListener)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "removeImage", "(int)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "replaceImageMetadata", "(int,IIOMetadata)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "replacePixels", "(Raster,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "replacePixels", "(RenderedImage,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "replaceStreamMetadata", "(IIOMetadata)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "reset", "()", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "write", "(IIOImage)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "write", "(IIOMetadata,IIOImage,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "write", "(RenderedImage)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "writeInsert", "(int,IIOImage,ImageWriteParam)", "summary", "df-generated"]
+      - ["javax.imageio", "ImageWriter", "writeToSequence", "(IIOImage,ImageWriteParam)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.bmp.model.yml b/java/ql/lib/ext/generated/javax.imageio.plugins.bmp.model.yml
new file mode 100644
index 00000000000..607766feec1
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.imageio.plugins.bmp.model.yml
@@ -0,0 +1,13 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.imageio.plugins.bmp", "BMPImageWriteParam", True, "BMPImageWriteParam", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.imageio.plugins.bmp", "BMPImageWriteParam", "isTopDown", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.bmp", "BMPImageWriteParam", "setTopDown", "(boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml b/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml
new file mode 100644
index 00000000000..00938e459a3
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.imageio.plugins.jpeg.model.yml
@@ -0,0 +1,35 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getACHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getDCHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "getQTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", True, "setDecodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "JPEGImageWriteParam", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getACHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getDCHuffmanTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "getQTables", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", True, "setEncodeTables", "(JPEGQTable[],JPEGHuffmanTable[],JPEGHuffmanTable[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.imageio.plugins.jpeg", "JPEGHuffmanTable", "JPEGHuffmanTable", "(short[],short[])", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGHuffmanTable", "getLengths", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGHuffmanTable", "getValues", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", "areTablesSet", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageReadParam", "unsetDecodeTables", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "areTablesSet", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "getOptimizeHuffmanTables", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "setOptimizeHuffmanTables", "(boolean)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGImageWriteParam", "unsetEncodeTables", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGQTable", "JPEGQTable", "(int[])", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGQTable", "getScaledInstance", "(float,boolean)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.jpeg", "JPEGQTable", "getTable", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml b/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml
new file mode 100644
index 00000000000..56152d0710e
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.imageio.plugins.tiff.model.yml
@@ -0,0 +1,94 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "TIFFDirectory", "(TIFFTagSet[],TIFFTag)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "TIFFDirectory", "(TIFFTagSet[],TIFFTag)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "addTIFFField", "(TIFFField)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "addTagSet", "(TIFFTagSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "createFromMetadata", "(IIOMetadata)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getAsMetadata", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getParentTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFField", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTIFFFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTag", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", True, "getTagSets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,int,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,long,TIFFDirectory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,int,long,TIFFDirectory)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "TIFFField", "(TIFFTag,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "createFromMetadataNode", "(TIFFTagSet,Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsChars", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsNativeNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getAsString", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getDirectory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", False, "getValueAsString", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", False, "addAllowedTagSet", "(TIFFTagSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", False, "getAllowedTagSets", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,TIFFTagSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,TIFFTagSet)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "TIFFTag", "(String,int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getTagSet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", True, "getValueName", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "TIFFTagSet", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTag", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTag", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", True, "getTagNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.imageio.plugins.tiff", "BaselineTIFFTagSet", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "ExifGPSTagSet", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "ExifInteroperabilityTagSet", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "ExifParentTIFFTagSet", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "ExifTIFFTagSet", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "FaxTIFFTagSet", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "GeoTIFFTagSet", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", "containsTIFFField", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", "getNumTIFFFields", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", "removeTIFFField", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", "removeTIFFFields", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFDirectory", "removeTagSet", "(TIFFTagSet)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "createArrayForType", "(int,int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsDouble", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsDoubles", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsFloat", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsFloats", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsInt", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsInts", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsLong", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsLongs", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsRational", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsRationals", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsSRational", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsSRationals", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getAsShorts", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getCount", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getTagNumber", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getType", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getTypeByName", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "getTypeName", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "hasDirectory", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFField", "isIntegral", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", "getReadUnknownTags", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", "removeAllowedTagSet", "(TIFFTagSet)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFImageReadParam", "setReadUnknownTags", "(boolean)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "getCount", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "getDataTypes", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "getNamedValues", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "getNumber", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "getSizeOfType", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "hasValueNames", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "isDataTypeOK", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTag", "isIFDPointer", "()", "summary", "df-generated"]
+      - ["javax.imageio.plugins.tiff", "TIFFTagSet", "getTagNumbers", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.spi.model.yml b/java/ql/lib/ext/generated/javax.imageio.spi.model.yml
new file mode 100644
index 00000000000..1550958d1fa
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.imageio.spi.model.yml
@@ -0,0 +1,129 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "IIOServiceProvider", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "IIOServiceProvider", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "getVendorName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", True, "ImageInputStreamSpi", "(String,String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", True, "ImageInputStreamSpi", "(String,String,Class)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", True, "createInputStreamInstance", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", True, "ImageOutputStreamSpi", "(String,String,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", True, "ImageOutputStreamSpi", "(String,String,Class)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", True, "createOutputStreamInstance", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[10]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[11].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[12].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[14]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[15]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[16].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[17].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[6].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "ImageReaderSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "createReaderInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "getImageWriterSpiNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", True, "getInputTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[10].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[12]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[13]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[14].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[15].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "ImageReaderWriterSpi", "(String,String,String[],String[],String[],String,boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[9].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getExtraImageMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getExtraStreamMetadataFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getFileSuffixes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getFormatNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getMIMETypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getNativeImageMetadataFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getNativeStreamMetadataFormatName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", True, "getPluginClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageTranscoderSpi", True, "ImageTranscoderSpi", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageTranscoderSpi", True, "ImageTranscoderSpi", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[10]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[11].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[12].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[14]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[15]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[16].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[17].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[6].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[7].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "ImageWriterSpi", "(String,String,String[],String[],String[],String,Class[],String[],boolean,String,String,String[],String[],boolean,String,String,String[],String[])", "", "Argument[9]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "createWriterInstance", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "getImageReaderSpiNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", True, "getOutputTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", True, "getCategories", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", True, "getServiceProviderByClass", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", True, "getServiceProviders", "(Class,ServiceRegistry$Filter,boolean)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", True, "getServiceProviders", "(Class,ServiceRegistry$Filter,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", True, "getServiceProviders", "(Class,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", True, "lookupProviders", "(Class,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.imageio.spi", "IIORegistry", "getDefaultInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "IIORegistry", "registerApplicationClasspathSpis", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "IIOServiceProvider", "getDescription", "(Locale)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", "canUseCacheFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", "createInputStreamInstance", "(Object,boolean,File)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", "getInputClass", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageInputStreamSpi", "needsCacheFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", "canUseCacheFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", "createOutputStreamInstance", "(Object,boolean,File)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", "getOutputClass", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageOutputStreamSpi", "needsCacheFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", "canDecodeInput", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", "createReaderInstance", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderSpi", "isOwnReader", "(ImageReader)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", "getImageMetadataFormat", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", "getStreamMetadataFormat", "(String)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", "isStandardImageMetadataFormatSupported", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageReaderWriterSpi", "isStandardStreamMetadataFormatSupported", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageTranscoderSpi", "createTranscoderInstance", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageTranscoderSpi", "getReaderServiceProviderName", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageTranscoderSpi", "getWriterServiceProviderName", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", "canEncodeImage", "(ImageTypeSpecifier)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", "canEncodeImage", "(RenderedImage)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", "createWriterInstance", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", "isFormatLossless", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ImageWriterSpi", "isOwnWriter", "(ImageWriter)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "RegisterableService", "onDeregistration", "(ServiceRegistry,Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "RegisterableService", "onRegistration", "(ServiceRegistry,Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry$Filter", "filter", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "ServiceRegistry", "(Iterator)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "contains", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "deregisterAll", "()", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "deregisterAll", "(Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "deregisterServiceProvider", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "deregisterServiceProvider", "(Object,Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "lookupProviders", "(Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "registerServiceProvider", "(Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "registerServiceProvider", "(Object,Class)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "registerServiceProviders", "(Iterator)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "setOrdering", "(Class,Object,Object)", "summary", "df-generated"]
+      - ["javax.imageio.spi", "ServiceRegistry", "unsetOrdering", "(Class,Object,Object)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.imageio.stream.model.yml b/java/ql/lib/ext/generated/javax.imageio.stream.model.yml
new file mode 100644
index 00000000000..f9dc67c2a67
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.imageio.stream.model.yml
@@ -0,0 +1,62 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", True, "FileCacheImageOutputStream", "(OutputStream,File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "FileCacheImageOutputStream", True, "FileCacheImageOutputStream", "(OutputStream,File)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "FileImageInputStream", True, "FileImageInputStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "FileImageInputStream", True, "FileImageInputStream", "(RandomAccessFile)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "FileImageOutputStream", True, "FileImageOutputStream", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "FileImageOutputStream", True, "FileImageOutputStream", "(RandomAccessFile)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", True, "IIOByteBuffer", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", True, "setData", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", True, "getByteOrder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", True, "read", "(byte[])", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", True, "read", "(byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", True, "readBytes", "(IIOByteBuffer,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", True, "setByteOrder", "(ByteOrder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageInputStream", True, "MemoryCacheImageInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.imageio.stream", "MemoryCacheImageOutputStream", True, "MemoryCacheImageOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.imageio.stream", "IIOByteBuffer", "getLength", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", "getOffset", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", "setLength", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "IIOByteBuffer", "setOffset", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "flush", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "flushBefore", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "getBitOffset", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "getFlushedPosition", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "getStreamPosition", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "isCached", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "isCachedFile", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "isCachedMemory", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "length", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "mark", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "read", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readBit", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readBits", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(char[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(double[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(float[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(int[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(long[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readFully", "(short[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "readUnsignedInt", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "reset", "()", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "seek", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "setBitOffset", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageInputStream", "skipBytes", "(long)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeBit", "(int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeBits", "(long,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeChars", "(char[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeDoubles", "(double[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeFloats", "(float[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeInts", "(int[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeLongs", "(long[],int,int)", "summary", "df-generated"]
+      - ["javax.imageio.stream", "ImageOutputStream", "writeShorts", "(short[],int,int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.lang.model.element.model.yml b/java/ql/lib/ext/generated/javax.lang.model.element.model.yml
new file mode 100644
index 00000000000..642f6c6315c
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.lang.model.element.model.yml
@@ -0,0 +1,38 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.lang.model.element", "AnnotationValueVisitor", True, "visit", "(AnnotationValue)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "AnnotationValueVisitor", True, "visit", "(AnnotationValue)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ElementVisitor", True, "visit", "(Element)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ElementVisitor", True, "visit", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "ElementVisitor", True, "visit", "(Element)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "UnknownAnnotationValueException", "(AnnotationValue,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "UnknownAnnotationValueException", "(AnnotationValue,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownAnnotationValueException", True, "getUnknownAnnotationValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "UnknownDirectiveException", "(ModuleElement$Directive,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "UnknownDirectiveException", "(ModuleElement$Directive,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownDirectiveException", True, "getUnknownDirective", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "UnknownElementException", "(Element,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "UnknownElementException", "(Element,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.element", "UnknownElementException", True, "getUnknownElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.lang.model.element", "ElementKind", "isClass", "()", "summary", "df-generated"]
+      - ["javax.lang.model.element", "ElementKind", "isField", "()", "summary", "df-generated"]
+      - ["javax.lang.model.element", "ElementKind", "isInterface", "()", "summary", "df-generated"]
+      - ["javax.lang.model.element", "ElementVisitor", "visitModule", "(ModuleElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.element", "ElementVisitor", "visitRecordComponent", "(RecordComponentElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$DirectiveVisitor", "visit", "(ModuleElement$Directive)", "summary", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$DirectiveVisitor", "visit", "(ModuleElement$Directive,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.element", "ModuleElement$DirectiveVisitor", "visitUnknown", "(ModuleElement$Directive,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.element", "NestingKind", "isNested", "()", "summary", "df-generated"]
+      - ["javax.lang.model.element", "TypeElement", "getPermittedSubclasses", "()", "summary", "df-generated"]
+      - ["javax.lang.model.element", "TypeElement", "getRecordComponents", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.lang.model.model.yml b/java/ql/lib/ext/generated/javax.lang.model.model.yml
new file mode 100644
index 00000000000..45b57d256bd
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.lang.model.model.yml
@@ -0,0 +1,13 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.lang.model", "SourceVersion", "isIdentifier", "(CharSequence)", "summary", "df-generated"]
+      - ["javax.lang.model", "SourceVersion", "isKeyword", "(CharSequence)", "summary", "df-generated"]
+      - ["javax.lang.model", "SourceVersion", "isKeyword", "(CharSequence,SourceVersion)", "summary", "df-generated"]
+      - ["javax.lang.model", "SourceVersion", "isName", "(CharSequence)", "summary", "df-generated"]
+      - ["javax.lang.model", "SourceVersion", "isName", "(CharSequence,SourceVersion)", "summary", "df-generated"]
+      - ["javax.lang.model", "SourceVersion", "latest", "()", "summary", "df-generated"]
+      - ["javax.lang.model", "SourceVersion", "latestSupported", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.lang.model.type.model.yml b/java/ql/lib/ext/generated/javax.lang.model.type.model.yml
new file mode 100644
index 00000000000..0e9eca5bac8
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.lang.model.type.model.yml
@@ -0,0 +1,20 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.lang.model.type", "MirroredTypeException", True, "MirroredTypeException", "(TypeMirror)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.type", "MirroredTypeException", True, "getTypeMirror", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "MirroredTypesException", True, "MirroredTypesException", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.type", "MirroredTypesException", True, "getTypeMirrors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "TypeVisitor", True, "visit", "(TypeMirror)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "UnknownTypeException", "(TypeMirror,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "UnknownTypeException", "(TypeMirror,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "getArgument", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.type", "UnknownTypeException", True, "getUnknownType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.lang.model.type", "TypeKind", "isPrimitive", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.lang.model.util.model.yml b/java/ql/lib/ext/generated/javax.lang.model.util.model.yml
new file mode 100644
index 00000000000..e57b66161c4
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.lang.model.util.model.yml
@@ -0,0 +1,93 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.lang.model.util", "ElementFilter", True, "constructorsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "constructorsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "exportsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "fieldsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "fieldsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "methodsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "methodsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "modulesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "modulesIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "opensIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "packagesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "packagesIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "providesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "recordComponentsIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "recordComponentsIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "requiresIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "typesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "typesIn", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementFilter", True, "usesIn", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsConstructor", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsInstanceInit", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsMethod", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitExecutableAsStaticInit", "(ExecutableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsAnnotationType", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsClass", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsEnum", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitTypeAsInterface", "(TypeElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsEnumConstant", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsExceptionParameter", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsField", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsLocalVariable", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", True, "visitVariableAsParameter", "(VariableElement,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Element,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "ElementScanner6", True, "scan", "(Iterable,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getAllPackageElements", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "getAllTypeElements", "(CharSequence)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "Elements", True, "recordComponentFor", "(ExecutableElement)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsNone", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsNone", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsPackage", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsPackage", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsVoid", "(NoType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitNoTypeAsVoid", "(NoType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsBoolean", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsBoolean", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsByte", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsByte", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsChar", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsChar", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsDouble", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsDouble", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsFloat", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsFloat", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsInt", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsInt", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsLong", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsLong", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsShort", "(PrimitiveType,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", True, "visitPrimitiveAsShort", "(PrimitiveType,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.lang.model.util", "ElementKindVisitor6", "visitTypeAsRecord", "(TypeElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", "visitVariableAsBindingVariable", "(VariableElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "ElementKindVisitor6", "visitVariableAsResourceVariable", "(VariableElement,Object)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements$Origin", "isDeclared", "()", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getAllModuleElements", "()", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getModuleElement", "(CharSequence)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getModuleOf", "(Element)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getOrigin", "(AnnotatedConstruct,AnnotationMirror)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getOrigin", "(Element)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getOrigin", "(ModuleElement,ModuleElement$Directive)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getPackageElement", "(ModuleElement,CharSequence)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "getTypeElement", "(ModuleElement,CharSequence)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "isAutomaticModule", "(ModuleElement)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "Elements", "isBridge", "(ExecutableElement)", "summary", "df-generated"]
+      - ["javax.lang.model.util", "TypeKindVisitor6", "visitNoTypeAsModule", "(NoType,Object)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.loading.model.yml b/java/ql/lib/ext/generated/javax.management.loading.model.yml
new file mode 100644
index 00000000000..ada13786d72
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.loading.model.yml
@@ -0,0 +1,44 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader,URLStreamHandlerFactory,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLet", True, "MLet", "(URL[],ClassLoader,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLet", True, "loadClass", "(String,ClassLoaderRepository)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLet", True, "loadClass", "(String,ClassLoaderRepository)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "MLetContent", "(URL,Map,List,List)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getCode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getCodeBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getDocumentBase", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getJarFiles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getParameterTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getParameterValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getSerializedObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetContent", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetMBean", True, "getLibraryDirectory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetMBean", True, "getMBeansFromURL", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetMBean", True, "getMBeansFromURL", "(URL)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetMBean", True, "getURLs", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.loading", "MLetMBean", True, "setLibraryDirectory", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "PrivateMLet", True, "PrivateMLet", "(URL[],ClassLoader,URLStreamHandlerFactory,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.loading", "PrivateMLet", True, "PrivateMLet", "(URL[],ClassLoader,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.loading", "DefaultLoaderRepository", "loadClass", "(String)", "summary", "df-generated"]
+      - ["javax.management.loading", "DefaultLoaderRepository", "loadClassWithout", "(ClassLoader,String)", "summary", "df-generated"]
+      - ["javax.management.loading", "MLet", "MLet", "(URL[])", "summary", "df-generated"]
+      - ["javax.management.loading", "MLet", "MLet", "(URL[],boolean)", "summary", "df-generated"]
+      - ["javax.management.loading", "MLetMBean", "addURL", "(String)", "summary", "df-generated"]
+      - ["javax.management.loading", "MLetMBean", "addURL", "(URL)", "summary", "df-generated"]
+      - ["javax.management.loading", "PrivateMLet", "PrivateMLet", "(URL[],boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.model.yml b/java/ql/lib/ext/generated/javax.management.model.yml
new file mode 100644
index 00000000000..fbde549df2e
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.model.yml
@@ -0,0 +1,409 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management", "Attribute", True, "Attribute", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Attribute", True, "Attribute", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Attribute", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Attribute", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "AttributeChangeNotification", "(Object,long,long,String,String,String,Object,Object)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getAttributeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getAttributeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getNewValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotification", True, "getOldValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotificationFilter", True, "enableAttribute", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeChangeNotificationFilter", True, "getEnabledAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeList", True, "AttributeList", "(AttributeList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeList", True, "AttributeList", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeList", True, "add", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeList", True, "add", "(int,Attribute)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeList", True, "addAll", "(AttributeList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "AttributeList", True, "set", "(int,Attribute)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeNotFoundException", True, "AttributeNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeValueExp", True, "AttributeValueExp", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "AttributeValueExp", True, "getAttributeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "BadAttributeValueExpException", True, "BadAttributeValueExpException", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "BadBinaryOpValueExpException", True, "BadBinaryOpValueExpException", "(ValueExp)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "BadBinaryOpValueExpException", True, "getExp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "BadStringOperationException", True, "BadStringOperationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "getFieldNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "getFieldValue", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "getFieldValues", "(String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "getFields", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "setField", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "setField", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "setFields", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Descriptor", True, "setFields", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "DescriptorAccess", True, "setDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "DescriptorAccess", True, "setDescriptor", "(Descriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management", "DescriptorRead", True, "getDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "DynamicMBean", True, "getAttributes", "(String[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "DynamicMBean", True, "getMBeanInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "DynamicMBean", True, "setAttributes", "(AttributeList)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "ImmutableDescriptor", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ImmutableDescriptor", True, "union", "(Descriptor[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "InstanceAlreadyExistsException", True, "InstanceAlreadyExistsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "InstanceNotFoundException", True, "InstanceNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "IntrospectionException", True, "IntrospectionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "InvalidApplicationException", True, "InvalidApplicationException", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "InvalidAttributeValueException", True, "InvalidAttributeValueException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "JMException", True, "JMException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "JMRuntimeException", True, "JMRuntimeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ListenerNotFoundException", True, "ListenerNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "MBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,Constructor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "MBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanConstructorInfo", True, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanException", True, "MBeanException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "MBeanFeatureInfo", "(String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanFeatureInfo", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "MBeanInfo", "(String,String,MBeanAttributeInfo[],MBeanConstructorInfo[],MBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "getConstructors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "getNotifications", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanInfo", True, "getOperations", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "MBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanNotificationInfo", True, "getNotifTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "MBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "getReturnType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", True, "getSignature", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "MBeanParameterInfo", "(String,String,String,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanParameterInfo", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanPermission", True, "MBeanPermission", "(String,String,ObjectName,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistration", True, "preRegister", "(MBeanServer,ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistrationException", True, "MBeanRegistrationException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistrationException", True, "MBeanRegistrationException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanRegistrationException", True, "MBeanRegistrationException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerBuilder", True, "newMBeanServer", "(String,MBeanServer,MBeanServerDelegate)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerBuilder", True, "newMBeanServer", "(String,MBeanServer,MBeanServerDelegate)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerBuilder", True, "newMBeanServer", "(String,MBeanServer,MBeanServerDelegate)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,ObjectName,Object[],String[])", "", "Argument[4].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,Object[],String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,Object[],String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "createMBean", "(String,ObjectName,Object[],String[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getAttribute", "(ObjectName,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getAttribute", "(ObjectName,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getAttributes", "(ObjectName,String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getAttributes", "(ObjectName,String[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "getObjectInstance", "(ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "invoke", "(ObjectName,String,Object[],String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "invoke", "(ObjectName,String,Object[],String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "invoke", "(ObjectName,String,Object[],String[])", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", True, "setAttributes", "(ObjectName,AttributeList)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerDelegateMBean", True, "getMBeanServerId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", True, "createMBeanServer", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", True, "getClassLoaderRepository", "(MBeanServer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", True, "newMBeanServer", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "MBeanServerInvocationHandler", "(MBeanServerConnection,ObjectName,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "getMBeanServerConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", True, "getObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerNotification", True, "MBeanServerNotification", "(String,Object,long,ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerNotification", True, "MBeanServerNotification", "(String,Object,long,ObjectName)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerNotification", True, "MBeanServerNotification", "(String,Object,long,ObjectName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanServerNotification", True, "getMBeanName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "MBeanTrustPermission", True, "MBeanTrustPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MBeanTrustPermission", True, "MBeanTrustPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "MalformedObjectNameException", True, "MalformedObjectNameException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "NotCompliantMBeanException", True, "NotCompliantMBeanException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "Notification", "(String,Object,long,long,String)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "getUserData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "setSource", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Notification", True, "setUserData", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "NotificationBroadcaster", True, "getNotificationInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(Executor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(Executor,MBeanNotificationInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(Executor,MBeanNotificationInfo[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", True, "NotificationBroadcasterSupport", "(MBeanNotificationInfo[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "NotificationFilterSupport", True, "enableType", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "NotificationFilterSupport", True, "getEnabledTypes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "NotificationListener", True, "handleNotification", "(Notification,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(ObjectName,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(ObjectName,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectInstance", True, "ObjectInstance", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectInstance", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectInstance", True, "getObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,Hashtable)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "ObjectName", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getCanonicalKeyPropertyListString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getCanonicalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getDomain", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(ObjectName)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,Hashtable)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getInstance", "(String,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getKeyProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getKeyPropertyList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ObjectName", True, "getKeyPropertyListString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "OperationsException", True, "OperationsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "and", "(QueryExp,QueryExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "and", "(QueryExp,QueryExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "anySubString", "(AttributeValueExp,StringValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "anySubString", "(AttributeValueExp,StringValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "attr", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "attr", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "attr", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "between", "(ValueExp,ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "between", "(ValueExp,ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "between", "(ValueExp,ValueExp,ValueExp)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "div", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "div", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "eq", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "eq", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "finalSubString", "(AttributeValueExp,StringValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "finalSubString", "(AttributeValueExp,StringValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "geq", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "geq", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "gt", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "gt", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "in", "(ValueExp,ValueExp[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "in", "(ValueExp,ValueExp[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "initialSubString", "(AttributeValueExp,StringValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "initialSubString", "(AttributeValueExp,StringValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "isInstanceOf", "(StringValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "leq", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "leq", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "lt", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "lt", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "match", "(AttributeValueExp,StringValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "match", "(AttributeValueExp,StringValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "minus", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "minus", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "not", "(QueryExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "or", "(QueryExp,QueryExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "or", "(QueryExp,QueryExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "plus", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "plus", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "times", "(ValueExp,ValueExp)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "times", "(ValueExp,ValueExp)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "Query", True, "value", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ReflectionException", True, "ReflectionException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "ReflectionException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeErrorException", True, "RuntimeErrorException", "(Error,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeErrorException", True, "getTargetError", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeMBeanException", True, "RuntimeMBeanException", "(RuntimeException,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeMBeanException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeOperationsException", True, "RuntimeOperationsException", "(RuntimeException,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "RuntimeOperationsException", True, "getTargetException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ServiceNotFoundException", True, "ServiceNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,NotificationEmitter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,NotificationEmitter)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,boolean,NotificationEmitter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", True, "StandardEmitterMBean", "(Object,Class,boolean,NotificationEmitter)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StandardMBean", True, "StandardMBean", "(Object,Class)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StandardMBean", True, "StandardMBean", "(Object,Class,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StandardMBean", True, "getImplementation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "StandardMBean", True, "setImplementation", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StringValueExp", True, "StringValueExp", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management", "StringValueExp", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ValueExp", True, "apply", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management", "ValueExp", True, "apply", "(ObjectName)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management", "AttributeChangeNotificationFilter", "disableAllAttributes", "()", "summary", "df-generated"]
+      - ["javax.management", "AttributeChangeNotificationFilter", "disableAttribute", "(String)", "summary", "df-generated"]
+      - ["javax.management", "AttributeList", "AttributeList", "(int)", "summary", "df-generated"]
+      - ["javax.management", "AttributeList", "addAll", "(int,AttributeList)", "summary", "df-generated"]
+      - ["javax.management", "DefaultLoaderRepository", "loadClass", "(String)", "summary", "df-generated"]
+      - ["javax.management", "DefaultLoaderRepository", "loadClassWithout", "(ClassLoader,String)", "summary", "df-generated"]
+      - ["javax.management", "Descriptor", "isValid", "()", "summary", "df-generated"]
+      - ["javax.management", "Descriptor", "removeField", "(String)", "summary", "df-generated"]
+      - ["javax.management", "DynamicMBean", "getAttribute", "(String)", "summary", "df-generated"]
+      - ["javax.management", "DynamicMBean", "invoke", "(String,Object[],String[])", "summary", "df-generated"]
+      - ["javax.management", "DynamicMBean", "setAttribute", "(Attribute)", "summary", "df-generated"]
+      - ["javax.management", "JMX", "isMXBeanInterface", "(Class)", "summary", "df-generated"]
+      - ["javax.management", "JMX", "newMBeanProxy", "(MBeanServerConnection,ObjectName,Class)", "summary", "df-generated"]
+      - ["javax.management", "JMX", "newMBeanProxy", "(MBeanServerConnection,ObjectName,Class,boolean)", "summary", "df-generated"]
+      - ["javax.management", "JMX", "newMXBeanProxy", "(MBeanServerConnection,ObjectName,Class)", "summary", "df-generated"]
+      - ["javax.management", "JMX", "newMXBeanProxy", "(MBeanServerConnection,ObjectName,Class,boolean)", "summary", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", "isIs", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", "isReadable", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanAttributeInfo", "isWritable", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanOperationInfo", "getImpact", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanRegistration", "postDeregister", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanRegistration", "postRegister", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management", "MBeanRegistration", "preDeregister", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServer", "deserialize", "(ObjectName,byte[])", "summary", "df-generated"]
+      - ["javax.management", "MBeanServer", "deserialize", "(String,ObjectName,byte[])", "summary", "df-generated"]
+      - ["javax.management", "MBeanServer", "deserialize", "(String,byte[])", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerBuilder", "newMBeanServerDelegate", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "addNotificationListener", "(ObjectName,NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "addNotificationListener", "(ObjectName,ObjectName,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "getDefaultDomain", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "getDomains", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "getMBeanCount", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "getMBeanInfo", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "isInstanceOf", "(ObjectName,String)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "isRegistered", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "queryMBeans", "(ObjectName,QueryExp)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "queryNames", "(ObjectName,QueryExp)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,NotificationListener)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,ObjectName)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "removeNotificationListener", "(ObjectName,ObjectName,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "setAttribute", "(ObjectName,Attribute)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerConnection", "unregisterMBean", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegate", "sendNotification", "(Notification)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegateMBean", "getImplementationName", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegateMBean", "getImplementationVendor", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegateMBean", "getImplementationVersion", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegateMBean", "getSpecificationName", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegateMBean", "getSpecificationVendor", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerDelegateMBean", "getSpecificationVersion", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", "createMBeanServer", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", "findMBeanServer", "(String)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", "newMBeanServer", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerFactory", "releaseMBeanServer", "(MBeanServer)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", "isMXBean", "()", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerInvocationHandler", "newProxyInstance", "(MBeanServerConnection,ObjectName,Class,boolean)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerPermission", "MBeanServerPermission", "(String)", "summary", "df-generated"]
+      - ["javax.management", "MBeanServerPermission", "MBeanServerPermission", "(String,String)", "summary", "df-generated"]
+      - ["javax.management", "Notification", "getSequenceNumber", "()", "summary", "df-generated"]
+      - ["javax.management", "Notification", "getTimeStamp", "()", "summary", "df-generated"]
+      - ["javax.management", "Notification", "setSequenceNumber", "(long)", "summary", "df-generated"]
+      - ["javax.management", "Notification", "setTimeStamp", "(long)", "summary", "df-generated"]
+      - ["javax.management", "NotificationBroadcaster", "addNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "NotificationBroadcaster", "removeNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management", "NotificationBroadcasterSupport", "sendNotification", "(Notification)", "summary", "df-generated"]
+      - ["javax.management", "NotificationEmitter", "removeNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management", "NotificationFilter", "isNotificationEnabled", "(Notification)", "summary", "df-generated"]
+      - ["javax.management", "NotificationFilterSupport", "disableAllTypes", "()", "summary", "df-generated"]
+      - ["javax.management", "NotificationFilterSupport", "disableType", "(String)", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "isDomainPattern", "()", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "isPattern", "()", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "isPropertyListPattern", "()", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "isPropertyPattern", "()", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "isPropertyValuePattern", "()", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "isPropertyValuePattern", "(String)", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "quote", "(String)", "summary", "df-generated"]
+      - ["javax.management", "ObjectName", "unquote", "(String)", "summary", "df-generated"]
+      - ["javax.management", "PersistentMBean", "load", "()", "summary", "df-generated"]
+      - ["javax.management", "PersistentMBean", "store", "()", "summary", "df-generated"]
+      - ["javax.management", "Query", "classattr", "()", "summary", "df-generated"]
+      - ["javax.management", "Query", "value", "(Number)", "summary", "df-generated"]
+      - ["javax.management", "Query", "value", "(boolean)", "summary", "df-generated"]
+      - ["javax.management", "Query", "value", "(double)", "summary", "df-generated"]
+      - ["javax.management", "Query", "value", "(float)", "summary", "df-generated"]
+      - ["javax.management", "Query", "value", "(int)", "summary", "df-generated"]
+      - ["javax.management", "Query", "value", "(long)", "summary", "df-generated"]
+      - ["javax.management", "QueryEval", "getMBeanServer", "()", "summary", "df-generated"]
+      - ["javax.management", "QueryEval", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
+      - ["javax.management", "QueryExp", "apply", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management", "QueryExp", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
+      - ["javax.management", "StandardEmitterMBean", "sendNotification", "(Notification)", "summary", "df-generated"]
+      - ["javax.management", "StandardMBean", "getImplementationClass", "()", "summary", "df-generated"]
+      - ["javax.management", "StandardMBean", "getMBeanInterface", "()", "summary", "df-generated"]
+      - ["javax.management", "ValueExp", "setMBeanServer", "(MBeanServer)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml b/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml
new file mode 100644
index 00000000000..9bf6223b24a
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.modelmbean.model.yml
@@ -0,0 +1,113 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(DescriptorSupport)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[],Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "DescriptorSupport", "(String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "DescriptorSupport", True, "toXMLString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "InvalidTargetObjectTypeException", True, "InvalidTargetObjectTypeException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "InvalidTargetObjectTypeException", True, "InvalidTargetObjectTypeException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "InvalidTargetObjectTypeException", True, "InvalidTargetObjectTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBean", True, "setManagedResource", "(Object,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBean", True, "setModelMBeanInfo", "(ModelMBeanInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(ModelMBeanAttributeInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,Method,Method,Descriptor)", "", "Argument[this]", "Argument[4]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanAttributeInfo", True, "ModelMBeanAttributeInfo", "(String,String,String,boolean,boolean,boolean,Descriptor)", "", "Argument[this]", "Argument[6]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,Constructor,Descriptor)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanConstructorInfo", True, "ModelMBeanConstructorInfo", "(String,String,MBeanParameterInfo[],Descriptor)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getDescriptor", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getDescriptors", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getMBeanDescriptor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getNotification", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "getOperation", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setDescriptor", "(Descriptor,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setDescriptor", "(Descriptor,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setDescriptors", "(Descriptor[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setMBeanDescriptor", "(Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfo", True, "setMBeanDescriptor", "(Descriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(ModelMBeanInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[])", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "ModelMBeanInfoSupport", "(String,String,ModelMBeanAttributeInfo[],ModelMBeanConstructorInfo[],ModelMBeanOperationInfo[],ModelMBeanNotificationInfo[],Descriptor)", "", "Argument[this]", "Argument[6]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getConstructor", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanInfoSupport", True, "getDescriptor", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(ModelMBeanNotificationInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationInfo", True, "ModelMBeanNotificationInfo", "(String[],String,String,Descriptor)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(ModelMBeanOperationInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,Method,Descriptor)", "", "Argument[this]", "Argument[2]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanOperationInfo", True, "ModelMBeanOperationInfo", "(String,String,MBeanParameterInfo[],String,int,Descriptor)", "", "Argument[this]", "Argument[5]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "RequiredModelMBean", True, "RequiredModelMBean", "(ModelMBeanInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "XMLParseException", True, "XMLParseException", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "XMLParseException", True, "XMLParseException", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.modelmbean", "XMLParseException", True, "XMLParseException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.modelmbean", "DescriptorSupport", "DescriptorSupport", "(int)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "addAttributeChangeNotificationListener", "(NotificationListener,String,Object)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "removeAttributeChangeNotificationListener", "(NotificationListener,String)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendAttributeChangeNotification", "(Attribute,Attribute)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendAttributeChangeNotification", "(AttributeChangeNotification)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendNotification", "(Notification)", "summary", "df-generated"]
+      - ["javax.management.modelmbean", "ModelMBeanNotificationBroadcaster", "sendNotification", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.monitor.model.yml b/java/ql/lib/ext/generated/javax.management.monitor.model.yml
new file mode 100644
index 00000000000..fecd28f766d
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.monitor.model.yml
@@ -0,0 +1,68 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.monitor", "Monitor", True, "getDerivedGauge", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", True, "getObservedAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", True, "getObservedObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", True, "getObservedObjects", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", True, "setObservedAttribute", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorNotification", True, "getDerivedGauge", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorNotification", True, "getObservedAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorNotification", True, "getObservedObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorNotification", True, "getTrigger", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "MonitorSettingException", True, "MonitorSettingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", True, "getDerivedGauge", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", True, "getDerivedGauge", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", True, "getStringToCompare", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", True, "setStringToCompare", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.monitor", "CounterMonitorMBean", "getDerivedGauge", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getDifferenceMode", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getInitThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getModulus", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getNotify", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getOffset", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "getThreshold", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "setDifferenceMode", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "setInitThreshold", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "setModulus", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "setNotify", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "setOffset", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "CounterMonitorMBean", "setThreshold", "(Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getDerivedGauge", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getDifferenceMode", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getHighThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getLowThreshold", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getNotifyHigh", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "getNotifyLow", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "setDifferenceMode", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "setNotifyHigh", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "setNotifyLow", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "GaugeMonitorMBean", "setThresholds", "(Number,Number)", "summary", "df-generated"]
+      - ["javax.management.monitor", "Monitor", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "addObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "containsObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "getGranularityPeriod", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "removeObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "setGranularityPeriod", "(long)", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "setObservedObject", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "start", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "MonitorMBean", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", "getDerivedGaugeTimeStamp", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", "getDerivedGaugeTimeStamp", "(ObjectName)", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", "getNotifyDiffer", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", "getNotifyMatch", "()", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", "setNotifyDiffer", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.monitor", "StringMonitorMBean", "setNotifyMatch", "(boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.openmbean.model.yml b/java/ql/lib/ext/generated/javax.management.openmbean.model.yml
new file mode 100644
index 00000000000..7ad51e1fb4f
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.openmbean.model.yml
@@ -0,0 +1,150 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.openmbean", "ArrayType", True, "ArrayType", "(SimpleType,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "ArrayType", True, "ArrayType", "(int,OpenType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "ArrayType", True, "getArrayType", "(OpenType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "ArrayType", True, "getElementOpenType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeData", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeData", True, "getAll", "(String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeData", True, "getCompositeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeData", True, "values", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataInvocationHandler", True, "CompositeDataInvocationHandler", "(CompositeData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataInvocationHandler", True, "getCompositeData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeDataSupport", True, "CompositeDataSupport", "(CompositeType,String[],Object[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "CompositeType", "(String,String,String[],String[],OpenType[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "getDescription", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "getType", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", True, "keySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "InvalidKeyException", True, "InvalidKeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "InvalidOpenTypeException", True, "InvalidOpenTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "KeyAlreadyExistsException", True, "KeyAlreadyExistsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenDataException", True, "OpenDataException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Comparable,Comparable)", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanAttributeInfoSupport", True, "OpenMBeanAttributeInfoSupport", "(String,String,OpenType,boolean,boolean,boolean,Object,Object[])", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanConstructorInfoSupport", True, "OpenMBeanConstructorInfoSupport", "(String,String,OpenMBeanParameterInfo[],Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[])", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[4].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[5].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanInfoSupport", True, "OpenMBeanInfoSupport", "(String,String,OpenMBeanAttributeInfo[],OpenMBeanConstructorInfo[],OpenMBeanOperationInfo[],MBeanNotificationInfo[],Descriptor)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfo", True, "getReturnOpenType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanOperationInfoSupport", True, "OpenMBeanOperationInfoSupport", "(String,String,OpenMBeanParameterInfo[],OpenType,int,Descriptor)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getDefaultValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getLegalValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getMaxValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getMinValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", True, "getOpenType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Descriptor)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Comparable,Comparable)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfoSupport", True, "OpenMBeanParameterInfoSupport", "(String,String,OpenType,Object,Object[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenType", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenType", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "OpenType", True, "getTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "get", "(Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "getTabularType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "put", "(CompositeData)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "putAll", "(CompositeData[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", True, "remove", "(Object[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "TabularDataSupport", "(TabularType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularDataSupport", True, "TabularDataSupport", "(TabularType,int,float)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "TabularType", "(String,String,CompositeType,String[])", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "getIndexNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.openmbean", "TabularType", True, "getRowType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.openmbean", "ArrayType", "getDimension", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "ArrayType", "getPrimitiveArrayType", "(Class)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "ArrayType", "isPrimitiveArray", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "CompositeData", "containsKey", "(String)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "CompositeData", "containsValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "CompositeType", "containsKey", "(String)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasDefaultValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasLegalValues", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasMaxValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "hasMinValue", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenMBeanParameterInfo", "isValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenType", "isArray", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "OpenType", "isValue", "(Object)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "SimpleType", "readResolve", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", "calculateIndex", "(CompositeData)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", "clear", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", "containsKey", "(Object[])", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", "containsValue", "(CompositeData)", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.management.openmbean", "TabularData", "size", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.relation.model.yml b/java/ql/lib/ext/generated/javax.management.relation.model.yml
new file mode 100644
index 00000000000..86b04e58252
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.relation.model.yml
@@ -0,0 +1,171 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.relation", "InvalidRelationIdException", True, "InvalidRelationIdException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "InvalidRelationServiceException", True, "InvalidRelationServiceException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "InvalidRelationTypeException", True, "InvalidRelationTypeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "InvalidRoleInfoException", True, "InvalidRoleInfoException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "InvalidRoleValueException", True, "InvalidRoleValueException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "disableObjectName", "(ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "enableObjectName", "(ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "getDisabledObjectNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", True, "getEnabledObjectNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "getReferencedMBeans", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "getRelationId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "getRelationServiceName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "getRelationTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "getRole", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "handleMBeanUnregistration", "(ObjectName,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "retrieveAllRoles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "setRole", "(Role)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "Relation", True, "setRoles", "(RoleList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationException", True, "RelationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotFoundException", True, "RelationNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,List)", "", "Argument[8].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[10].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[7]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[8]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "RelationNotification", "(String,Object,long,long,String,String,String,ObjectName,String,List,List)", "", "Argument[9].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getMBeansToUnregister", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getNewRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getObjectName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getOldRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getRelationId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getRelationTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationNotification", True, "getRoleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "addRelation", "(ObjectName)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "addRelationType", "(RelationType)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "createRelation", "(String,String,RoleList)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "createRelation", "(String,String,RoleList)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "createRelation", "(String,String,RoleList)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "createRelationType", "(String,RoleInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "findReferencingRelations", "(ObjectName,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "findReferencingRelations", "(ObjectName,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "findRelationsOfType", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "getAllRelationIds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "getAllRelationTypeNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "getRelationTypeName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "getRoleInfo", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "getRoleInfos", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "isRelation", "(ObjectName)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "isRelationMBean", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "setRole", "(String,Role)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "setRoles", "(String,RoleList)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", True, "updateRoleMap", "(String,Role,List)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationServiceNotRegisteredException", True, "RelationServiceNotRegisteredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,MBeanServer,String,RoleList)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationSupport", True, "RelationSupport", "(String,ObjectName,String,RoleList)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationType", True, "getRelationTypeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationType", True, "getRoleInfo", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationType", True, "getRoleInfos", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationTypeNotFoundException", True, "RelationTypeNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationTypeSupport", True, "RelationTypeSupport", "(String,RoleInfo[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RelationTypeSupport", True, "RelationTypeSupport", "(String,RoleInfo[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "Role", "(String,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "Role", "(String,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "getRoleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "getRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "roleValueToString", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "setRoleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "Role", True, "setRoleValue", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(RoleInfo)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "RoleInfo", "(String,String,boolean,boolean,int,int,String)", "", "Argument[6]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", True, "getRefMBeanClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleInfoNotFoundException", True, "RoleInfoNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleList", True, "RoleList", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleList", True, "add", "(Role)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleList", True, "add", "(int,Role)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleList", True, "addAll", "(RoleList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleList", True, "set", "(int,Role)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleNotFoundException", True, "RoleNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleResult", True, "RoleResult", "(RoleList,RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleResult", True, "RoleResult", "(RoleList,RoleUnresolvedList)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleResult", True, "getRoles", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleResult", True, "getRolesUnresolved", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleResult", True, "setRoles", "(RoleList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleResult", True, "setRolesUnresolved", "(RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "RoleUnresolved", "(String,List,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "RoleUnresolved", "(String,List,int)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "getRoleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "getRoleValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "setRoleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", True, "setRoleValue", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "RoleUnresolvedList", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "add", "(RoleUnresolved)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "add", "(int,RoleUnresolved)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "addAll", "(RoleUnresolvedList)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "asList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", True, "set", "(int,RoleUnresolved)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.relation", "MBeanServerNotificationFilter", "disableAllObjectNames", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "MBeanServerNotificationFilter", "enableAllObjectNames", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "Relation", "getAllRoles", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "Relation", "getRoleCardinality", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "Relation", "getRoles", "(String[])", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationService", "RelationService", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "checkRoleReading", "(String,String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "checkRoleWriting", "(Role,String,Boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "findAssociatedMBeans", "(ObjectName,String,String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "getAllRoles", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "getPurgeFlag", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "getReferencedMBeans", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "getRole", "(String,String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "getRoleCardinality", "(String,String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "getRoles", "(String,String[])", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "hasRelation", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "purgeRelations", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "removeRelation", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "removeRelationType", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "sendRelationCreationNotification", "(String)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "sendRelationRemovalNotification", "(String,List)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "sendRoleUpdateNotification", "(String,Role,List)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationServiceMBean", "setPurgeFlag", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupportMBean", "isInRelationService", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RelationSupportMBean", "setRelationServiceManagementFlag", "(Boolean)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", "checkMaxDegree", "(int)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", "checkMinDegree", "(int)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", "getMaxDegree", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", "getMinDegree", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", "isReadable", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleInfo", "isWritable", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleList", "RoleList", "(int)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleList", "addAll", "(int,RoleList)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleStatus", "isRoleStatus", "(int)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", "getProblemType", "()", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolved", "setProblemType", "(int)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", "RoleUnresolvedList", "(int)", "summary", "df-generated"]
+      - ["javax.management.relation", "RoleUnresolvedList", "addAll", "(int,RoleUnresolvedList)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.remote.model.yml b/java/ql/lib/ext/generated/javax.management.remote.model.yml
new file mode 100644
index 00000000000..e06da36da21
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.remote.model.yml
@@ -0,0 +1,72 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.remote", "JMXAddressable", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "JMXConnectionNotification", "(String,Object,String,long,String,Object)", "", "Argument[5]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectionNotification", True, "getConnectionId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", True, "connect", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", True, "getConnectionId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", True, "getMBeanServerConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", True, "getMBeanServerConnection", "(Subject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", True, "getMBeanServerConnection", "(Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", True, "getMBeanServerConnection", "(Subject)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorFactory", True, "connect", "(JMXServiceURL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorFactory", True, "connect", "(JMXServiceURL,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorFactory", True, "connect", "(JMXServiceURL,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorFactory", True, "newJMXConnector", "(JMXServiceURL,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorFactory", True, "newJMXConnector", "(JMXServiceURL,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", True, "JMXConnectorServer", "(MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServer", True, "getMBeanServer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerFactory", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerFactory", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerFactory", True, "newJMXConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", True, "getAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", True, "getConnectionIds", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", True, "setMBeanServerForwarder", "(MBeanServerForwarder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", True, "setMBeanServerForwarder", "(MBeanServerForwarder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", True, "toJMXConnector", "(Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", True, "toJMXConnector", "(Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXPrincipal", True, "JMXPrincipal", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXProviderException", True, "JMXProviderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXProviderException", True, "JMXProviderException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXProviderException", True, "JMXProviderException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServerErrorException", True, "JMXServerErrorException", "(String,Error)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServerErrorException", True, "JMXServerErrorException", "(String,Error)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "JMXServiceURL", "(String,String,int,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "getHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "getProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", True, "getURLPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "NotificationResult", True, "NotificationResult", "(long,long,TargetedNotification[])", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "NotificationResult", True, "getTargetedNotifications", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote", "SubjectDelegationPermission", False, "SubjectDelegationPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "SubjectDelegationPermission", False, "SubjectDelegationPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "TargetedNotification", True, "TargetedNotification", "(Notification,Integer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote", "TargetedNotification", True, "getNotification", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.remote", "JMXConnector", "addConnectionNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", "connect", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", "removeConnectionNotificationListener", "(NotificationListener)", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnector", "removeConnectionNotificationListener", "(NotificationListener,NotificationFilter,Object)", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", "start", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXConnectorServerMBean", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "JMXServiceURL", "getPort", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "NotificationResult", "getEarliestSequenceNumber", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "NotificationResult", "getNextSequenceNumber", "()", "summary", "df-generated"]
+      - ["javax.management.remote", "TargetedNotification", "getListenerID", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml b/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml
new file mode 100644
index 00000000000..2189861fca8
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.remote.rmi.model.yml
@@ -0,0 +1,84 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,MarshalledObject,String[],Subject)", "", "Argument[4].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,ObjectName,Subject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "createMBean", "(String,ObjectName,Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "getAttribute", "(ObjectName,String,Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "getAttribute", "(ObjectName,String,Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "getAttributes", "(ObjectName,String[],Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "getAttributes", "(ObjectName,String[],Subject)", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "getConnectionId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "getObjectInstance", "(ObjectName,Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "invoke", "(ObjectName,String,MarshalledObject,String[],Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "invoke", "(ObjectName,String,MarshalledObject,String[],Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "invoke", "(ObjectName,String,MarshalledObject,String[],Subject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "invoke", "(ObjectName,String,MarshalledObject,String[],Subject)", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "setAttributes", "(ObjectName,MarshalledObject,Subject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", True, "setAttributes", "(ObjectName,MarshalledObject,Subject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl", True, "RMIConnectionImpl", "(RMIServerImpl,String,ClassLoader,Subject,Map)", "", "Argument[4].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectionImpl_Stub", False, "RMIConnectionImpl_Stub", "(RemoteRef)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(JMXServiceURL,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(JMXServiceURL,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(RMIServer,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnector", True, "RMIConnector", "(RMIServer,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,MBeanServer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnectorServer", True, "RMIConnectorServer", "(JMXServiceURL,Map,RMIServerImpl,MBeanServer)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIIIOPServerImpl", True, "RMIIIOPServerImpl", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIJRMPServerImpl", True, "RMIJRMPServerImpl", "(int,RMIClientSocketFactory,RMIServerSocketFactory,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIJRMPServerImpl", True, "RMIJRMPServerImpl", "(int,RMIClientSocketFactory,RMIServerSocketFactory,Map)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIJRMPServerImpl", True, "RMIJRMPServerImpl", "(int,RMIClientSocketFactory,RMIServerSocketFactory,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServer", True, "newClient", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "RMIServerImpl", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "getDefaultClassLoader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "getMBeanServer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "setDefaultClassLoader", "(ClassLoader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "setMBeanServer", "(MBeanServer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl", True, "toStub", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServerImpl_Stub", False, "RMIServerImpl_Stub", "(RemoteRef)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.remote.rmi", "RMIConnection", "addNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "addNotificationListeners", "(ObjectName[],MarshalledObject[],Subject[])", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "fetchNotifications", "(long,int,long)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "getDefaultDomain", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "getDomains", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "getMBeanCount", "(Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "getMBeanInfo", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "isInstanceOf", "(ObjectName,String,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "isRegistered", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "queryMBeans", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "queryNames", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "removeNotificationListener", "(ObjectName,ObjectName,MarshalledObject,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "removeNotificationListener", "(ObjectName,ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "removeNotificationListeners", "(ObjectName,Integer[],Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "setAttribute", "(ObjectName,MarshalledObject,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIConnection", "unregisterMBean", "(ObjectName,Subject)", "summary", "df-generated"]
+      - ["javax.management.remote.rmi", "RMIServer", "getVersion", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.management.timer.model.yml b/java/ql/lib/ext/generated/javax.management.timer.model.yml
new file mode 100644
index 00000000000..2dd312e78fc
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.management.timer.model.yml
@@ -0,0 +1,37 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.management.timer", "TimerMBean", True, "getNotificationMessage", "(Integer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", True, "getNotificationType", "(Integer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", True, "getNotificationUserData", "(Integer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.management.timer", "TimerNotification", True, "TimerNotification", "(String,Object,long,long,String,Integer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.timer", "TimerNotification", True, "TimerNotification", "(String,Object,long,long,String,Integer)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.management.timer", "TimerNotification", True, "TimerNotification", "(String,Object,long,long,String,Integer)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date,long)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date,long,long)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "addNotification", "(String,String,Object,Date,long,long,boolean)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getAllNotificationIDs", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getDate", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getFixedRate", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getNbNotifications", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getNbOccurences", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getNotificationIDs", "(String)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getPeriod", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "getSendPastNotifications", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "isActive", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "removeAllNotifications", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "removeNotification", "(Integer)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "removeNotifications", "(String)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "setSendPastNotifications", "(boolean)", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "start", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerMBean", "stop", "()", "summary", "df-generated"]
+      - ["javax.management.timer", "TimerNotification", "getNotificationID", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.directory.model.yml b/java/ql/lib/ext/generated/javax.naming.directory.model.yml
new file mode 100644
index 00000000000..21cc4851eef
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.naming.directory.model.yml
@@ -0,0 +1,137 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming.directory", "Attribute", True, "add", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "add", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "get", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "getID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "remove", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "set", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attribute", True, "set", "(int,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "AttributeInUseException", True, "AttributeInUseException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "AttributeModificationException", True, "AttributeModificationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "AttributeModificationException", True, "getUnexecutedModifications", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "AttributeModificationException", True, "setUnexecutedModifications", "(ModificationItem[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(Attribute)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "put", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "Attributes", True, "remove", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,Object,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttribute", True, "BasicAttribute", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "BasicAttributes", True, "BasicAttributes", "(String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "createSubcontext", "(Name,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "createSubcontext", "(String,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getAttributes", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getAttributes", "(Name,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getAttributes", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getAttributes", "(String,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getSchema", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getSchema", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getSchemaClassDefinition", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "getSchemaClassDefinition", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes,String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes,String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes,String[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,Attributes,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,Object[],SearchControls)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,Object[],SearchControls)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,Object[],SearchControls)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,Object[],SearchControls)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,SearchControls)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,SearchControls)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,SearchControls)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(Name,String,SearchControls)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,Attributes,String[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,Object[],SearchControls)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "DirContext", True, "search", "(String,String,SearchControls)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "InitialDirContext", True, "InitialDirContext", "(Hashtable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "InvalidAttributeIdentifierException", True, "InvalidAttributeIdentifierException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "InvalidAttributeValueException", True, "InvalidAttributeValueException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "InvalidAttributesException", True, "InvalidAttributesException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "InvalidSearchControlsException", True, "InvalidSearchControlsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "InvalidSearchFilterException", True, "InvalidSearchFilterException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "ModificationItem", True, "ModificationItem", "(int,Attribute)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "ModificationItem", True, "getAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "NoSuchAttributeException", True, "NoSuchAttributeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SchemaViolationException", True, "SchemaViolationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", True, "SearchControls", "(int,long,int,String[],boolean,boolean)", "", "Argument[3].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", True, "getReturningAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", True, "setReturningAttributes", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,Object,Attributes,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "SearchResult", "(String,String,Object,Attributes,boolean)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.directory", "SearchResult", True, "setAttributes", "(Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.naming.directory", "Attribute", "clear", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attribute", "contains", "(Object)", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attribute", "getAll", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attribute", "getAttributeDefinition", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attribute", "getAttributeSyntaxDefinition", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attribute", "isOrdered", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attribute", "remove", "(Object)", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attribute", "size", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attributes", "getAll", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attributes", "getIDs", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attributes", "isCaseIgnored", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "Attributes", "size", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "BasicAttributes", "BasicAttributes", "(boolean)", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "bind", "(Name,Object,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "bind", "(String,Object,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(Name,ModificationItem[])", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(Name,int,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(String,ModificationItem[])", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "modifyAttributes", "(String,int,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "rebind", "(Name,Object,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "DirContext", "rebind", "(String,Object,Attributes)", "summary", "df-generated"]
+      - ["javax.naming.directory", "ModificationItem", "getModificationOp", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "getCountLimit", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "getDerefLinkFlag", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "getReturningObjFlag", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "getSearchScope", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "getTimeLimit", "()", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "setCountLimit", "(long)", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "setDerefLinkFlag", "(boolean)", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "setReturningObjFlag", "(boolean)", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "setSearchScope", "(int)", "summary", "df-generated"]
+      - ["javax.naming.directory", "SearchControls", "setTimeLimit", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.event.model.yml b/java/ql/lib/ext/generated/javax.naming.event.model.yml
new file mode 100644
index 00000000000..2dae0e7370f
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.naming.event.model.yml
@@ -0,0 +1,25 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "NamingEvent", "(EventContext,int,Binding,Binding,Object)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getChangeInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getEventContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getNewBinding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", True, "getOldBinding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "NamingExceptionEvent", "(EventContext,NamingException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "NamingExceptionEvent", "(EventContext,NamingException)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "getEventContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.naming.event", "NamingEvent", "dispatch", "(NamingListener)", "summary", "df-generated"]
+      - ["javax.naming.event", "NamingEvent", "getType", "()", "summary", "df-generated"]
+      - ["javax.naming.event", "NamingExceptionEvent", "dispatch", "(NamingListener)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.ldap.model.yml b/java/ql/lib/ext/generated/javax.naming.ldap.model.yml
new file mode 100644
index 00000000000..8597d37da7c
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.naming.ldap.model.yml
@@ -0,0 +1,91 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String,boolean,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "BasicControl", True, "BasicControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "Control", True, "getEncodedValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "Control", True, "getID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "ControlFactory", True, "getControlInstance", "(Control,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "InitialLdapContext", True, "InitialLdapContext", "(Hashtable,Control[])", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "InitialLdapContext", True, "InitialLdapContext", "(Hashtable,Control[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", True, "getConnectControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", True, "getRequestControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", True, "getResponseControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", True, "newInstance", "(Control[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", True, "newInstance", "(Control[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", True, "reconnect", "(Control[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", True, "setRequestControls", "(Control[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "LdapName", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "LdapName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(Rdn)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(int,Rdn)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "add", "(int,Rdn)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(List)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(int,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "addAll", "(int,List)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "getRdn", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", True, "getRdns", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "PagedResultsResponseControl", "(String,boolean,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "PagedResultsResponseControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "PagedResultsResponseControl", False, "getCookie", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", True, "Rdn", "(Rdn)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", True, "toAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String,boolean,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "SortKey", "(String,boolean,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "getAttributeID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortKey", True, "getMatchingRuleID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", False, "SortResponseControl", "(String,boolean,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", False, "SortResponseControl", "(String,boolean,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", False, "getAttributeID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "UnsolicitedNotificationEvent", "(Object,UnsolicitedNotification)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "UnsolicitedNotificationEvent", "(Object,UnsolicitedNotification)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", True, "getNotification", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.naming.ldap", "Control", "isCritical", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "ControlFactory", "getControlInstance", "(Control)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "ExtendedRequest", "createExtendedResponse", "(String,byte[],int,int)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "ExtendedRequest", "getEncodedValue", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "ExtendedRequest", "getID", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "ExtendedResponse", "getEncodedValue", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "ExtendedResponse", "getID", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapContext", "extendedOperation", "(ExtendedRequest)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", "endsWith", "(List)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapName", "startsWith", "(List)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "LdapReferralException", "getReferralContext", "(Hashtable,Control[])", "summary", "df-generated"]
+      - ["javax.naming.ldap", "ManageReferralControl", "ManageReferralControl", "(boolean)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "PagedResultsControl", "PagedResultsControl", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "PagedResultsControl", "PagedResultsControl", "(int,byte[],boolean)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "PagedResultsResponseControl", "getResultSize", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", "Rdn", "(Attributes)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", "Rdn", "(String)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", "Rdn", "(String,Object)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", "escapeValue", "(Object)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", "size", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "Rdn", "unescapeValue", "(String)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "SortControl", "SortControl", "(SortKey[],boolean)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "SortControl", "SortControl", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "SortControl", "SortControl", "(String[],boolean)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "SortKey", "isAscending", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", "getException", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", "getResultCode", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "SortResponseControl", "isSorted", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", "close", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", "negotiate", "()", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", "negotiate", "(SSLSocketFactory)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", "setEnabledCipherSuites", "(String[])", "summary", "df-generated"]
+      - ["javax.naming.ldap", "StartTlsResponse", "setHostnameVerifier", "(HostnameVerifier)", "summary", "df-generated"]
+      - ["javax.naming.ldap", "UnsolicitedNotificationEvent", "dispatch", "(UnsolicitedNotificationListener)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml b/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml
new file mode 100644
index 00000000000..ed57b597119
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.naming.ldap.spi.model.yml
@@ -0,0 +1,15 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "LdapDnsProviderResult", "(String,List)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "LdapDnsProviderResult", "(String,List)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "getDomainName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.ldap.spi", "LdapDnsProviderResult", False, "getEndpoints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.naming.ldap.spi", "LdapDnsProvider", "lookupEndpoints", "(String,Map)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.model.yml b/java/ql/lib/ext/generated/javax.naming.model.yml
new file mode 100644
index 00000000000..86321736e88
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.naming.model.yml
@@ -0,0 +1,177 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming", "AuthenticationException", True, "AuthenticationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "AuthenticationNotSupportedException", True, "AuthenticationNotSupportedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "BinaryRefAddr", True, "BinaryRefAddr", "(String,byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,Object,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "Binding", "(String,String,Object,boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Binding", True, "setObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "CannotProceedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "getAltName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "getAltNameCtx", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "getEnvironment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "getRemainingNewName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "setAltName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "setAltNameCtx", "(Context)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "setEnvironment", "(Hashtable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CannotProceedException", True, "setRemainingNewName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CommunicationException", True, "CommunicationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "CompoundName", True, "CompoundName", "(String,Properties)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "ConfigurationException", True, "ConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "addToEnvironment", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "composeName", "(Name,Name)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "composeName", "(Name,Name)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "composeName", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "composeName", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "createSubcontext", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "createSubcontext", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "getEnvironment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "getNameInNamespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "getNameParser", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "getNameParser", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "list", "(Name)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "list", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "list", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "listBindings", "(Name)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "listBindings", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "listBindings", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "lookup", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "lookup", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "lookupLink", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "lookupLink", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Context", True, "removeFromEnvironment", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "ContextNotEmptyException", True, "ContextNotEmptyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "InitialContext", True, "InitialContext", "(Hashtable)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "InsufficientResourcesException", True, "InsufficientResourcesException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "InterruptedNamingException", True, "InterruptedNamingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "InvalidNameException", True, "InvalidNameException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LimitExceededException", True, "LimitExceededException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "LinkException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "getLinkExplanation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "getLinkRemainingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "getLinkResolvedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "getLinkResolvedObj", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "setLinkExplanation", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "setLinkRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "setLinkResolvedName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkException", True, "setLinkResolvedObj", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkLoopException", True, "LinkLoopException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkRef", True, "LinkRef", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkRef", True, "LinkRef", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "LinkRef", True, "getLinkName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "MalformedLinkException", True, "MalformedLinkException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Name", True, "add", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Name", True, "add", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.naming", "Name", True, "add", "(int,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.naming", "Name", True, "addAll", "(Name)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Name", True, "addAll", "(Name)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.naming", "Name", True, "addAll", "(int,Name)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.naming", "Name", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Name", True, "getAll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Name", True, "getPrefix", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Name", True, "getSuffix", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Name", True, "remove", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NameAlreadyBoundException", True, "NameAlreadyBoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "NameClassPair", "(String,String,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "getNameInNamespace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "setClassName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameClassPair", True, "setNameInNamespace", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NameNotFoundException", True, "NameNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "NamingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "appendRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "getExplanation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "getRemainingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "getResolvedName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "getResolvedObj", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "getRootCause", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "setRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "setResolvedName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "setResolvedObj", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingException", True, "setRootCause", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NamingSecurityException", True, "NamingSecurityException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NoInitialContextException", True, "NoInitialContextException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NoPermissionException", True, "NoPermissionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "NotContextException", True, "NotContextException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "OperationNotSupportedException", True, "OperationNotSupportedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "PartialResultException", True, "PartialResultException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "RefAddr", True, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "RefAddr", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,RefAddr,String,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "Reference", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "add", "(RefAddr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "add", "(int,RefAddr)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "getAll", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "getClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "getFactoryClassLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "getFactoryClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "Reference", True, "remove", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming", "ServiceUnavailableException", True, "ServiceUnavailableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "SizeLimitExceededException", True, "SizeLimitExceededException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming", "TimeLimitExceededException", True, "TimeLimitExceededException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.naming", "CompositeName", "CompositeName", "(String)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "bind", "(Name,Object)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "bind", "(String,Object)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "close", "()", "summary", "df-generated"]
+      - ["javax.naming", "Context", "destroySubcontext", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "destroySubcontext", "(String)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "rebind", "(Name,Object)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "rebind", "(String,Object)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "rename", "(Name,Name)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "rename", "(String,String)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "unbind", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "Context", "unbind", "(String)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "doLookup", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "InitialContext", "doLookup", "(String)", "summary", "df-generated"]
+      - ["javax.naming", "Name", "endsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "Name", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.naming", "Name", "size", "()", "summary", "df-generated"]
+      - ["javax.naming", "Name", "startsWith", "(Name)", "summary", "df-generated"]
+      - ["javax.naming", "NameClassPair", "isRelative", "()", "summary", "df-generated"]
+      - ["javax.naming", "NameClassPair", "setRelative", "(boolean)", "summary", "df-generated"]
+      - ["javax.naming", "NamingException", "appendRemainingComponent", "(String)", "summary", "df-generated"]
+      - ["javax.naming", "Reference", "clear", "()", "summary", "df-generated"]
+      - ["javax.naming", "Reference", "size", "()", "summary", "df-generated"]
+      - ["javax.naming", "ReferralException", "getReferralContext", "()", "summary", "df-generated"]
+      - ["javax.naming", "ReferralException", "getReferralContext", "(Hashtable)", "summary", "df-generated"]
+      - ["javax.naming", "ReferralException", "getReferralInfo", "()", "summary", "df-generated"]
+      - ["javax.naming", "ReferralException", "retryReferral", "()", "summary", "df-generated"]
+      - ["javax.naming", "ReferralException", "skipReferral", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.naming.spi.model.yml b/java/ql/lib/ext/generated/javax.naming.spi.model.yml
new file mode 100644
index 00000000000..5f36e7d0e73
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.naming.spi.model.yml
@@ -0,0 +1,40 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "Result", "(Object,Attributes)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "Result", "(Object,Attributes)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirStateFactory$Result", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getContinuationDirContext", "(CannotProceedException)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getStateToBind", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "DirectoryManager", True, "getStateToBind", "(Object,Name,Context,Hashtable,Attributes)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getContinuationContext", "(CannotProceedException)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getInitialContext", "(Hashtable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getObjectInstance", "(Object,Name,Context,Hashtable)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getStateToBind", "(Object,Name,Context,Hashtable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", True, "getURLContext", "(String,Hashtable)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,Name)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "ResolveResult", "(Object,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "appendRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "getRemainingName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "getResolvedObj", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "setRemainingName", "(Name)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", True, "setResolvedObj", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.naming.spi", "Resolver", True, "resolveToClass", "(Name,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "Resolver", True, "resolveToClass", "(Name,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.naming.spi", "Resolver", True, "resolveToClass", "(String,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.naming.spi", "NamingManager", "hasInitialContextFactoryBuilder", "()", "summary", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", "setInitialContextFactoryBuilder", "(InitialContextFactoryBuilder)", "summary", "df-generated"]
+      - ["javax.naming.spi", "NamingManager", "setObjectFactoryBuilder", "(ObjectFactoryBuilder)", "summary", "df-generated"]
+      - ["javax.naming.spi", "ResolveResult", "appendRemainingComponent", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.net.model.yml b/java/ql/lib/ext/generated/javax.net.model.yml
new file mode 100644
index 00000000000..2990ef69c06
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.net.model.yml
@@ -0,0 +1,22 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.net", "ServerSocketFactory", True, "createServerSocket", "(int,int,InetAddress)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(InetAddress,int,InetAddress,int)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(String,int,InetAddress,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net", "SocketFactory", True, "createSocket", "(String,int,InetAddress,int)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.net", "ServerSocketFactory", "createServerSocket", "()", "summary", "df-generated"]
+      - ["javax.net", "ServerSocketFactory", "createServerSocket", "(int)", "summary", "df-generated"]
+      - ["javax.net", "ServerSocketFactory", "createServerSocket", "(int,int)", "summary", "df-generated"]
+      - ["javax.net", "ServerSocketFactory", "getDefault", "()", "summary", "df-generated"]
+      - ["javax.net", "SocketFactory", "createSocket", "()", "summary", "df-generated"]
+      - ["javax.net", "SocketFactory", "createSocket", "(InetAddress,int)", "summary", "df-generated"]
+      - ["javax.net", "SocketFactory", "getDefault", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.net.ssl.model.yml b/java/ql/lib/ext/generated/javax.net.ssl.model.yml
new file mode 100644
index 00000000000..194be2c2008
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.net.ssl.model.yml
@@ -0,0 +1,233 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.net.ssl", "CertPathTrustManagerParameters", True, "CertPathTrustManagerParameters", "(CertPathParameters)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "CertPathTrustManagerParameters", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "HandshakeCompletedEvent", "(SSLSocket,SSLSession)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "HandshakeCompletedEvent", "(SSLSocket,SSLSession)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getLocalCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getPeerCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getSession", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", True, "getSocket", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "getHostnameVerifier", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "getSSLSocketFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "setHostnameVerifier", "(HostnameVerifier)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", True, "setSSLSocketFactory", "(SSLSocketFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getKeyManagers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "KeyStoreBuilderParameters", "(KeyStore$Builder)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "KeyStoreBuilderParameters", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "KeyStoreBuilderParameters", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SNIHostName", False, "SNIHostName", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SNIHostName", False, "createSNIMatcher", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SNIHostName", False, "getAsciiName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SNIServerName", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "createSSLEngine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "createSSLEngine", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "createSSLEngine", "(String,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getClientSessionContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getServerSessionContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getServerSocketFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "getSocketFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "init", "(KeyManager[],TrustManager[],SecureRandom)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "init", "(KeyManager[],TrustManager[],SecureRandom)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", True, "init", "(KeyManager[],TrustManager[],SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", True, "getPeerHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLException", True, "SSLException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLException", True, "SSLException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLException", True, "SSLException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLException", True, "SSLException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLHandshakeException", True, "SSLHandshakeException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLKeyException", True, "SSLKeyException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[],String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "SSLParameters", "(String[],String[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getAlgorithmConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getApplicationProtocols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getCipherSuites", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getEndpointIdentificationAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getProtocols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getSNIMatchers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "getServerNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setAlgorithmConstraints", "(AlgorithmConstraints)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setApplicationProtocols", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setCipherSuites", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setEndpointIdentificationAlgorithm", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setProtocols", "(String[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setSNIMatchers", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", True, "setServerNames", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLPeerUnverifiedException", True, "SSLPeerUnverifiedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLPermission", False, "SSLPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLPermission", False, "SSLPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLProtocolException", True, "SSLProtocolException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "SSLSessionBindingEvent", "(SSLSession,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "SSLSessionBindingEvent", "(SSLSession,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "SSLSessionBindingEvent", True, "getSession", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", True, "getTrustManagers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.net.ssl", "ExtendedSSLSession", "getLocalSupportedSignatureAlgorithms", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "ExtendedSSLSession", "getPeerSupportedSignatureAlgorithms", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "ExtendedSSLSession", "getRequestedServerNames", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "ExtendedSSLSession", "getStatusResponses", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", "getCipherSuite", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", "getLocalPrincipal", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", "getPeerCertificateChain", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HandshakeCompletedEvent", "getPeerPrincipal", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HostnameVerifier", "verify", "(String,SSLSession)", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getCipherSuite", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getDefaultHostnameVerifier", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getDefaultSSLSocketFactory", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getLocalCertificates", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getLocalPrincipal", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getPeerPrincipal", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getSSLSession", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "getServerCertificates", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "setDefaultHostnameVerifier", "(HostnameVerifier)", "summary", "df-generated"]
+      - ["javax.net.ssl", "HttpsURLConnection", "setDefaultSSLSocketFactory", "(SSLSocketFactory)", "summary", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", "getDefaultAlgorithm", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", "init", "(KeyStore,char[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "KeyManagerFactory", "init", "(ManagerFactoryParameters)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SNIHostName", "SNIHostName", "(String)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SNIMatcher", "getType", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SNIMatcher", "matches", "(SNIServerName)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SNIServerName", "getType", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", "getDefault", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", "getDefaultSSLParameters", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", "getSupportedSSLParameters", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLContext", "setDefault", "(SSLContext)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "beginHandshake", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "closeInbound", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "closeOutbound", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getApplicationProtocol", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getDelegatedTask", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getEnableSessionCreation", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getEnabledCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getEnabledProtocols", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getHandshakeApplicationProtocol", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getHandshakeApplicationProtocolSelector", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getHandshakeSession", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getHandshakeStatus", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getNeedClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getPeerPort", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getSSLParameters", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getSession", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getSupportedCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getSupportedProtocols", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getUseClientMode", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "getWantClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "isInboundDone", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "isOutboundDone", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setEnableSessionCreation", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setEnabledCipherSuites", "(String[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setEnabledProtocols", "(String[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setHandshakeApplicationProtocolSelector", "(BiFunction)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setNeedClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setSSLParameters", "(SSLParameters)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setUseClientMode", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "setWantClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "unwrap", "(ByteBuffer,ByteBuffer)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "unwrap", "(ByteBuffer,ByteBuffer[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "unwrap", "(ByteBuffer,ByteBuffer[],int,int)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "wrap", "(ByteBuffer,ByteBuffer)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "wrap", "(ByteBuffer[],ByteBuffer)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngine", "wrap", "(ByteBuffer[],int,int,ByteBuffer)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngineResult", "SSLEngineResult", "(SSLEngineResult$Status,SSLEngineResult$HandshakeStatus,int,int)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngineResult", "SSLEngineResult", "(SSLEngineResult$Status,SSLEngineResult$HandshakeStatus,int,int,long)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngineResult", "bytesConsumed", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngineResult", "bytesProduced", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngineResult", "getHandshakeStatus", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngineResult", "getStatus", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLEngineResult", "sequenceNumber", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "getEnableRetransmissions", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "getMaximumPacketSize", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "getNeedClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "getUseCipherSuitesOrder", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "getWantClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "setEnableRetransmissions", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "setMaximumPacketSize", "(int)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "setNeedClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "setUseCipherSuitesOrder", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLParameters", "setWantClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getEnableSessionCreation", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getEnabledCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getEnabledProtocols", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getNeedClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getSSLParameters", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getSupportedCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getSupportedProtocols", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getUseClientMode", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "getWantClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "setEnableSessionCreation", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "setEnabledCipherSuites", "(String[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "setEnabledProtocols", "(String[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "setNeedClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "setSSLParameters", "(SSLParameters)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "setUseClientMode", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocket", "setWantClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocketFactory", "getDefault", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocketFactory", "getDefaultCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLServerSocketFactory", "getSupportedCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSession", "getPeerCertificateChain", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "addHandshakeCompletedListener", "(HandshakeCompletedListener)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getApplicationProtocol", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getEnableSessionCreation", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getEnabledCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getEnabledProtocols", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getHandshakeApplicationProtocol", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getHandshakeApplicationProtocolSelector", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getHandshakeSession", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getNeedClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getSSLParameters", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getSession", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getSupportedCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getSupportedProtocols", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getUseClientMode", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "getWantClientAuth", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "removeHandshakeCompletedListener", "(HandshakeCompletedListener)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setEnableSessionCreation", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setEnabledCipherSuites", "(String[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setEnabledProtocols", "(String[])", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setHandshakeApplicationProtocolSelector", "(BiFunction)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setNeedClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setSSLParameters", "(SSLParameters)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setUseClientMode", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "setWantClientAuth", "(boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocket", "startHandshake", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", "createSocket", "(Socket,InputStream,boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", "createSocket", "(Socket,String,int,boolean)", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", "getDefault", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", "getDefaultCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "SSLSocketFactory", "getSupportedCipherSuites", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", "getDefaultAlgorithm", "()", "summary", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", "init", "(KeyStore)", "summary", "df-generated"]
+      - ["javax.net.ssl", "TrustManagerFactory", "init", "(ManagerFactoryParameters)", "summary", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedKeyManager", "chooseEngineClientAlias", "(String[],Principal[],SSLEngine)", "summary", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedKeyManager", "chooseEngineServerAlias", "(String,Principal[],SSLEngine)", "summary", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedTrustManager", "checkClientTrusted", "(X509Certificate[],String,SSLEngine)", "summary", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedTrustManager", "checkClientTrusted", "(X509Certificate[],String,Socket)", "summary", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedTrustManager", "checkServerTrusted", "(X509Certificate[],String,SSLEngine)", "summary", "df-generated"]
+      - ["javax.net.ssl", "X509ExtendedTrustManager", "checkServerTrusted", "(X509Certificate[],String,Socket)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.attribute.model.yml b/java/ql/lib/ext/generated/javax.print.attribute.model.yml
new file mode 100644
index 00000000000..08866afd480
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.print.attribute.model.yml
@@ -0,0 +1,70 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.print.attribute", "AttributeSet", True, "add", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", True, "get", "(Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", True, "toArray", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "synchronizedView", "(AttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "synchronizedView", "(DocAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "synchronizedView", "(PrintJobAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "synchronizedView", "(PrintRequestAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "synchronizedView", "(PrintServiceAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(AttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(DocAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(PrintJobAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(PrintRequestAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "unmodifiableView", "(PrintServiceAttributeSet)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", False, "verifyAttributeValue", "(Object,Class)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "HashAttributeSet", "(Attribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", True, "HashAttributeSet", "(Attribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashDocAttributeSet", True, "HashDocAttributeSet", "(DocAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashDocAttributeSet", True, "HashDocAttributeSet", "(DocAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintJobAttributeSet", True, "HashPrintJobAttributeSet", "(PrintJobAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintJobAttributeSet", True, "HashPrintJobAttributeSet", "(PrintJobAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintRequestAttributeSet", True, "HashPrintRequestAttributeSet", "(PrintRequestAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintRequestAttributeSet", True, "HashPrintRequestAttributeSet", "(PrintRequestAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintServiceAttributeSet", True, "HashPrintServiceAttributeSet", "(PrintServiceAttribute)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "HashPrintServiceAttributeSet", True, "HashPrintServiceAttributeSet", "(PrintServiceAttribute[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute", "TextSyntax", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "TextSyntax", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "URISyntax", True, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute", "UnmodifiableSetException", True, "UnmodifiableSetException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.print.attribute", "Attribute", "getCategory", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "Attribute", "getName", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "addAll", "(AttributeSet)", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "clear", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "containsKey", "(Class)", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "containsValue", "(Attribute)", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "remove", "(Attribute)", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "remove", "(Class)", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSet", "size", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", "verifyAttributeCategory", "(Object,Class)", "summary", "df-generated"]
+      - ["javax.print.attribute", "AttributeSetUtilities", "verifyCategoryForValue", "(Class,Attribute)", "summary", "df-generated"]
+      - ["javax.print.attribute", "DateTimeSyntax", "getValue", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "EnumSyntax", "getValue", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashAttributeSet", "HashAttributeSet", "(AttributeSet)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashDocAttributeSet", "HashDocAttributeSet", "(DocAttributeSet)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashPrintJobAttributeSet", "HashPrintJobAttributeSet", "(PrintJobAttributeSet)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashPrintRequestAttributeSet", "HashPrintRequestAttributeSet", "(PrintRequestAttributeSet)", "summary", "df-generated"]
+      - ["javax.print.attribute", "HashPrintServiceAttributeSet", "HashPrintServiceAttributeSet", "(PrintServiceAttributeSet)", "summary", "df-generated"]
+      - ["javax.print.attribute", "IntegerSyntax", "getValue", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "ResolutionSyntax", "ResolutionSyntax", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "ResolutionSyntax", "getCrossFeedResolution", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "ResolutionSyntax", "getFeedResolution", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "ResolutionSyntax", "getResolution", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "ResolutionSyntax", "lessThanOrEquals", "(ResolutionSyntax)", "summary", "df-generated"]
+      - ["javax.print.attribute", "SetOfIntegerSyntax", "contains", "(IntegerSyntax)", "summary", "df-generated"]
+      - ["javax.print.attribute", "SetOfIntegerSyntax", "contains", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "SetOfIntegerSyntax", "getMembers", "()", "summary", "df-generated"]
+      - ["javax.print.attribute", "SetOfIntegerSyntax", "next", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "Size2DSyntax", "getSize", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "Size2DSyntax", "getX", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute", "Size2DSyntax", "getY", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml b/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml
new file mode 100644
index 00000000000..362cdbb4c1e
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.print.attribute.standard.model.yml
@@ -0,0 +1,92 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.print.attribute.standard", "DateTimeAtCompleted", False, "DateTimeAtCompleted", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtCreation", False, "DateTimeAtCreation", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "DateTimeAtProcessing", False, "DateTimeAtProcessing", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "Destination", False, "Destination", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "DialogOwner", False, "DialogOwner", "(Window)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "DialogOwner", False, "getOwner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "DocumentName", False, "DocumentName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "DocumentName", False, "DocumentName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobHoldUntil", False, "JobHoldUntil", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMessageFromOperator", False, "JobMessageFromOperator", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMessageFromOperator", False, "JobMessageFromOperator", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobName", False, "JobName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobName", False, "JobName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobOriginatingUserName", False, "JobOriginatingUserName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobOriginatingUserName", False, "JobOriginatingUserName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReasons", False, "JobStateReasons", "(Collection)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", True, "MediaSize", "(float,float,int,MediaSizeName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", True, "MediaSize", "(int,int,int,MediaSizeName)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", True, "getMediaSizeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "OutputDeviceAssigned", False, "OutputDeviceAssigned", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "OutputDeviceAssigned", False, "OutputDeviceAssigned", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterInfo", False, "PrinterInfo", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterInfo", False, "PrinterInfo", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterLocation", False, "PrinterLocation", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterLocation", False, "PrinterLocation", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMakeAndModel", False, "PrinterMakeAndModel", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMakeAndModel", False, "PrinterMakeAndModel", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMessageFromOperator", False, "PrinterMessageFromOperator", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMessageFromOperator", False, "PrinterMessageFromOperator", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMoreInfo", False, "PrinterMoreInfo", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterMoreInfoManufacturer", False, "PrinterMoreInfoManufacturer", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterName", False, "PrinterName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterName", False, "PrinterName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", False, "PrinterStateReasons", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", False, "printerStateReasonSet", "(Severity)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", False, "printerStateReasonSet", "(Severity)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterURI", False, "PrinterURI", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "RequestingUserName", False, "RequestingUserName", "(String,Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.attribute.standard", "RequestingUserName", False, "RequestingUserName", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.print.attribute.standard", "Copies", "Copies", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "CopiesSupported", "CopiesSupported", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "CopiesSupported", "CopiesSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressions", "JobImpressions", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressionsCompleted", "JobImpressionsCompleted", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobImpressionsSupported", "JobImpressionsSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctets", "JobKOctets", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctetsProcessed", "JobKOctetsProcessed", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobKOctetsSupported", "JobKOctetsSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheets", "JobMediaSheets", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheetsCompleted", "JobMediaSheetsCompleted", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobMediaSheetsSupported", "JobMediaSheetsSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobPriority", "JobPriority", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobPrioritySupported", "JobPrioritySupported", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReasons", "JobStateReasons", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "JobStateReasons", "JobStateReasons", "(int,float)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "MediaPrintableArea", "(float,float,float,float,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "MediaPrintableArea", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "getHeight", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "getPrintableArea", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "getWidth", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "getX", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaPrintableArea", "getY", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", "MediaSize", "(float,float,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", "MediaSize", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", "findMedia", "(float,float,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "MediaSize", "getMediaSizeForName", "(MediaSizeName)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberOfDocuments", "NumberOfDocuments", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberOfInterveningJobs", "NumberOfInterveningJobs", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUp", "NumberUp", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUpSupported", "NumberUpSupported", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUpSupported", "NumberUpSupported", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "NumberUpSupported", "NumberUpSupported", "(int[][])", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(String)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PageRanges", "PageRanges", "(int[][])", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PagesPerMinute", "PagesPerMinute", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PagesPerMinuteColor", "PagesPerMinuteColor", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterResolution", "PrinterResolution", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", "PrinterStateReasons", "(int)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "PrinterStateReasons", "PrinterStateReasons", "(int,float)", "summary", "df-generated"]
+      - ["javax.print.attribute.standard", "QueuedJobCount", "QueuedJobCount", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.event.model.yml b/java/ql/lib/ext/generated/javax.print.event.model.yml
new file mode 100644
index 00000000000..91b146ba8b0
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.print.event.model.yml
@@ -0,0 +1,28 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.print.event", "PrintEvent", True, "PrintEvent", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobAttributeEvent", True, "PrintJobAttributeEvent", "(DocPrintJob,PrintJobAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobAttributeEvent", True, "PrintJobAttributeEvent", "(DocPrintJob,PrintJobAttributeSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobAttributeEvent", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobAttributeEvent", True, "getPrintJob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobEvent", True, "PrintJobEvent", "(DocPrintJob,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintJobEvent", True, "getPrintJob", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.event", "PrintServiceAttributeEvent", True, "PrintServiceAttributeEvent", "(PrintService,PrintServiceAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintServiceAttributeEvent", True, "PrintServiceAttributeEvent", "(PrintService,PrintServiceAttributeSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print.event", "PrintServiceAttributeEvent", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print.event", "PrintServiceAttributeEvent", True, "getPrintService", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.print.event", "PrintJobEvent", "getPrintEventType", "()", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobListener", "printDataTransferCompleted", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobListener", "printJobCanceled", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobListener", "printJobCompleted", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobListener", "printJobFailed", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobListener", "printJobNoMoreEvents", "(PrintJobEvent)", "summary", "df-generated"]
+      - ["javax.print.event", "PrintJobListener", "printJobRequiresAttention", "(PrintJobEvent)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.print.model.yml b/java/ql/lib/ext/generated/javax.print.model.yml
new file mode 100644
index 00000000000..bf9267dea96
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.print.model.yml
@@ -0,0 +1,56 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.print", "Doc", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "Doc", True, "getDocFlavor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "Doc", True, "getPrintData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "Doc", True, "getReaderForText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "Doc", True, "getStreamForBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor$SERVICE_FORMATTED", True, "SERVICE_FORMATTED", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "DocFlavor", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "getMediaSubtype", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "getMediaType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "getMimeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "getParameter", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "DocFlavor", True, "getRepresentationClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "PrintException", True, "PrintException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "PrintException", True, "PrintException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "PrintException", True, "PrintException", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "PrintException", True, "PrintException", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "ServiceUI", True, "printDialog", "(GraphicsConfiguration,int,int,PrintService[],PrintService,DocFlavor,PrintRequestAttributeSet)", "", "Argument[3].ArrayElement", "Argument[6]", "taint", "df-generated"]
+      - ["javax.print", "ServiceUI", True, "printDialog", "(GraphicsConfiguration,int,int,PrintService[],PrintService,DocFlavor,PrintRequestAttributeSet)", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "SimpleDoc", False, "SimpleDoc", "(Object,DocFlavor,DocAttributeSet)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.print", "StreamPrintService", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.print", "DocFlavor$BYTE_ARRAY", "BYTE_ARRAY", "(String)", "summary", "df-generated"]
+      - ["javax.print", "DocFlavor$CHAR_ARRAY", "CHAR_ARRAY", "(String)", "summary", "df-generated"]
+      - ["javax.print", "DocFlavor$INPUT_STREAM", "INPUT_STREAM", "(String)", "summary", "df-generated"]
+      - ["javax.print", "DocFlavor$READER", "READER", "(String)", "summary", "df-generated"]
+      - ["javax.print", "DocFlavor$STRING", "STRING", "(String)", "summary", "df-generated"]
+      - ["javax.print", "DocFlavor$URL", "URL", "(String)", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "getDefaultPrintService", "()", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "getMultiDocPrintServices", "(DocFlavor[],AttributeSet)", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "getPrintServices", "()", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "getPrintServices", "(DocFlavor,AttributeSet)", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "lookupDefaultPrintService", "()", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "lookupMultiDocPrintServices", "(DocFlavor[],AttributeSet)", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "lookupPrintServices", "(DocFlavor,AttributeSet)", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "registerService", "(PrintService)", "summary", "df-generated"]
+      - ["javax.print", "PrintServiceLookup", "registerServiceProvider", "(PrintServiceLookup)", "summary", "df-generated"]
+      - ["javax.print", "ServiceUIFactory", "getUI", "(int,String)", "summary", "df-generated"]
+      - ["javax.print", "ServiceUIFactory", "getUIClassNamesForRole", "(int)", "summary", "df-generated"]
+      - ["javax.print", "StreamPrintService", "dispose", "()", "summary", "df-generated"]
+      - ["javax.print", "StreamPrintService", "getOutputFormat", "()", "summary", "df-generated"]
+      - ["javax.print", "StreamPrintService", "isDisposed", "()", "summary", "df-generated"]
+      - ["javax.print", "StreamPrintServiceFactory", "getOutputFormat", "()", "summary", "df-generated"]
+      - ["javax.print", "StreamPrintServiceFactory", "getPrintService", "(OutputStream)", "summary", "df-generated"]
+      - ["javax.print", "StreamPrintServiceFactory", "getSupportedDocFlavors", "()", "summary", "df-generated"]
+      - ["javax.print", "StreamPrintServiceFactory", "lookupStreamPrintServiceFactories", "(DocFlavor,String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml b/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml
new file mode 100644
index 00000000000..54e1b150eb9
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.rmi.ssl.model.yml
@@ -0,0 +1,18 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(SSLContext,String[],String[],boolean)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(String[],String[],boolean)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "SslRMIServerSocketFactory", "(String[],String[],boolean)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "getEnabledCipherSuites", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", True, "getEnabledProtocols", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.rmi.ssl", "SslRMIServerSocketFactory", "getNeedClientAuth", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.script.model.yml b/java/ql/lib/ext/generated/javax.script.model.yml
new file mode 100644
index 00000000000..6350613b8c4
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.script.model.yml
@@ -0,0 +1,66 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.script", "AbstractScriptEngine", True, "AbstractScriptEngine", "(Bindings)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "getAttribute", "(String,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "getBindings", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "getErrorWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "getReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "getWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "removeAttribute", "(String,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "setAttribute", "(String,Object,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "setBindings", "(Bindings,int)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "setErrorWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "setReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptContext", True, "setWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngine", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngine", True, "getBindings", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngine", True, "getContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngine", True, "setBindings", "(Bindings,int)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngine", True, "setContext", "(ScriptContext)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "get", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "getBindings", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "getEngineByExtension", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "getEngineByMimeType", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "getEngineByName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "getEngineFactories", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "put", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "put", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "registerEngineExtension", "(String,ScriptEngineFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "registerEngineExtension", "(String,ScriptEngineFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "registerEngineMimeType", "(String,ScriptEngineFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "registerEngineMimeType", "(String,ScriptEngineFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "registerEngineName", "(String,ScriptEngineFactory)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "registerEngineName", "(String,ScriptEngineFactory)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", True, "setBindings", "(Bindings)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "ScriptException", "(String,String,int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.script", "ScriptException", True, "getFileName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.script", "SimpleBindings", True, "SimpleBindings", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.script", "CompiledScript", "eval", "()", "summary", "df-generated"]
+      - ["javax.script", "CompiledScript", "eval", "(Bindings)", "summary", "df-generated"]
+      - ["javax.script", "CompiledScript", "eval", "(ScriptContext)", "summary", "df-generated"]
+      - ["javax.script", "CompiledScript", "getEngine", "()", "summary", "df-generated"]
+      - ["javax.script", "ScriptContext", "getAttributesScope", "(String)", "summary", "df-generated"]
+      - ["javax.script", "ScriptContext", "getScopes", "()", "summary", "df-generated"]
+      - ["javax.script", "ScriptEngine", "eval", "(Reader)", "summary", "df-generated"]
+      - ["javax.script", "ScriptEngine", "eval", "(Reader,Bindings)", "summary", "df-generated"]
+      - ["javax.script", "ScriptEngine", "eval", "(String)", "summary", "df-generated"]
+      - ["javax.script", "ScriptEngine", "eval", "(String,Bindings)", "summary", "df-generated"]
+      - ["javax.script", "ScriptEngine", "put", "(String,Object)", "summary", "df-generated"]
+      - ["javax.script", "ScriptEngineManager", "ScriptEngineManager", "(ClassLoader)", "summary", "df-generated"]
+      - ["javax.script", "ScriptException", "getColumnNumber", "()", "summary", "df-generated"]
+      - ["javax.script", "ScriptException", "getLineNumber", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml b/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml
new file mode 100644
index 00000000000..ffb0e36d7b1
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.auth.callback.model.yml
@@ -0,0 +1,61 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "ChoiceCallback", "(String,String[],int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "ChoiceCallback", "(String,String[],int,boolean)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "getChoices", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,String[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,String[],int)", "", "Argument[2].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(String,int,int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "ConfirmationCallback", "(int,String[],int)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "getOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "LanguageCallback", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "LanguageCallback", True, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "NameCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "getDefaultName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "NameCallback", True, "setName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "PasswordCallback", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", True, "setPassword", "(char[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "TextInputCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "getDefaultText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "getPrompt", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "getText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextInputCallback", True, "setText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextOutputCallback", True, "TextOutputCallback", "(int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "TextOutputCallback", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "UnsupportedCallbackException", "(Callback,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.callback", "UnsupportedCallbackException", True, "getCallback", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.security.auth.callback", "CallbackHandler", "handle", "(Callback[])", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", "allowMultipleSelections", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", "getDefaultChoice", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", "getSelectedIndexes", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", "setSelectedIndex", "(int)", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ChoiceCallback", "setSelectedIndexes", "(int[])", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", "ConfirmationCallback", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", "getDefaultOption", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", "getMessageType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", "getOptionType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", "getSelectedIndex", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "ConfirmationCallback", "setSelectedIndex", "(int)", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", "clearPassword", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "PasswordCallback", "isEchoOn", "()", "summary", "df-generated"]
+      - ["javax.security.auth.callback", "TextOutputCallback", "getMessageType", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml b/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml
new file mode 100644
index 00000000000..8be4b007b84
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.auth.kerberos.model.yml
@@ -0,0 +1,65 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.auth.kerberos", "DelegationPermission", False, "DelegationPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "DelegationPermission", False, "DelegationPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "EncryptionKey", False, "EncryptionKey", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "KerberosCredMessage", "(KerberosPrincipal,KerberosPrincipal,byte[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getRecipient", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosCredMessage", False, "getSender", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,byte[],int,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "KerberosKey", "(KerberosPrincipal,char[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", True, "getPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "KerberosPrincipal", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", False, "getRealm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[10].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "KerberosTicket", "(byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getAuthTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getClient", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getClientAddresses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getEndTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getRenewTill", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getServer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getSessionKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", True, "getStartTime", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal,File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getInstance", "(KerberosPrincipal,File)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getKeys", "(KerberosPrincipal)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getPrincipal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", False, "getUnboundInstance", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.kerberos", "ServicePermission", False, "ServicePermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.security.auth.kerberos", "EncryptionKey", "getKeyType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", "getKeyType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosKey", "getVersionNumber", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosPrincipal", "getNameType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "getFlags", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "getSessionKeyType", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isForwardable", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isForwarded", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isInitial", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isPostdated", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isProxiable", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isProxy", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KerberosTicket", "isRenewable", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", "exists", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", "getUnboundInstance", "()", "summary", "df-generated"]
+      - ["javax.security.auth.kerberos", "KeyTab", "isBound", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.login.model.yml b/java/ql/lib/ext/generated/javax.security.auth.login.model.yml
new file mode 100644
index 00000000000..1779821afbf
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.auth.login.model.yml
@@ -0,0 +1,50 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.auth.login", "AccountException", True, "AccountException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AccountExpiredException", True, "AccountExpiredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AccountLockedException", True, "AccountLockedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AccountNotFoundException", True, "AccountNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "AppConfigurationEntry", "(String,AppConfigurationEntry$LoginModuleControlFlag,Map)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getControlFlag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getLoginModuleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "AppConfigurationEntry", True, "getOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getInstance", "(String,Configuration$Parameters,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "CredentialException", True, "CredentialException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "CredentialExpiredException", True, "CredentialExpiredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "CredentialNotFoundException", True, "CredentialNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "FailedLoginException", True, "FailedLoginException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,CallbackHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler,Configuration)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler,Configuration)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "LoginContext", "(String,Subject,CallbackHandler,Configuration)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", True, "getSubject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.login", "LoginException", True, "LoginException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.security.auth.login", "Configuration", "getAppConfigurationEntry", "(String)", "summary", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", "getConfiguration", "()", "summary", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", "refresh", "()", "summary", "df-generated"]
+      - ["javax.security.auth.login", "Configuration", "setConfiguration", "(Configuration)", "summary", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", "LoginContext", "(String)", "summary", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", "login", "()", "summary", "df-generated"]
+      - ["javax.security.auth.login", "LoginContext", "logout", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.model.yml b/java/ql/lib/ext/generated/javax.security.auth.model.yml
new file mode 100644
index 00000000000..435da160deb
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.auth.model.yml
@@ -0,0 +1,37 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.auth", "AuthPermission", False, "AuthPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth", "AuthPermission", False, "AuthPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth", "DestroyFailedException", True, "DestroyFailedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", False, "PrivateCredentialPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", False, "getCredentialClass", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "PrivateCredentialPermission", False, "getPrincipals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "RefreshFailedException", True, "RefreshFailedException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "doAs", "(Subject,PrivilegedAction)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "doAs", "(Subject,PrivilegedExceptionAction)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "doAsPrivileged", "(Subject,PrivilegedAction,AccessControlContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "doAsPrivileged", "(Subject,PrivilegedExceptionAction,AccessControlContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "getPrincipals", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "getPrivateCredentials", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "getPublicCredentials", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "Subject", False, "getSubject", "(AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth", "SubjectDomainCombiner", True, "SubjectDomainCombiner", "(Subject)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth", "SubjectDomainCombiner", True, "getSubject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.security.auth", "Destroyable", "destroy", "()", "summary", "df-generated"]
+      - ["javax.security.auth", "Destroyable", "isDestroyed", "()", "summary", "df-generated"]
+      - ["javax.security.auth", "Refreshable", "isCurrent", "()", "summary", "df-generated"]
+      - ["javax.security.auth", "Refreshable", "refresh", "()", "summary", "df-generated"]
+      - ["javax.security.auth", "Subject", "Subject", "(boolean,Set,Set,Set)", "summary", "df-generated"]
+      - ["javax.security.auth", "Subject", "getPrincipals", "(Class)", "summary", "df-generated"]
+      - ["javax.security.auth", "Subject", "getPrivateCredentials", "(Class)", "summary", "df-generated"]
+      - ["javax.security.auth", "Subject", "getPublicCredentials", "(Class)", "summary", "df-generated"]
+      - ["javax.security.auth", "Subject", "isReadOnly", "()", "summary", "df-generated"]
+      - ["javax.security.auth", "Subject", "setReadOnly", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml b/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml
new file mode 100644
index 00000000000..f2c6e64a21a
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.auth.x500.model.yml
@@ -0,0 +1,27 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.auth.x500", "X500Principal", False, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", False, "getName", "(String,Map)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "X500PrivateCredential", "(X509Certificate,PrivateKey,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getAlias", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getCertificate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.auth.x500", "X500PrivateCredential", False, "getPrivateKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.security.auth.x500", "X500Principal", "X500Principal", "(InputStream)", "summary", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", "X500Principal", "(String)", "summary", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", "X500Principal", "(String,Map)", "summary", "df-generated"]
+      - ["javax.security.auth.x500", "X500Principal", "X500Principal", "(byte[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.cert.model.yml b/java/ql/lib/ext/generated/javax.security.cert.model.yml
new file mode 100644
index 00000000000..5b06f3904db
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.cert.model.yml
@@ -0,0 +1,32 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.cert", "CertificateEncodingException", True, "CertificateEncodingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.cert", "CertificateException", True, "CertificateException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.cert", "CertificateExpiredException", True, "CertificateExpiredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.cert", "CertificateNotYetValidException", True, "CertificateNotYetValidException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.security.cert", "Certificate", "getEncoded", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "Certificate", "getPublicKey", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "Certificate", "verify", "(PublicKey)", "summary", "df-generated"]
+      - ["javax.security.cert", "Certificate", "verify", "(PublicKey,String)", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "checkValidity", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "checkValidity", "(Date)", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getInstance", "(InputStream)", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getInstance", "(byte[])", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getIssuerDN", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getNotAfter", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getNotBefore", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getSerialNumber", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getSigAlgName", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getSigAlgOID", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getSigAlgParams", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getSubjectDN", "()", "summary", "df-generated"]
+      - ["javax.security.cert", "X509Certificate", "getVersion", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.security.sasl.model.yml b/java/ql/lib/ext/generated/javax.security.sasl.model.yml
new file mode 100644
index 00000000000..b2b5c3ac25a
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.security.sasl.model.yml
@@ -0,0 +1,42 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.security.sasl", "AuthenticationException", True, "AuthenticationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthenticationException", True, "AuthenticationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthenticationException", True, "AuthenticationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "AuthorizeCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "AuthorizeCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthenticationID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthorizationID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "getAuthorizedID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", True, "setAuthorizedID", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "RealmCallback", True, "RealmCallback", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "RealmCallback", True, "RealmCallback", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "RealmCallback", True, "RealmCallback", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "RealmChoiceCallback", True, "RealmChoiceCallback", "(String,String[],int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "RealmChoiceCallback", True, "RealmChoiceCallback", "(String,String[],int,boolean)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslClient", "(String[],String,String,String,Map,CallbackHandler)", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "Sasl", True, "createSaslServer", "(String,String,String,Map,CallbackHandler)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslException", True, "SaslException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslException", True, "SaslException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.security.sasl", "SaslException", True, "SaslException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.security.sasl", "AuthorizeCallback", "isAuthorized", "()", "summary", "df-generated"]
+      - ["javax.security.sasl", "AuthorizeCallback", "setAuthorized", "(boolean)", "summary", "df-generated"]
+      - ["javax.security.sasl", "Sasl", "getSaslClientFactories", "()", "summary", "df-generated"]
+      - ["javax.security.sasl", "Sasl", "getSaslServerFactories", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.smartcardio.model.yml b/java/ql/lib/ext/generated/javax.smartcardio.model.yml
new file mode 100644
index 00000000000..232d7c3fc98
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.smartcardio.model.yml
@@ -0,0 +1,78 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.smartcardio", "ATR", False, "ATR", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "ATR", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "ATR", False, "getHistoricalBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardException", True, "CardException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardException", True, "CardException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardException", True, "CardException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardException", True, "CardException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardNotPresentException", True, "CardNotPresentException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardNotPresentException", True, "CardNotPresentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardNotPresentException", True, "CardNotPresentException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardNotPresentException", True, "CardNotPresentException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CardPermission", True, "CardPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[])", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int,int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "CommandAPDU", "(int,int,int,int,byte[],int,int,int)", "", "Argument[4]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", False, "ResponseAPDU", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", False, "getBytes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", False, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getInstance", "(String,Object,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", False, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.smartcardio", "Card", "beginExclusive", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "Card", "disconnect", "(boolean)", "summary", "df-generated"]
+      - ["javax.smartcardio", "Card", "endExclusive", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "Card", "getATR", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "Card", "getBasicChannel", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "Card", "getProtocol", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "Card", "openLogicalChannel", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "Card", "transmitControlCommand", "(int,byte[])", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardChannel", "close", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardChannel", "getCard", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardChannel", "getChannelNumber", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardChannel", "transmit", "(ByteBuffer,ByteBuffer)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardChannel", "transmit", "(CommandAPDU)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminal", "connect", "(String)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminal", "getName", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminal", "isCardPresent", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminal", "waitForCardAbsent", "(long)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminal", "waitForCardPresent", "(long)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminals", "getTerminal", "(String)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminals", "list", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminals", "list", "(CardTerminals$State)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminals", "waitForChange", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CardTerminals", "waitForChange", "(long)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "CommandAPDU", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "CommandAPDU", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "getCLA", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "getINS", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "getNc", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "getNe", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "getP1", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "CommandAPDU", "getP2", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", "getNr", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", "getSW1", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", "getSW2", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "ResponseAPDU", "getSW", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", "getDefault", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", "getDefaultType", "()", "summary", "df-generated"]
+      - ["javax.smartcardio", "TerminalFactory", "terminals", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.midi.model.yml b/java/ql/lib/ext/generated/javax.sound.midi.model.yml
new file mode 100644
index 00000000000..a2cb3589795
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sound.midi.model.yml
@@ -0,0 +1,96 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sound.midi", "Instrument", True, "getPatch", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "InvalidMidiDataException", True, "InvalidMidiDataException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MetaMessage", True, "MetaMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MetaMessage", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MetaMessage", True, "setMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice$Info", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice$Info", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice$Info", True, "getVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiDevice$Info", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiEvent", True, "MidiEvent", "(MidiMessage,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiEvent", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "MidiFileFormat", "(int,float,int,int,long,Map)", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", True, "properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiMessage", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiMessage", True, "setMessage", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", True, "getMidiDevice", "(MidiDevice$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", True, "getSoundbank", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", True, "getSoundbank", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "MidiUnavailableException", True, "MidiUnavailableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Sequence", True, "getTracks", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "SoundbankResource", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "SoundbankResource", True, "getSoundbank", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "SysexMessage", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "SysexMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "getData", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.midi", "SysexMessage", True, "setMessage", "(int,byte[],int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Track", True, "add", "(MidiEvent)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.midi", "Track", True, "get", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sound.midi", "MetaMessage", "getType", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiEvent", "getTick", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiEvent", "setTick", "(long)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", "MidiFileFormat", "(int,float,int,int,long)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", "getByteLength", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", "getDivisionType", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", "getMicrosecondLength", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", "getResolution", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiFileFormat", "getType", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiMessage", "getLength", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiMessage", "getStatus", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getMidiDeviceInfo", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getMidiFileFormat", "(File)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getMidiFileFormat", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getMidiFileFormat", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getMidiFileTypes", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getMidiFileTypes", "(Sequence)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getReceiver", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getSequence", "(File)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getSequence", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getSequence", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getSequencer", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getSequencer", "(boolean)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getSoundbank", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getSynthesizer", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "getTransmitter", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "isFileTypeSupported", "(int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "isFileTypeSupported", "(int,Sequence)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "write", "(Sequence,int,File)", "summary", "df-generated"]
+      - ["javax.sound.midi", "MidiSystem", "write", "(Sequence,int,OutputStream)", "summary", "df-generated"]
+      - ["javax.sound.midi", "Patch", "Patch", "(int,int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "Patch", "getBank", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Patch", "getProgram", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "Sequence", "(float,int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "Sequence", "(float,int,int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "createTrack", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "deleteTrack", "(Track)", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "getDivisionType", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "getMicrosecondLength", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "getPatchList", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "getResolution", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Sequence", "getTickLength", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "ShortMessage", "(int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "ShortMessage", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "ShortMessage", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "getChannel", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "getCommand", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "getData1", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "getData2", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "setMessage", "(int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "setMessage", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "ShortMessage", "setMessage", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.sound.midi", "SoundbankResource", "getData", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "SoundbankResource", "getDataClass", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Track", "remove", "(MidiEvent)", "summary", "df-generated"]
+      - ["javax.sound.midi", "Track", "size", "()", "summary", "df-generated"]
+      - ["javax.sound.midi", "Track", "ticks", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml b/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml
new file mode 100644
index 00000000000..2012851b25d
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sound.midi.spi.model.yml
@@ -0,0 +1,24 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sound.midi.spi", "MidiDeviceProvider", "getDevice", "(MidiDevice$Info)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiDeviceProvider", "getDeviceInfo", "()", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiDeviceProvider", "isDeviceSupported", "(MidiDevice$Info)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileReader", "getMidiFileFormat", "(File)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileReader", "getMidiFileFormat", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileReader", "getMidiFileFormat", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileReader", "getSequence", "(File)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileReader", "getSequence", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileReader", "getSequence", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileWriter", "getMidiFileTypes", "()", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileWriter", "getMidiFileTypes", "(Sequence)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileWriter", "isFileTypeSupported", "(int)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileWriter", "isFileTypeSupported", "(int,Sequence)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileWriter", "write", "(Sequence,int,File)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "MidiFileWriter", "write", "(Sequence,int,OutputStream)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "SoundbankReader", "getSoundbank", "(File)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "SoundbankReader", "getSoundbank", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.midi.spi", "SoundbankReader", "getSoundbank", "(URL)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.sampled.model.yml b/java/ql/lib/ext/generated/javax.sound.sampled.model.yml
new file mode 100644
index 00000000000..5721eb3dd21
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sound.sampled.model.yml
@@ -0,0 +1,128 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "Type", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "Type", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat$Type", True, "getExtension", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "AudioFileFormat", "(AudioFileFormat$Type,AudioFormat,int,Map)", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "getFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", True, "properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat$Encoding", True, "Encoding", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "AudioFormat", "(AudioFormat$Encoding,float,int,int,int,float,boolean,Map)", "", "Argument[7].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "getEncoding", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", True, "properties", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", True, "AudioInputStream", "(InputStream,AudioFormat,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", True, "AudioInputStream", "(InputStream,AudioFormat,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", True, "AudioInputStream", "(TargetDataLine)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", True, "getFormat", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioPermission", True, "AudioPermission", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioPermission", True, "AudioPermission", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat$Encoding,AudioInputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat$Encoding,AudioInputStream)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat,AudioInputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(AudioFormat,AudioInputStream)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getAudioInputStream", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getLine", "(Line$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getSourceDataLine", "(AudioFormat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getSourceDataLine", "(AudioFormat,Mixer$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getTargetDataLine", "(AudioFormat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getTargetDataLine", "(AudioFormat,Mixer$Info)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getTargetEncodings", "(AudioFormat$Encoding)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getTargetEncodings", "(AudioFormat)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", True, "getTargetFormats", "(AudioFormat$Encoding,AudioFormat)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "BooleanControl", True, "getStateLabel", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "CompoundControl", True, "getMemberControls", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Control", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "Info", "(Class,AudioFormat[],int,int)", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", True, "getFormats", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "EnumControl", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "EnumControl", True, "getValues", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "EnumControl", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", True, "getMaxLabel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", True, "getMidLabel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", True, "getMinLabel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", True, "getUnits", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "LineEvent", "(Line,LineEvent$Type,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "LineEvent", "(Line,LineEvent$Type,long)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "getLine", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "LineEvent", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "LineUnavailableException", True, "LineUnavailableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer$Info", True, "getDescription", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer$Info", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer$Info", True, "getVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Mixer$Info", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Port$Info", True, "Info", "(Class,String,boolean)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sound.sampled", "Port$Info", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "ReverbType", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sound.sampled", "UnsupportedAudioFileException", True, "UnsupportedAudioFileException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sound.sampled", "AudioFileFormat", "getByteLength", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFileFormat", "getFrameLength", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "AudioFormat", "(float,int,int,boolean,boolean)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "getChannels", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "getFrameRate", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "getFrameSize", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "getSampleRate", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "getSampleSizeInBits", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "isBigEndian", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioFormat", "matches", "(AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioInputStream", "getFrameLength", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getAudioFileFormat", "(File)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getAudioFileFormat", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getAudioFileFormat", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getAudioFileTypes", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getAudioFileTypes", "(AudioInputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getAudioInputStream", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getClip", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getClip", "(Mixer$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getMixer", "(Mixer$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getMixerInfo", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getSourceLineInfo", "(Line$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "getTargetLineInfo", "(Line$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "isConversionSupported", "(AudioFormat$Encoding,AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "isConversionSupported", "(AudioFormat,AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "isFileTypeSupported", "(AudioFileFormat$Type)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "isFileTypeSupported", "(AudioFileFormat$Type,AudioInputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "isLineSupported", "(Line$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "write", "(AudioInputStream,AudioFileFormat$Type,File)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "AudioSystem", "write", "(AudioInputStream,AudioFileFormat$Type,OutputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "BooleanControl", "getValue", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "BooleanControl", "setValue", "(boolean)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", "getMaxBufferSize", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", "getMinBufferSize", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "DataLine$Info", "isFormatSupported", "(AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", "getMaximum", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", "getMinimum", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", "getPrecision", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", "getUpdatePeriod", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", "getValue", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", "setValue", "(float)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "FloatControl", "shift", "(float,float,int)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "Line$Info", "Info", "(Class)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "Line$Info", "getLineClass", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "Line$Info", "matches", "(Line$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled", "LineEvent", "getFramePosition", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "Port$Info", "isSource", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "ReverbType", "getDecayTime", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "ReverbType", "getEarlyReflectionDelay", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "ReverbType", "getEarlyReflectionIntensity", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "ReverbType", "getLateReflectionDelay", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled", "ReverbType", "getLateReflectionIntensity", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml b/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml
new file mode 100644
index 00000000000..4fc6de066ef
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sound.sampled.spi.model.yml
@@ -0,0 +1,31 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioFileFormat", "(File)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioFileFormat", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioFileFormat", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioInputStream", "(File)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioInputStream", "(InputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileReader", "getAudioInputStream", "(URL)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", "getAudioFileTypes", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", "getAudioFileTypes", "(AudioInputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", "isFileTypeSupported", "(AudioFileFormat$Type)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", "isFileTypeSupported", "(AudioFileFormat$Type,AudioInputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", "write", "(AudioInputStream,AudioFileFormat$Type,File)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "AudioFileWriter", "write", "(AudioInputStream,AudioFileFormat$Type,OutputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getAudioInputStream", "(AudioFormat$Encoding,AudioInputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getAudioInputStream", "(AudioFormat,AudioInputStream)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getSourceEncodings", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getTargetEncodings", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getTargetEncodings", "(AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "getTargetFormats", "(AudioFormat$Encoding,AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "isConversionSupported", "(AudioFormat$Encoding,AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "isConversionSupported", "(AudioFormat,AudioFormat)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "isSourceEncodingSupported", "(AudioFormat$Encoding)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "FormatConversionProvider", "isTargetEncodingSupported", "(AudioFormat$Encoding)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "MixerProvider", "getMixer", "(Mixer$Info)", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "MixerProvider", "getMixerInfo", "()", "summary", "df-generated"]
+      - ["javax.sound.sampled.spi", "MixerProvider", "isMixerSupported", "(Mixer$Info)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.model.yml b/java/ql/lib/ext/generated/javax.sql.model.yml
new file mode 100644
index 00000000000..1e285d91311
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sql.model.yml
@@ -0,0 +1,43 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sql", "ConnectionEvent", True, "ConnectionEvent", "(PooledConnection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "ConnectionEvent", True, "ConnectionEvent", "(PooledConnection,SQLException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "ConnectionEvent", True, "ConnectionEvent", "(PooledConnection,SQLException)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "ConnectionEvent", True, "getSQLException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql", "RowSetEvent", True, "RowSetEvent", "(RowSet)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "StatementEvent", "(PooledConnection,PreparedStatement,SQLException)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "getSQLException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql", "StatementEvent", True, "getStatement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sql", "CommonDataSource", "createShardingKeyBuilder", "()", "summary", "df-generated"]
+      - ["javax.sql", "ConnectionPoolDataSource", "createPooledConnectionBuilder", "()", "summary", "df-generated"]
+      - ["javax.sql", "DataSource", "createConnectionBuilder", "()", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setAutoIncrement", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setCaseSensitive", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setCatalogName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setColumnCount", "(int)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setColumnDisplaySize", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setColumnLabel", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setColumnName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setColumnType", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setColumnTypeName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setCurrency", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setNullable", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setPrecision", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setScale", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setSchemaName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setSearchable", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setSigned", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql", "RowSetMetaData", "setTableName", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql", "XADataSource", "createXAConnectionBuilder", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.model.yml b/java/ql/lib/ext/generated/javax.sql.rowset.model.yml
new file mode 100644
index 00000000000..3382f5b2cb2
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sql.rowset.model.yml
@@ -0,0 +1,143 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sql.rowset", "BaseRowSet", True, "addRowSetListener", "(RowSetListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getCommand", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getDataSourceName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getParams", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getPassword", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getTypeMap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getUrl", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "getUsername", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setBytes", "(int,byte[])", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setCommand", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setDataSourceName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setDate", "(int,Date)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setObject", "(int,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setPassword", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setString", "(int,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setTime", "(int,Time)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setTimestamp", "(int,Timestamp)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setTypeMap", "(Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setUrl", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", True, "setUsername", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "RowSetProvider", True, "newFactory", "(String,ClassLoader)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "RowSetWarning", True, "RowSetWarning", "(String,String,int)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset", "RowSetWarning", True, "getNextWarning", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sql.rowset", "BaseRowSet", "clearParameters", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getConcurrency", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getEscapeProcessing", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getFetchDirection", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getFetchSize", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getMaxFieldSize", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getMaxRows", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getQueryTimeout", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getShowDeleted", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getTransactionIsolation", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "getType", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "isReadOnly", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "removeRowSetListener", "(RowSetListener)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setArray", "(int,Array)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setAsciiStream", "(String,InputStream)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setAsciiStream", "(String,InputStream,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setAsciiStream", "(int,InputStream)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setAsciiStream", "(int,InputStream,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBigDecimal", "(String,BigDecimal)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBigDecimal", "(int,BigDecimal)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBinaryStream", "(String,InputStream)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBinaryStream", "(String,InputStream,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBinaryStream", "(int,InputStream)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBinaryStream", "(int,InputStream,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBlob", "(String,Blob)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBlob", "(String,InputStream)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBlob", "(String,InputStream,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBlob", "(int,Blob)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBlob", "(int,InputStream)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBlob", "(int,InputStream,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBoolean", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBoolean", "(int,boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setByte", "(String,byte)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setByte", "(int,byte)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setBytes", "(String,byte[])", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setCharacterStream", "(String,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setCharacterStream", "(String,Reader,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setCharacterStream", "(int,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setCharacterStream", "(int,Reader,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setClob", "(String,Clob)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setClob", "(String,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setClob", "(String,Reader,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setClob", "(int,Clob)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setClob", "(int,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setClob", "(int,Reader,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setConcurrency", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setDate", "(String,Date)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setDate", "(String,Date,Calendar)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setDate", "(int,Date,Calendar)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setDouble", "(String,double)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setDouble", "(int,double)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setEscapeProcessing", "(boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setFetchDirection", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setFetchSize", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setFloat", "(String,float)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setFloat", "(int,float)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setInt", "(String,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setInt", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setLong", "(String,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setLong", "(int,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setMaxFieldSize", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setMaxRows", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNCharacterStream", "(String,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNCharacterStream", "(String,Reader,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNCharacterStream", "(int,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNCharacterStream", "(int,Reader,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNClob", "(String,NClob)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNClob", "(String,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNClob", "(String,Reader,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNClob", "(int,NClob)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNClob", "(int,Reader)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNClob", "(int,Reader,long)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNString", "(String,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNString", "(int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNull", "(String,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNull", "(String,int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNull", "(int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setNull", "(int,int,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setObject", "(String,Object)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setObject", "(String,Object,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setObject", "(String,Object,int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setObject", "(int,Object,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setObject", "(int,Object,int,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setQueryTimeout", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setReadOnly", "(boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setRef", "(int,Ref)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setRowId", "(String,RowId)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setRowId", "(int,RowId)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setSQLXML", "(String,SQLXML)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setSQLXML", "(int,SQLXML)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setShort", "(String,short)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setShort", "(int,short)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setShowDeleted", "(boolean)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setString", "(String,String)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setTime", "(String,Time)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setTime", "(String,Time,Calendar)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setTime", "(int,Time,Calendar)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setTimestamp", "(String,Timestamp)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setTimestamp", "(String,Timestamp,Calendar)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setTimestamp", "(int,Timestamp,Calendar)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setTransactionIsolation", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setType", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setURL", "(int,URL)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "BaseRowSet", "setUnicodeStream", "(int,InputStream,int)", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetProvider", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset", "RowSetWarning", "setNextWarning", "(RowSetWarning)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml b/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml
new file mode 100644
index 00000000000..f460c159312
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sql.rowset.serial.model.yml
@@ -0,0 +1,29 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "SQLInputImpl", "(Object[],Map)", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLInputImpl", True, "SQLInputImpl", "(Object[],Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", True, "SQLOutputImpl", "(Vector,Map)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SQLOutputImpl", True, "SQLOutputImpl", "(Vector,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", True, "SerialArray", "(Array)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialArray", True, "SerialArray", "(Array,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialBlob", True, "SerialBlob", "(Blob)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", True, "SerialClob", "(Clob)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialDatalink", True, "SerialDatalink", "(URL)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialDatalink", True, "getDatalink", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialException", True, "SerialException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialJavaObject", True, "SerialJavaObject", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialJavaObject", True, "getObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialRef", True, "SerialRef", "(Ref)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialStruct", True, "SerialStruct", "(Struct,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sql.rowset.serial", "SerialBlob", "SerialBlob", "(byte[])", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialClob", "SerialClob", "(char[])", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialJavaObject", "getFields", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.serial", "SerialStruct", "SerialStruct", "(SQLData,Map)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml b/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml
new file mode 100644
index 00000000000..4750381cd8c
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.sql.rowset.spi.model.yml
@@ -0,0 +1,33 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.sql.rowset.spi", "SyncFactory", True, "setLogger", "(Logger,Level)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactoryException", True, "SyncFactoryException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", True, "getProviderID", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", True, "getVendor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", True, "getVersion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProviderException", True, "SyncProviderException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProviderException", True, "SyncProviderException", "(SyncResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProviderException", True, "getSyncResolver", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProviderException", True, "setSyncResolver", "(SyncResolver)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.sql.rowset.spi", "SyncFactory", "getInstance", "(String)", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", "getLogger", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", "getRegisteredProviders", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", "getSyncFactory", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", "registerProvider", "(String)", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", "setJNDIContext", "(Context)", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", "setLogger", "(Logger)", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncFactory", "unregisterProvider", "(String)", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", "getDataSourceLock", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", "getProviderGrade", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", "getRowSetReader", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", "getRowSetWriter", "()", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", "setDataSourceLock", "(int)", "summary", "df-generated"]
+      - ["javax.sql.rowset.spi", "SyncProvider", "supportsUpdatableView", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.tools.model.yml b/java/ql/lib/ext/generated/javax.tools.model.yml
new file mode 100644
index 00000000000..d68f04440e7
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.tools.model.yml
@@ -0,0 +1,68 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.tools", "DiagnosticCollector", False, "getDiagnostics", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "FileObject", True, "getCharContent", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "FileObject", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "FileObject", True, "openInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "FileObject", True, "openOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "FileObject", True, "openReader", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "FileObject", True, "openWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "FileObject", True, "toUri", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForInput", "(JavaFileManager$Location,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForInput", "(JavaFileManager$Location,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForInput", "(JavaFileManager$Location,String,String)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getFileForOutput", "(JavaFileManager$Location,String,String,FileObject)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForInput", "(JavaFileManager$Location,String,JavaFileObject$Kind)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForInput", "(JavaFileManager$Location,String,JavaFileObject$Kind)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getJavaFileForOutput", "(JavaFileManager$Location,String,JavaFileObject$Kind,FileObject)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "getLocationForModule", "(JavaFileManager$Location,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "inferBinaryName", "(JavaFileManager$Location,JavaFileObject)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "inferModuleName", "(JavaFileManager$Location)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "JavaFileManager", True, "list", "(JavaFileManager$Location,String,Set,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjects", "(Path[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromPaths", "(Collection)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromPaths", "(Iterable)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", True, "getJavaFileObjectsFromPaths", "(Iterable)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.tools", "StandardLocation", False, "locationFor", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.tools", "FileObject", "delete", "()", "summary", "df-generated"]
+      - ["javax.tools", "FileObject", "getLastModified", "()", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager$Location", "getName", "()", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager$Location", "isModuleOrientedLocation", "()", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager$Location", "isOutputLocation", "()", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "contains", "(JavaFileManager$Location,FileObject)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "getClassLoader", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "getLocationForModule", "(JavaFileManager$Location,JavaFileObject)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "getServiceLoader", "(JavaFileManager$Location,Class)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "handleOption", "(String,Iterator)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "hasLocation", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "isSameFile", "(FileObject,FileObject)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileManager", "listLocationsForModules", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileObject", "getAccessLevel", "()", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileObject", "getKind", "()", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileObject", "getNestingKind", "()", "summary", "df-generated"]
+      - ["javax.tools", "JavaFileObject", "isNameCompatible", "(String,JavaFileObject$Kind)", "summary", "df-generated"]
+      - ["javax.tools", "OptionChecker", "isSupportedOption", "(String)", "summary", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", "asPath", "(FileObject)", "summary", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", "getLocationAsPaths", "(JavaFileManager$Location)", "summary", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", "setLocationForModule", "(JavaFileManager$Location,String,Collection)", "summary", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", "setLocationFromPaths", "(JavaFileManager$Location,Collection)", "summary", "df-generated"]
+      - ["javax.tools", "StandardJavaFileManager", "setPathFactory", "(StandardJavaFileManager$PathFactory)", "summary", "df-generated"]
+      - ["javax.tools", "Tool", "name", "()", "summary", "df-generated"]
+      - ["javax.tools", "ToolProvider", "getSystemDocumentationTool", "()", "summary", "df-generated"]
+      - ["javax.tools", "ToolProvider", "getSystemJavaCompiler", "()", "summary", "df-generated"]
+      - ["javax.tools", "ToolProvider", "getSystemToolClassLoader", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.transaction.xa.model.yml b/java/ql/lib/ext/generated/javax.transaction.xa.model.yml
new file mode 100644
index 00000000000..ce267904e5d
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.transaction.xa.model.yml
@@ -0,0 +1,12 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.transaction.xa", "XAException", True, "XAException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.transaction.xa", "XAException", "XAException", "(int)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.catalog.model.yml b/java/ql/lib/ext/generated/javax.xml.catalog.model.yml
new file mode 100644
index 00000000000..bdce521147c
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.catalog.model.yml
@@ -0,0 +1,30 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.catalog", "CatalogException", True, "CatalogException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogException", True, "CatalogException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogException", True, "CatalogException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures$Builder", True, "with", "(CatalogFeatures$Feature,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures$Builder", True, "with", "(CatalogFeatures$Feature,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures", True, "get", "(CatalogFeatures$Feature)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogManager", False, "catalog", "(CatalogFeatures,URI[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogManager", False, "catalog", "(CatalogFeatures,URI[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogManager", False, "catalogResolver", "(Catalog)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogManager", False, "catalogResolver", "(CatalogFeatures,URI[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.catalog", "CatalogManager", False, "catalogResolver", "(CatalogFeatures,URI[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.catalog", "Catalog", "catalogs", "()", "summary", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures$Builder", "build", "()", "summary", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures$Feature", "defaultValue", "()", "summary", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures$Feature", "getPropertyName", "()", "summary", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures", "builder", "()", "summary", "df-generated"]
+      - ["javax.xml.catalog", "CatalogFeatures", "defaults", "()", "summary", "df-generated"]
+      - ["javax.xml.catalog", "GroupEntry$PreferType", "prefer", "(String)", "summary", "df-generated"]
+      - ["javax.xml.catalog", "GroupEntry$ResolveType", "getType", "(String)", "summary", "df-generated"]
+      - ["javax.xml.catalog", "GroupEntry$ResolveType", "isType", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml
new file mode 100644
index 00000000000..a2933bbf4c2
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dom.model.yml
@@ -0,0 +1,11 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "getElementById", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "iterator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dom", "DOMCryptoContext", True, "setIdAttributeNS", "(Element,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dom", "DOMStructure", True, "DOMStructure", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dom", "DOMStructure", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml
new file mode 100644
index 00000000000..719eccf3822
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.dom.model.yml
@@ -0,0 +1,26 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(Key,Node,Node)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "DOMSignContext", "(KeySelector,Node,Node)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "getNextSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "setNextSibling", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMSignContext", True, "setParent", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(Key,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(Key,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(KeySelector,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "DOMValidateContext", "(KeySelector,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.dom", "DOMValidateContext", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml
new file mode 100644
index 00000000000..87e2099b5d0
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.keyinfo.model.yml
@@ -0,0 +1,31 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getMechanismType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "getURIDereferencer", "()", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "isFeatureSupported", "(String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyInfo", "(List)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyInfo", "(List,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyName", "(String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newKeyValue", "(PublicKey)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newPGPData", "(byte[])", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newPGPData", "(byte[],List)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newPGPData", "(byte[],byte[],List)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newRetrievalMethod", "(String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newRetrievalMethod", "(String,String,List)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newX509Data", "(List)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "newX509IssuerSerial", "(String,BigInteger)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.keyinfo", "KeyInfoFactory", "unmarshalKeyInfo", "(XMLStructure)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml
new file mode 100644
index 00000000000..ced7da4a1cc
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.model.yml
@@ -0,0 +1,61 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformException", True, "TransformException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getInstance", "(String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getMechanismType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureException", True, "XMLSignatureException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getKeyInfoFactory", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getMechanismType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.crypto.dsig", "TransformService", "init", "(TransformParameterSpec)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", "init", "(XMLStructure,XMLCryptoContext)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "TransformService", "marshalParams", "(XMLStructure,XMLCryptoContext)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "getInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "getURIDereferencer", "()", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "isFeatureSupported", "(String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newCanonicalizationMethod", "(String,C14NMethodParameterSpec)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newCanonicalizationMethod", "(String,XMLStructure)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newDigestMethod", "(String,DigestMethodParameterSpec)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newManifest", "(List)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newManifest", "(List,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod,List,Data,List,String,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod,List,String,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newReference", "(String,DigestMethod,List,String,String,byte[])", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignatureMethod", "(String,SignatureMethodParameterSpec)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignatureProperties", "(List,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignatureProperty", "(List,String,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newSignedInfo", "(CanonicalizationMethod,SignatureMethod,List,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newTransform", "(String,TransformParameterSpec)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newTransform", "(String,XMLStructure)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newXMLObject", "(List,String,String,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newXMLSignature", "(SignedInfo,KeyInfo)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "newXMLSignature", "(SignedInfo,KeyInfo,List,String,String)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "unmarshalXMLSignature", "(XMLStructure)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig", "XMLSignatureFactory", "unmarshalXMLSignature", "(XMLValidateContext)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml
new file mode 100644
index 00000000000..c93065e77e3
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.dsig.spec.model.yml
@@ -0,0 +1,33 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.crypto.dsig.spec", "ExcC14NParameterSpec", False, "ExcC14NParameterSpec", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "ExcC14NParameterSpec", False, "getPrefixList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "RSAPSSParameterSpec", False, "RSAPSSParameterSpec", "(PSSParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "RSAPSSParameterSpec", False, "getPSSParameterSpec", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilter2ParameterSpec", False, "XPathFilter2ParameterSpec", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilter2ParameterSpec", False, "getXPathList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "XPathFilterParameterSpec", "(String,Map)", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "getNamespaceMap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathFilterParameterSpec", False, "getXPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "XPathType", "(String,XPathType$Filter,Map)", "", "Argument[2].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getExpression", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getFilter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XPathType", True, "getNamespaceMap", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XSLTTransformParameterSpec", False, "XSLTTransformParameterSpec", "(XMLStructure)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "XSLTTransformParameterSpec", False, "getStylesheet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.crypto.dsig.spec", "HMACParameterSpec", "HMACParameterSpec", "(int)", "summary", "df-generated"]
+      - ["javax.xml.crypto.dsig.spec", "HMACParameterSpec", "getOutputLength", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.crypto.model.yml b/java/ql/lib/ext/generated/javax.xml.crypto.model.yml
new file mode 100644
index 00000000000..ec58522b0ab
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.crypto.model.yml
@@ -0,0 +1,63 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.crypto", "AlgorithmMethod", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "KeySelector", True, "singletonKeySelector", "(Key)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "KeySelectorException", True, "KeySelectorException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "KeySelectorException", True, "KeySelectorException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "KeySelectorException", True, "KeySelectorException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "KeySelectorException", True, "KeySelectorException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "MarshalException", True, "MarshalException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "MarshalException", True, "MarshalException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "MarshalException", True, "MarshalException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "MarshalException", True, "MarshalException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "NoSuchMechanismException", True, "NoSuchMechanismException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "NoSuchMechanismException", True, "NoSuchMechanismException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "NoSuchMechanismException", True, "NoSuchMechanismException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "NoSuchMechanismException", True, "NoSuchMechanismException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "OctetStreamData", "(InputStream,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "getMimeType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "getOctetStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "OctetStreamData", True, "getURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable,URIReference)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable,URIReference)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(String,Throwable,URIReference)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "URIReferenceException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "URIReferenceException", True, "getURIReference", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "get", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getBaseURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getDefaultNamespacePrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getKeySelector", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getNamespacePrefix", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getNamespacePrefix", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getProperty", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "getURIDereferencer", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "put", "(Object,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "put", "(Object,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "put", "(Object,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "putNamespacePrefix", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "setBaseURI", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "setDefaultNamespacePrefix", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "setKeySelector", "(KeySelector)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "setProperty", "(String,Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.crypto", "XMLCryptoContext", True, "setURIDereferencer", "(URIDereferencer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.crypto", "KeySelector", "select", "(KeyInfo,KeySelector$Purpose,AlgorithmMethod,XMLCryptoContext)", "summary", "df-generated"]
+      - ["javax.xml.crypto", "KeySelectorResult", "getKey", "()", "summary", "df-generated"]
+      - ["javax.xml.crypto", "XMLStructure", "isFeatureSupported", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.datatype.model.yml b/java/ql/lib/ext/generated/javax.xml.datatype.model.yml
new file mode 100644
index 00000000000..ea6d6f45c78
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.datatype.model.yml
@@ -0,0 +1,97 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.datatype", "DatatypeConfigurationException", True, "DatatypeConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeConfigurationException", True, "DatatypeConfigurationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeConfigurationException", True, "DatatypeConfigurationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeConfigurationException", True, "DatatypeConfigurationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.datatype", "DatatypeConstants$Field", "getId", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDefaultInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDuration", "(String)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDuration", "(boolean,BigInteger,BigInteger,BigInteger,BigInteger,BigInteger,BigDecimal)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDuration", "(boolean,int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDuration", "(long)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationDayTime", "(String)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationDayTime", "(boolean,BigInteger,BigInteger,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationDayTime", "(boolean,int,int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationDayTime", "(long)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationYearMonth", "(String)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationYearMonth", "(boolean,BigInteger,BigInteger)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationYearMonth", "(boolean,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newDurationYearMonth", "(long)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendar", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendar", "(BigInteger,int,int,int,int,int,BigDecimal,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendar", "(GregorianCalendar)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendar", "(String)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendar", "(int,int,int,int,int,int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendarDate", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendarTime", "(int,int,int,BigDecimal,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendarTime", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "DatatypeFactory", "newXMLGregorianCalendarTime", "(int,int,int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "add", "(Duration)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "addTo", "(Calendar)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "addTo", "(Date)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "compare", "(Duration)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getDays", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getField", "(DatatypeConstants$Field)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getHours", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getMinutes", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getMonths", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getSeconds", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getSign", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getTimeInMillis", "(Calendar)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getTimeInMillis", "(Date)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getXMLSchemaType", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "getYears", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "isLongerThan", "(Duration)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "isSet", "(DatatypeConstants$Field)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "isShorterThan", "(Duration)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "multiply", "(BigDecimal)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "multiply", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "negate", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "normalizeWith", "(Calendar)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "Duration", "subtract", "(Duration)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "add", "(Duration)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "clear", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "compare", "(XMLGregorianCalendar)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getDay", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getEon", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getEonAndYear", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getFractionalSecond", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getHour", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getMillisecond", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getMinute", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getMonth", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getSecond", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getTimeZone", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getTimezone", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getXMLSchemaType", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "getYear", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "isValid", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "normalize", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "reset", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setDay", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setFractionalSecond", "(BigDecimal)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setHour", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setMillisecond", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setMinute", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setMonth", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setSecond", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setTime", "(int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setTime", "(int,int,int,BigDecimal)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setTime", "(int,int,int,int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setTimezone", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setYear", "(BigInteger)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "setYear", "(int)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "toGregorianCalendar", "()", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "toGregorianCalendar", "(TimeZone,Locale,XMLGregorianCalendar)", "summary", "df-generated"]
+      - ["javax.xml.datatype", "XMLGregorianCalendar", "toXMLFormat", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.namespace.model.yml b/java/ql/lib/ext/generated/javax.xml.namespace.model.yml
new file mode 100644
index 00000000000..452e79f45bd
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.namespace.model.yml
@@ -0,0 +1,16 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.namespace", "QName", True, "QName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "QName", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "getLocalPart", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "getNamespaceURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "getPrefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.namespace", "QName", True, "valueOf", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.parsers.model.yml b/java/ql/lib/ext/generated/javax.xml.parsers.model.yml
new file mode 100644
index 00000000000..885b668c180
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.parsers.model.yml
@@ -0,0 +1,93 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(File)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(InputStream)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(InputStream,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", True, "parse", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "FactoryConfigurationError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.parsers", "ParserConfigurationException", True, "ParserConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(File,DefaultHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(File,HandlerBase)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,DefaultHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,DefaultHandler,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,HandlerBase)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(InputStream,HandlerBase,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(String,DefaultHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", True, "parse", "(String,HandlerBase)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.parsers", "DocumentBuilder", "getDOMImplementation", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "getSchema", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "isNamespaceAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "isValidating", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "isXIncludeAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "newDocument", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "parse", "(InputSource)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "reset", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "setEntityResolver", "(EntityResolver)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilder", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "getAttribute", "(String)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "getFeature", "(String)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "getSchema", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "isCoalescing", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "isExpandEntityReferences", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "isIgnoringComments", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "isIgnoringElementContentWhitespace", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "isNamespaceAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "isValidating", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "isXIncludeAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "newDefaultInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "newDefaultNSInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "newDocumentBuilder", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "newNSInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "newNSInstance", "(String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setAttribute", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setCoalescing", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setExpandEntityReferences", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setIgnoringComments", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setIgnoringElementContentWhitespace", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setNamespaceAware", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setSchema", "(Schema)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setValidating", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "DocumentBuilderFactory", "setXIncludeAware", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "getParser", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "getSchema", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "getXMLReader", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "isNamespaceAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "isValidating", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "isXIncludeAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "parse", "(InputSource,DefaultHandler)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "parse", "(InputSource,HandlerBase)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "reset", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParser", "setProperty", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "getFeature", "(String)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "getSchema", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "isNamespaceAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "isValidating", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "isXIncludeAware", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "newDefaultInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "newDefaultNSInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "newNSInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "newNSInstance", "(String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "newSAXParser", "()", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "setNamespaceAware", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "setSchema", "(Schema)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "setValidating", "(boolean)", "summary", "df-generated"]
+      - ["javax.xml.parsers", "SAXParserFactory", "setXIncludeAware", "(boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.stream.model.yml b/java/ql/lib/ext/generated/javax.xml.stream.model.yml
new file mode 100644
index 00000000000..86ce369cf51
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.stream.model.yml
@@ -0,0 +1,156 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String,Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "FactoryConfigurationError", "(String,Exception)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "FactoryConfigurationError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "newFactory", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", True, "newInstance", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventReader", True, "nextEvent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventReader", True, "nextTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLEventReader", True, "peek", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "newFactory", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", True, "newInstance", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "newFactory", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", True, "newInstance", "(String,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Location,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "XMLStreamException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "getLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamException", True, "getNestedException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", True, "getElementText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", True, "getNamespaceContext", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", True, "getText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.stream", "XMLEventFactory", "createAttribute", "(QName,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createAttribute", "(String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createAttribute", "(String,String,String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createCData", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createCharacters", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createComment", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createDTD", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createEndDocument", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createEndElement", "(QName,Iterator)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createEndElement", "(String,String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createEndElement", "(String,String,String,Iterator)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createEntityReference", "(String,EntityDeclaration)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createIgnorableSpace", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createNamespace", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createNamespace", "(String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createProcessingInstruction", "(String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createSpace", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "(String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartDocument", "(String,String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(QName,Iterator,Iterator)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(String,String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(String,String,String,Iterator,Iterator)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "createStartElement", "(String,String,String,Iterator,Iterator,NamespaceContext)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "newDefaultFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventFactory", "setLocation", "(Location)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventReader", "close", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventReader", "getElementText", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLEventReader", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createFilteredReader", "(XMLEventReader,EventFilter)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createFilteredReader", "(XMLStreamReader,StreamFilter)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(InputStream)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(InputStream,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(Reader)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(Source)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(String,InputStream)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(String,Reader)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLEventReader", "(XMLStreamReader)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(InputStream)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(InputStream,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(Reader)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(Source)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(String,InputStream)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "createXMLStreamReader", "(String,Reader)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "getEventAllocator", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "getXMLReporter", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "getXMLResolver", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "isPropertySupported", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "newDefaultFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "setEventAllocator", "(XMLEventAllocator)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "setProperty", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "setXMLReporter", "(XMLReporter)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLInputFactory", "setXMLResolver", "(XMLResolver)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(OutputStream)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(OutputStream,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(Result)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLEventWriter", "(Writer)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(OutputStream)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(OutputStream,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(Result)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "createXMLStreamWriter", "(Writer)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "isPropertySupported", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "newDefaultFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "newFactory", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLOutputFactory", "setProperty", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLResolver", "resolveEntity", "(String,String,String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "close", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributeCount", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributeLocalName", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributeName", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributeNamespace", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributePrefix", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributeType", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributeValue", "(String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getAttributeValue", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getCharacterEncodingScheme", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getEncoding", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getEventType", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getLocalName", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getLocation", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getName", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceCount", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getNamespacePrefix", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceURI", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceURI", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getNamespaceURI", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getPIData", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getPITarget", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getPrefix", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getTextCharacters", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getTextCharacters", "(int,char[],int,int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getTextLength", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getTextStart", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "getVersion", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "hasName", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "hasNext", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "hasText", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "isAttributeSpecified", "(int)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "isCharacters", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "isEndElement", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "isStandalone", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "isStartElement", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "isWhiteSpace", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "next", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "nextTag", "()", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "require", "(int,String,String)", "summary", "df-generated"]
+      - ["javax.xml.stream", "XMLStreamReader", "standaloneSet", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml b/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml
new file mode 100644
index 00000000000..e4485a47e75
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.stream.util.model.yml
@@ -0,0 +1,12 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.stream.util", "EventReaderDelegate", True, "EventReaderDelegate", "(XMLEventReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream.util", "EventReaderDelegate", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.util", "EventReaderDelegate", True, "setParent", "(XMLEventReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "StreamReaderDelegate", "(XMLStreamReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.stream.util", "StreamReaderDelegate", True, "setParent", "(XMLStreamReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml
new file mode 100644
index 00000000000..de450418d67
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.transform.dom.model.yml
@@ -0,0 +1,23 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,Node,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "DOMResult", "(Node,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "getNextSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "setNextSibling", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMResult", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "DOMSource", "(Node,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "getNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.dom", "DOMSource", True, "setNode", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.model.yml
new file mode 100644
index 00000000000..589ccbc1d36
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.transform.model.yml
@@ -0,0 +1,74 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.transform", "Result", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Result", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "Source", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "Source", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,SourceLocator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,SourceLocator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,SourceLocator,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,SourceLocator,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,SourceLocator,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerConfigurationException", True, "TransformerConfigurationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,SourceLocator,Throwable)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "TransformerException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "getLocationAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "getLocator", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "getMessageAndLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerException", True, "setLocator", "(SourceLocator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(Exception,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "TransformerFactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactoryConfigurationError", True, "getException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "URIResolver", True, "resolve", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "URIResolver", True, "resolve", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform", "URIResolver", True, "resolve", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.transform", "Source", "isEmpty", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "clearParameters", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "getErrorListener", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "getOutputProperties", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "getOutputProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "getParameter", "(String)", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "getURIResolver", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "reset", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "setErrorListener", "(ErrorListener)", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "setOutputProperties", "(Properties)", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "setOutputProperty", "(String,String)", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "setParameter", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "setURIResolver", "(URIResolver)", "summary", "df-generated"]
+      - ["javax.xml.transform", "Transformer", "transform", "(Source,Result)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "getAssociatedStylesheet", "(Source,String,String,String)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "getAttribute", "(String)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "getErrorListener", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "getFeature", "(String)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "getURIResolver", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "newDefaultInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "newInstance", "(String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "newTemplates", "(Source)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "newTransformer", "()", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "newTransformer", "(Source)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "setAttribute", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "setErrorListener", "(ErrorListener)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.transform", "TransformerFactory", "setURIResolver", "(URIResolver)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml
new file mode 100644
index 00000000000..cd02ad21d93
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.transform.sax.model.yml
@@ -0,0 +1,24 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.transform.sax", "SAXResult", True, "SAXResult", "(ContentHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "getHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "getLexicalHandler", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "setHandler", "(ContentHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXResult", True, "setLexicalHandler", "(LexicalHandler)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", True, "getXMLReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", True, "setInputSource", "(InputSource)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXSource", True, "setXMLReader", "(XMLReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTemplatesHandler", "()", "summary", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTransformerHandler", "()", "summary", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTransformerHandler", "(Source)", "summary", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newTransformerHandler", "(Templates)", "summary", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newXMLFilter", "(Source)", "summary", "df-generated"]
+      - ["javax.xml.transform.sax", "SAXTransformerFactory", "newXMLFilter", "(Templates)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml
new file mode 100644
index 00000000000..25ca3d5c8cf
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.transform.stax.model.yml
@@ -0,0 +1,14 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.transform.stax", "StAXResult", True, "StAXResult", "(XMLEventWriter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", True, "StAXResult", "(XMLStreamWriter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", True, "getXMLEventWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXResult", True, "getXMLStreamWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "StAXSource", "(XMLEventReader)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "StAXSource", "(XMLStreamReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "getXMLEventReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stax", "StAXSource", True, "getXMLStreamReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml b/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml
new file mode 100644
index 00000000000..c7d28706810
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.transform.stream.model.yml
@@ -0,0 +1,21 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "StreamResult", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "getWriter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "setOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "setSystemId", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamResult", True, "setWriter", "(Writer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "getPublicId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "getReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setInputStream", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setPublicId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setReader", "(Reader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.transform.stream", "StreamSource", True, "setSystemId", "(File)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.validation.model.yml b/java/ql/lib/ext/generated/javax.xml.validation.model.yml
new file mode 100644
index 00000000000..328462437dc
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.validation.model.yml
@@ -0,0 +1,60 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactoryConfigurationError", False, "SchemaFactoryConfigurationError", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.validation", "Validator", True, "validate", "(Source)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.validation", "Schema", "newValidator", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "Schema", "newValidatorHandler", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "getErrorHandler", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "getFeature", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "getResourceResolver", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "isSchemaLanguageSupported", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newDefaultInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newInstance", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newInstance", "(String,String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newSchema", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newSchema", "(File)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newSchema", "(Source)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newSchema", "(Source[])", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "newSchema", "(URL)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "setProperty", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactory", "setResourceResolver", "(LSResourceResolver)", "summary", "df-generated"]
+      - ["javax.xml.validation", "SchemaFactoryLoader", "newFactory", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "TypeInfoProvider", "getAttributeTypeInfo", "(int)", "summary", "df-generated"]
+      - ["javax.xml.validation", "TypeInfoProvider", "getElementTypeInfo", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "TypeInfoProvider", "isIdAttribute", "(int)", "summary", "df-generated"]
+      - ["javax.xml.validation", "TypeInfoProvider", "isSpecified", "(int)", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "getErrorHandler", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "getFeature", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "getResourceResolver", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "reset", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "setFeature", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "setProperty", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "setResourceResolver", "(LSResourceResolver)", "summary", "df-generated"]
+      - ["javax.xml.validation", "Validator", "validate", "(Source,Result)", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "getContentHandler", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "getErrorHandler", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "getFeature", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "getProperty", "(String)", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "getResourceResolver", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "getTypeInfoProvider", "()", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "setContentHandler", "(ContentHandler)", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "setErrorHandler", "(ErrorHandler)", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "setFeature", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "setProperty", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.validation", "ValidatorHandler", "setResourceResolver", "(LSResourceResolver)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.xml.xpath.model.yml b/java/ql/lib/ext/generated/javax.xml.xpath.model.yml
new file mode 100644
index 00000000000..4cef7e1a19e
--- /dev/null
+++ b/java/ql/lib/ext/generated/javax.xml.xpath.model.yml
@@ -0,0 +1,37 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.xml.xpath", "XPathException", True, "XPathException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathException", True, "XPathException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(InputSource)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(InputSource,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpression", True, "evaluateExpression", "(Object,Class)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpressionException", True, "XPathExpressionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathExpressionException", True, "XPathExpressionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactoryConfigurationException", True, "XPathFactoryConfigurationException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactoryConfigurationException", True, "XPathFactoryConfigurationException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathFunctionException", True, "XPathFunctionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["javax.xml.xpath", "XPathFunctionException", True, "XPathFunctionException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.xml.xpath", "XPath", "evaluateExpression", "(String,InputSource)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPath", "evaluateExpression", "(String,InputSource,Class)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPath", "evaluateExpression", "(String,Object)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPath", "evaluateExpression", "(String,Object,Class)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathEvaluationResult$XPathResultType", "getQNameType", "(Class)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "getFeature", "(String)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "isObjectModelSupported", "(String)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "newDefaultInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "newInstance", "()", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "newInstance", "(String)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "newInstance", "(String,String,ClassLoader)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "newXPath", "()", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "setFeature", "(String,boolean)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "setXPathFunctionResolver", "(XPathFunctionResolver)", "summary", "df-generated"]
+      - ["javax.xml.xpath", "XPathFactory", "setXPathVariableResolver", "(XPathVariableResolver)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml b/java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml
new file mode 100644
index 00000000000..5cfddbd9303
--- /dev/null
+++ b/java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml
@@ -0,0 +1,10 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["jdk.internal.access.foreign", "UnmapperProxy", "address", "()", "summary", "df-generated"]
+      - ["jdk.internal.access.foreign", "UnmapperProxy", "fileDescriptor", "()", "summary", "df-generated"]
+      - ["jdk.internal.access.foreign", "UnmapperProxy", "isSync", "()", "summary", "df-generated"]
+      - ["jdk.internal.access.foreign", "UnmapperProxy", "unmap", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/jdk.internal.access.model.yml b/java/ql/lib/ext/generated/jdk.internal.access.model.yml
new file mode 100644
index 00000000000..37d80349303
--- /dev/null
+++ b/java/ql/lib/ext/generated/jdk.internal.access.model.yml
@@ -0,0 +1,243 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", True, "registerCleanup", "(FileDescriptor,PhantomCleanable)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFilePermissionAccess", True, "newPermPlusAltPath", "(FilePermission)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFilePermissionAccess", True, "newPermUsingAltPath", "(FilePermission)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaIORandomAccessFileAccess", True, "openAndDelete", "(File,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "addEnableNativeAccess", "(Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "addOpensToAllUnnamed", "(Module,Set,Set)", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "addOpensToAllUnnamed", "(Module,Set,Set)", "", "Argument[2].Element", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "createOrGetClassLoaderValueMap", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "defineModule", "(ClassLoader,ModuleDescriptor,URI)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "defineModule", "(ClassLoader,ModuleDescriptor,URI)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "definePackage", "(ClassLoader,String,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "definePackage", "(ClassLoader,String,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "defineUnnamedModule", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "getBytesNoRepl", "(String,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "getBytesUTF8NoRepl", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "getServicesCatalog", "(ModuleLayer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "layers", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "layers", "(ModuleLayer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "newStringNoRepl", "(byte[],Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "newStringUTF8NoRepl", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "newThreadWithAcc", "(Runnable,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "newThreadWithAcc", "(Runnable,AccessControlContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "setCause", "(Throwable,Throwable)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "stringConcatHelper", "(String,MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", True, "stringConcatHelper", "(String,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "collectCoordinates", "(VarHandle,int,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "dropCoordinates", "(VarHandle,int,Class[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "filterCoordinates", "(VarHandle,int,MethodHandle[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "filterValue", "(VarHandle,MethodHandle,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "getMethodDescriptor", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "getMethodType", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "getName", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "insertCoordinates", "(VarHandle,int,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "nativeMethodHandle", "(NativeEntryPoint,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "nativeMethodHandle", "(NativeEntryPoint,MethodHandle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "permuteCoordinates", "(VarHandle,List,int[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "permuteCoordinates", "(VarHandle,List,int[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newConfiguration", "(ModuleFinder,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String,Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String,Set)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleBuilder", "(String,boolean,Set)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleBuilder", "(String,boolean,Set)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[5].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[6].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[7].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[8].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[9]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String,Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String,Set)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newProvides", "(String,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newProvides", "(String,List)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newRequires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newRequires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newRequires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", True, "packages", "(ModuleDescriptor$Builder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "copyConstructor", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "copyField", "(Field)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "copyMethod", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorAccessor", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorAnnotations", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorParameterAnnotations", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorSignature", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getExecutableSharedParameterTypes", "(Executable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getMethodAccessor", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getRoot", "(AccessibleObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "leafCopyMethod", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[6]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[7]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "setConstructorAccessor", "(Constructor,ConstructorAccessor)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", True, "setMethodAccessor", "(Method,MethodAccessor)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetHttpCookieAccess", True, "header", "(HttpCookie)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetHttpCookieAccess", True, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetInetAddressAccess", True, "addressBytes", "(Inet6Address)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetInetAddressAccess", True, "getByName", "(String,InetAddress)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetInetAddressAccess", True, "getOriginalHostName", "(InetAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetURLAccess", True, "getHandler", "(URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetUriAccess", True, "create", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNetUriAccess", True, "create", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "acquireScope", "(Buffer,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "bufferSegment", "(Buffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "getBufferBase", "(ByteBuffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "newDirectByteBuffer", "(long,int,Object,MemorySegmentProxy)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "newDirectByteBuffer", "(long,int,Object,MemorySegmentProxy)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "newHeapByteBuffer", "(byte[],int,int,MemorySegmentProxy)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "newHeapByteBuffer", "(byte[],int,int,MemorySegmentProxy)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "newMappedByteBuffer", "(UnmapperProxy,long,int,Object,MemorySegmentProxy)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "newMappedByteBuffer", "(UnmapperProxy,long,int,Object,MemorySegmentProxy)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", True, "newMappedByteBuffer", "(UnmapperProxy,long,int,Object,MemorySegmentProxy)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecurityAccess$ProtectionDomainCache", True, "get", "(ProtectionDomain)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecurityAccess$ProtectionDomainCache", True, "put", "(ProtectionDomain,PermissionCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecurityAccess$ProtectionDomainCache", True, "put", "(ProtectionDomain,PermissionCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecurityAccess", True, "doIntersectionPrivilege", "(PrivilegedAction,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecurityAccess", True, "doIntersectionPrivilege", "(PrivilegedAction,AccessControlContext,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecurityAccess", True, "getProtectDomains", "(AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initSign", "(Signature,PrivateKey,AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initSign", "(Signature,PrivateKey,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initSign", "(Signature,PrivateKey,AlgorithmParameterSpec,SecureRandom)", "", "Argument[3]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initVerify", "(Signature,PublicKey,AlgorithmParameterSpec)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initVerify", "(Signature,PublicKey,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilCollectionAccess", True, "listFromTrustedArray", "(Object[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilCollectionAccess", True, "listFromTrustedArrayNullsAllowed", "(Object[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "entryFor", "(JarFile,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "entryNames", "(JarFile,CodeSource[])", "", "Argument[1].ArrayElement", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSources", "(JarFile,URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSources", "(JarFile,URL)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSources", "(JarFile,URL)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getManifestDigests", "(JarFile)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getTrustedAttributes", "(Manifest,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "getBundle", "(String,Locale,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "getBundle", "(String,Locale,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "getParent", "(ResourceBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "setLocale", "(ResourceBundle,Locale)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "setName", "(ResourceBundle,String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "setParent", "(ResourceBundle,ResourceBundle)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["jdk.internal.access", "JavaBeansAccess", "getConstructorPropertiesValue", "(Constructor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaBeansAccess", "getReadMethod", "(Class,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOAccess", "charset", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOAccess", "console", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "close", "(FileDescriptor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "get", "(FileDescriptor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "getAppend", "(FileDescriptor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "getHandle", "(FileDescriptor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "registerCleanup", "(FileDescriptor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "set", "(FileDescriptor,int)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "setAppend", "(FileDescriptor,boolean)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "setHandle", "(FileDescriptor,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "unregisterCleanup", "(FileDescriptor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addEnableNativeAccessAllUnnamed", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addExports", "(Module,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addExports", "(Module,String,Module)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addExportsToAllUnnamed", "(Module,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addNonExportedPackages", "(ModuleLayer)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addOpens", "(Module,String,Module)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addOpensToAllUnnamed", "(Module,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addReads", "(Module,Module)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addReadsAllUnnamed", "(Module)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "addUses", "(Module,Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "bindToLoader", "(ModuleLayer,ClassLoader)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "blockedOn", "(Interruptible)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "casAnnotationType", "(Class,AnnotationType,AnnotationType)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "classData", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "decodeASCII", "(byte[],int,char[],int,int)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "defineClass", "(ClassLoader,Class,String,byte[],ProtectionDomain,boolean,int,Object)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "defineClass", "(ClassLoader,String,byte[],ProtectionDomain,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "exit", "(int)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "fastUUID", "(long,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "findBootstrapClassOrNull", "(String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "findNative", "(ClassLoader,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getAnnotationType", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getConstantPool", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getDeclaredAnnotationMap", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getDeclaredPublicMethods", "(Class,String,Class[])", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getEnumConstantsShared", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getRawClassAnnotations", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getRawClassTypeAnnotations", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "getRawExecutableTypeAnnotations", "(Executable)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "inflateBytesToChars", "(byte[],int,char[],int,int)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "invalidatePackageAccessCache", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "invokeFinalize", "(Object)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "isEnableNativeAccess", "(Module)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "isReflectivelyExported", "(Module,String,Module)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "isReflectivelyOpened", "(Module,String,Module)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "protectionDomain", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "registerShutdownHook", "(int,boolean,Runnable)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "stringConcatInitialCoder", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangAccess", "stringConcatMix", "(long,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", "ensureCustomized", "(MethodHandle)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", "generateHolderClasses", "(Stream)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", "getDeclaringClass", "(Object)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", "isNative", "(Object)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", "memoryAccessVarHandle", "(Class,boolean,long,ByteOrder)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangInvokeAccess", "newMemberName", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", "requires", "(ModuleDescriptor$Builder,Set,String,String)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangModuleAccess", "resolveAndBind", "(ModuleFinder,Collection,PrintStream)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangRefAccess", "runFinalization", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangRefAccess", "waitForReferenceProcessing", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", "getConstructorSlot", "(Constructor)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", "getExecutableTypeAnnotationBytes", "(Executable)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", "isTrustedFinalField", "(Field)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaLangReflectAccess", "newInstance", "(Constructor,Object[],Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNetInetAddressAccess", "addressValue", "(Inet4Address)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "force", "(FileDescriptor,long,boolean,long,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "getBufferAddress", "(ByteBuffer)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "getDirectBufferPool", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "isLoaded", "(long,boolean,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "load", "(long,boolean,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "pageSize", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "reserveMemory", "(long,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "unload", "(long,boolean,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "unmapper", "(ByteBuffer)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaNioAccess", "unreserveMemory", "(long,long)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaSecurityAccess", "getProtectionDomainCache", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaSecuritySignatureAccess", "initVerify", "(Signature,Certificate,AlgorithmParameterSpec)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaSecuritySpecAccess", "clearEncodedKeySpec", "(EncodedKeySpec)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", "ensureInitialization", "(JarFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", "entries2", "(JarFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", "isInitializing", "()", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", "jarFileHasClassPathAttribute", "(JarFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilJarAccess", "setEagerValidation", "(JarFile,boolean)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", "newResourceBundle", "(Class)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "entries", "(ZipFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "entryNameStream", "(ZipFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getExtraAttributes", "(ZipEntry)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getManifestAndSignatureRelatedFiles", "(JarFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getManifestName", "(JarFile,boolean)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getManifestNum", "(JarFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getMetaInfVersions", "(JarFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "setExtraAttributes", "(ZipEntry,int)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "startsWithLocHeader", "(ZipFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaUtilZipFileAccess", "stream", "(ZipFile)", "summary", "df-generated"]
+      - ["jdk.internal.access", "JavaxCryptoSpecAccess", "clearSecretKeySpec", "(SecretKeySpec)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/jdk.internal.misc.model.yml b/java/ql/lib/ext/generated/jdk.internal.misc.model.yml
new file mode 100644
index 00000000000..3ab4816a586
--- /dev/null
+++ b/java/ql/lib/ext/generated/jdk.internal.misc.model.yml
@@ -0,0 +1,11 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["jdk.internal.misc", "Signal$Handler", "handle", "(Signal)", "summary", "df-generated"]
+      - ["jdk.internal.misc", "VM$BufferPool", "getCount", "()", "summary", "df-generated"]
+      - ["jdk.internal.misc", "VM$BufferPool", "getMemoryUsed", "()", "summary", "df-generated"]
+      - ["jdk.internal.misc", "VM$BufferPool", "getName", "()", "summary", "df-generated"]
+      - ["jdk.internal.misc", "VM$BufferPool", "getTotalCapacity", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml b/java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml
new file mode 100644
index 00000000000..1121dda6781
--- /dev/null
+++ b/java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml
@@ -0,0 +1,15 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", True, "visitAnnotation", "(String,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", True, "visitAnnotation", "(String,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", "visit", "(int,int,String,String,String,String[])", "summary", "df-generated"]
+      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", "visitAttribute", "(Attribute)", "summary", "df-generated"]
+      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", "visitModule", "(String,int,String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/org.w3c.dom.ls.model.yml b/java/ql/lib/ext/generated/org.w3c.dom.ls.model.yml
new file mode 100644
index 00000000000..ffc38030b8a
--- /dev/null
+++ b/java/ql/lib/ext/generated/org.w3c.dom.ls.model.yml
@@ -0,0 +1,28 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["org.w3c.dom.ls", "LSInput", True, "getSystemId", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", True, "setSystemId", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom.ls", "LSResourceResolver", True, "resolveResource", "(String,String,String,String,String)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom.ls", "LSResourceResolver", True, "resolveResource", "(String,String,String,String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["org.w3c.dom.ls", "LSInput", "getBaseURI", "()", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "getByteStream", "()", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "getCertifiedText", "()", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "getCharacterStream", "()", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "getEncoding", "()", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "getPublicId", "()", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "getStringData", "()", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "setBaseURI", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "setByteStream", "(InputStream)", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "setCertifiedText", "(boolean)", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "setCharacterStream", "(Reader)", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "setEncoding", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "setPublicId", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom.ls", "LSInput", "setStringData", "(String)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/org.w3c.dom.model.yml b/java/ql/lib/ext/generated/org.w3c.dom.model.yml
new file mode 100644
index 00000000000..9c519c9ae73
--- /dev/null
+++ b/java/ql/lib/ext/generated/org.w3c.dom.model.yml
@@ -0,0 +1,102 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["org.w3c.dom", "Attr", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Attr", True, "getOwnerElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Attr", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Attr", True, "setValue", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "getAttribute", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "getAttributeNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "getAttributeNode", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "getAttributeNodeNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "getElementsByTagName", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "getElementsByTagNameNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "getTagName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "removeAttributeNode", "(Attr)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "setAttributeNode", "(Attr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "setAttributeNode", "(Attr)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "setAttributeNode", "(Attr)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "setAttributeNodeNS", "(Attr)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "setAttributeNodeNS", "(Attr)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Element", True, "setAttributeNodeNS", "(Attr)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", True, "getNamedItem", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", True, "getNamedItemNS", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", True, "item", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "appendChild", "(Node)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "cloneNode", "(boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getAttributes", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getChildNodes", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getFirstChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getLastChild", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getLocalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getNextSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getNodeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getNodeValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getParentNode", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "getPreviousSibling", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "insertBefore", "(Node,Node)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "removeChild", "(Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "removeChild", "(Node)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "replaceChild", "(Node,Node)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
+      - ["org.w3c.dom", "Node", True, "setNodeValue", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
+      - ["org.w3c.dom", "NodeList", True, "item", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["org.w3c.dom", "Attr", "getSpecified", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Attr", "isId", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "getSchemaTypeInfo", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "hasAttribute", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "hasAttributeNS", "(String,String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "removeAttribute", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "removeAttributeNS", "(String,String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "setAttribute", "(String,String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "setAttributeNS", "(String,String,String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "setIdAttribute", "(String,boolean)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "setIdAttributeNS", "(String,String,boolean)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Element", "setIdAttributeNode", "(Attr,boolean)", "summary", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", "getLength", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", "removeNamedItem", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", "removeNamedItemNS", "(String,String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", "setNamedItem", "(Node)", "summary", "df-generated"]
+      - ["org.w3c.dom", "NamedNodeMap", "setNamedItemNS", "(Node)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "compareDocumentPosition", "(Node)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getBaseURI", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getFeature", "(String,String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getNamespaceURI", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getNodeType", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getOwnerDocument", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getPrefix", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getTextContent", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "getUserData", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "hasAttributes", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "hasChildNodes", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "isDefaultNamespace", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "isEqualNode", "(Node)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "isSameNode", "(Node)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "isSupported", "(String,String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "lookupNamespaceURI", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "lookupPrefix", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "normalize", "()", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "setPrefix", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "setTextContent", "(String)", "summary", "df-generated"]
+      - ["org.w3c.dom", "Node", "setUserData", "(String,Object,UserDataHandler)", "summary", "df-generated"]
+      - ["org.w3c.dom", "NodeList", "getLength", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/org.xml.sax.model.yml b/java/ql/lib/ext/generated/org.xml.sax.model.yml
new file mode 100644
index 00000000000..b8377f80341
--- /dev/null
+++ b/java/ql/lib/ext/generated/org.xml.sax.model.yml
@@ -0,0 +1,17 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["org.xml.sax", "ContentHandler", True, "startElement", "(String,String,String,Attributes)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
+      - ["org.xml.sax", "EntityResolver", True, "resolveEntity", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["org.xml.sax", "EntityResolver", True, "resolveEntity", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["org.xml.sax", "ContentHandler", "endElement", "(String,String,String)", "summary", "df-generated"]
+      - ["org.xml.sax", "ErrorHandler", "error", "(SAXParseException)", "summary", "df-generated"]
+      - ["org.xml.sax", "ErrorHandler", "fatalError", "(SAXParseException)", "summary", "df-generated"]
+      - ["org.xml.sax", "ErrorHandler", "warning", "(SAXParseException)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.awt.model.yml b/java/ql/lib/ext/generated/sun.awt.model.yml
new file mode 100644
index 00000000000..42476dac95e
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.awt.model.yml
@@ -0,0 +1,11 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["sun.awt", "AWTAccessor$AccessibleBundleAccessor", True, "getKey", "(AccessibleBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "getAppContext", "(AccessibleContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "getNativeAXResource", "(AccessibleContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "setAppContext", "(AccessibleContext,AppContext)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["sun.awt", "AWTAccessor$AccessibleContextAccessor", True, "setNativeAXResource", "(AccessibleContext,Object)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.java2d.model.yml b/java/ql/lib/ext/generated/sun.java2d.model.yml
new file mode 100644
index 00000000000..4e8c183dbaa
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.java2d.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["sun.java2d", "DisposerRecord", "dispose", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.management.spi.model.yml b/java/ql/lib/ext/generated/sun.management.spi.model.yml
new file mode 100644
index 00000000000..20407d0cdf8
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.management.spi.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["sun.management.spi", "PlatformMBeanProvider", True, "getPlatformComponentList", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.nio.ch.model.yml b/java/ql/lib/ext/generated/sun.nio.ch.model.yml
new file mode 100644
index 00000000000..6bf0c30693e
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.nio.ch.model.yml
@@ -0,0 +1,14 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["sun.nio.ch", "DirectBuffer", True, "attachment", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.nio.ch", "DirectBuffer", True, "cleaner", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["sun.nio.ch", "DirectBuffer", "address", "()", "summary", "df-generated"]
+      - ["sun.nio.ch", "Interruptible", "interrupt", "(Thread)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.print.model.yml b/java/ql/lib/ext/generated/sun.print.model.yml
new file mode 100644
index 00000000000..b680eb20867
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.print.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["sun.print", "DialogOwnerAccessor", "getOwnerID", "(DialogOwner)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.security.krb5.model.yml b/java/ql/lib/ext/generated/sun.security.krb5.model.yml
new file mode 100644
index 00000000000..464a5ae3afe
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.security.krb5.model.yml
@@ -0,0 +1,13 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketGetClientAlias", "(KerberosTicket)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketGetProxy", "(KerberosTicket)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketGetServerAlias", "(KerberosTicket)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketSetClientAlias", "(KerberosTicket,KerberosPrincipal)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketSetProxy", "(KerberosTicket,KerberosTicket)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "kerberosTicketSetServerAlias", "(KerberosTicket,KerberosPrincipal)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["sun.security.krb5", "JavaxSecurityAuthKerberosAccess", True, "keyTabTakeSnapshot", "(KeyTab)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.security.util.model.yml b/java/ql/lib/ext/generated/sun.security.util.model.yml
new file mode 100644
index 00000000000..3f742e5e297
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.security.util.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["sun.security.util", "MessageDigestSpi2", "engineUpdate", "(SecretKey)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/sun.util.logging.internal.model.yml b/java/ql/lib/ext/generated/sun.util.logging.internal.model.yml
new file mode 100644
index 00000000000..66270c3750b
--- /dev/null
+++ b/java/ql/lib/ext/generated/sun.util.logging.internal.model.yml
@@ -0,0 +1,9 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["sun.util.logging.internal", "LoggingProviderImpl$LogManagerAccess", True, "demandLoggerFor", "(LogManager,String,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.util.logging.internal", "LoggingProviderImpl$LogManagerAccess", True, "demandLoggerFor", "(LogManager,String,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["sun.util.logging.internal", "LoggingProviderImpl$LogManagerAccess", True, "demandLoggerFor", "(LogManager,String,Module)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]

From 311512c768277804df13195906245b8517dcb113 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Fri, 15 Mar 2024 14:23:29 +0000
Subject: [PATCH 036/136] Remove df-gen models for incidentally modelled APIs

Manual models always take precedence over generated models, so there is
no point in keeping the generated models.

These APIs happened to have been modelled between model generation and
merging this PR.
---
 java/ql/lib/ext/generated/java.nio.file.model.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java/ql/lib/ext/generated/java.nio.file.model.yml b/java/ql/lib/ext/generated/java.nio.file.model.yml
index d149f2e47c5..342de82e556 100644
--- a/java/ql/lib/ext/generated/java.nio.file.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.file.model.yml
@@ -100,8 +100,6 @@ extensions:
       - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "NotLinkException", True, "NotLinkException", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.nio.file", "Path", True, "resolveSibling", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Path", True, "resolveSibling", "(Path)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "ProviderMismatchException", True, "ProviderMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "ProviderNotFoundException", True, "ProviderNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:

From 32ebd4eebbcf13613b51c4b8686b3183b0da3c04 Mon Sep 17 00:00:00 2001
From: Max Schaefer <max-schaefer@github.com>
Date: Wed, 27 Mar 2024 12:22:24 +0000
Subject: [PATCH 037/136] Automodel: Filter unexploitable types in application
 mode.

We already did this in framework mode.
---
 .../AutomodelApplicationModeCharacteristics.qll  | 16 +++++++++-------
 .../AutomodelApplicationModeExtraction/Test.java | 11 ++++++-----
 .../com/github/codeql/test/MyWriter.java         |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll b/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
index 045886985b8..3023677ece8 100644
--- a/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
+++ b/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
@@ -28,25 +28,27 @@ newtype TApplicationModeEndpoint =
     AutomodelJavaUtil::isFromSource(call) and
     exists(Argument argExpr |
       arg.asExpr() = argExpr and call = argExpr.getCall() and not argExpr.isVararg()
-    )
+    ) and
+    not AutomodelJavaUtil::isUnexploitableType(arg.getType())
   } or
   TInstanceArgument(Call call, DataFlow::Node arg) {
     AutomodelJavaUtil::isFromSource(call) and
     arg = DataFlow::getInstanceArgument(call) and
-    not call instanceof ConstructorCall
+    not call instanceof ConstructorCall and
+    not AutomodelJavaUtil::isUnexploitableType(arg.getType())
   } or
   TImplicitVarargsArray(Call call, DataFlow::ImplicitVarargsArray arg, int idx) {
     AutomodelJavaUtil::isFromSource(call) and
     call = arg.getCall() and
-    idx = call.getCallee().getVaragsParameterIndex()
+    idx = call.getCallee().getVaragsParameterIndex() and
+    not AutomodelJavaUtil::isUnexploitableType(arg.getType())
   } or
-  TMethodReturnValue(Call call) {
+  TMethodReturnValue(MethodCall call) {
     AutomodelJavaUtil::isFromSource(call) and
-    not call instanceof ConstructorCall
+    not AutomodelJavaUtil::isUnexploitableType(call.getType())
   } or
   TOverriddenParameter(Parameter p, Method overriddenMethod) {
     AutomodelJavaUtil::isFromSource(p) and
-    not p.getCallable().callsConstructor(_) and
     p.getCallable().(Method).overrides(overriddenMethod)
   }
 
@@ -163,7 +165,7 @@ class ImplicitVarargsArray extends CallArgument, TImplicitVarargsArray {
  * may be a source.
  */
 class MethodReturnValue extends ApplicationModeEndpoint, TMethodReturnValue {
-  Call call;
+  MethodCall call;
 
   MethodReturnValue() { this = TMethodReturnValue(call) }
 
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java b/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
index 4d6aff63fd0..a8280bcaf27 100644
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
@@ -19,11 +19,11 @@ class Test {
 		AtomicReference<String> reference = new AtomicReference<>(); // uninteresting (parameterless constructor)
 		reference.set( // $ sinkModelCandidate=set(Object):Argument[this]
 			args[0] // $ negativeSinkExample=set(Object):Argument[0] // modeled as a flow step
-		);  // $ negativeSourceExample=set(Object):ReturnValue // return type is void
+		);  // not a source candidate (return type is void)
 	}
 
 	public static void callSupplier(Supplier<String> supplier) {
-		supplier.get(); // $ sourceModelCandidate=get():ReturnValue
+		supplier.get(); // not a source candidate (lambda flow)
 	}
 
 	public static void copyFiles(Path source, Path target, CopyOption option) throws Exception {
@@ -52,7 +52,7 @@ class Test {
 	public static int compareFiles(File f1, File f2) {
 		return f1.compareTo( // $ negativeSinkExample=compareTo(File):Argument[this]
 			f2 // $ negativeSinkExample=compareTo(File):Argument[0] // modeled as not a sink
-		); // $ negativeSourceExample=compareTo(File):ReturnValue // return type is int
+		); // not a source candidate (return type is int)
 	}
 
 	public static void FilesWalkExample(Path p, FileVisitOption o) throws Exception {
@@ -66,6 +66,7 @@ class Test {
 
 	public static void WebSocketExample(URLConnection c) throws Exception {
 		c.getInputStream(); // $ sinkModelCandidate=getInputStream():Argument[this] positiveSourceExample=getInputStream():ReturnValue(remote) // not a source candidate (manual modeling)
+		c.connect(); // $ sinkModelCandidate=connect():Argument[this] // not a source candidate (return type is void)
 	}
 
 	public static void fileFilterExample(File f, FileFilter ff) {
@@ -102,10 +103,10 @@ class MoreTests {
 
 		Files.delete(
 			p // $ sinkModelCandidate=delete(Path):Argument[0] positiveSinkExample=delete(Path):Argument[0](path-injection)
-		); // $ negativeSourceExample=delete(Path):ReturnValue // return type is void
+		); // $ not a source candidate (return type is void)
 
 		Files.deleteIfExists(
 			p // $ sinkModelCandidate=deleteIfExists(Path):Argument[0] positiveSinkExample=deleteIfExists(Path):Argument[0](path-injection)
-		); // $ negativeSourceExample=deleteIfExists(Path):ReturnValue // return type is boolean
+		); // $ not a source candidate (return type is boolean)
 	}
 }
\ No newline at end of file
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/MyWriter.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/MyWriter.java
index b31ace21b4d..62bd773cc2e 100644
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/MyWriter.java
+++ b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/MyWriter.java
@@ -2,7 +2,7 @@ package com.github.codeql.test;
 
 public class MyWriter extends java.io.Writer {
     @Override
-    public void write(char[] cbuf, int off, int len) { // $ sinkModelCandidate=write(char[],int,int):Argument[this] sourceModelCandidate=write(char[],int,int):Parameter[this] sourceModelCandidate=write(char[],int,int):Parameter[0]
+    public void write(char[] cbuf, int off, int len) { // $ sinkModelCandidate=write(char[],int,int):Argument[this] positiveSinkExample=write(char[],int,int):Argument[0](file-content-store) sourceModelCandidate=write(char[],int,int):Parameter[this] sourceModelCandidate=write(char[],int,int):Parameter[0]
     }
 
     @Override

From 919436efbb7fa53243e0482b763557141425abbf Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Thu, 14 Mar 2024 15:55:57 +0000
Subject: [PATCH 038/136] Remove df-gen models we have deliberately modeled

Manual models always take precedence over generated models, so there is
no point in keeping the generated models.

These manual models were deliberately written to take precedence over
the corresponding df-gen models.
---
 .../ql/lib/ext/generated/java.beans.model.yml |   4 -
 java/ql/lib/ext/generated/java.io.model.yml   |  13 ---
 java/ql/lib/ext/generated/java.lang.model.yml |  18 ---
 java/ql/lib/ext/generated/java.net.model.yml  |   9 --
 .../lib/ext/generated/java.nio.file.model.yml |  37 ------
 .../generated/java.security.cert.model.yml    |  45 --------
 .../lib/ext/generated/java.security.model.yml |   8 --
 java/ql/lib/ext/generated/java.text.model.yml |  13 ---
 .../ext/generated/java.util.logging.model.yml |   2 -
 java/ql/lib/ext/generated/java.util.model.yml | 107 ------------------
 .../ext/generated/java.util.prefs.model.yml   |  17 ---
 .../ext/generated/java.util.regex.model.yml   |  13 ---
 .../ext/generated/java.util.stream.model.yml  |   5 -
 .../lib/ext/generated/javax.crypto.model.yml  |  61 ----------
 .../ext/generated/javax.crypto.spec.model.yml |   4 -
 15 files changed, 356 deletions(-)

diff --git a/java/ql/lib/ext/generated/java.beans.model.yml b/java/ql/lib/ext/generated/java.beans.model.yml
index 1ae8e6c73b5..2767fb30102 100644
--- a/java/ql/lib/ext/generated/java.beans.model.yml
+++ b/java/ql/lib/ext/generated/java.beans.model.yml
@@ -122,10 +122,6 @@ extensions:
       - ["java.beans", "PropertyDescriptor", True, "setReadMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "PropertyDescriptor", True, "setWriteMethod", "(Method)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "PropertyEditor", True, "addPropertyChangeListener", "(PropertyChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyEditor", True, "getAsText", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "PropertyEditor", True, "getValue", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.beans", "PropertyEditor", True, "setAsText", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.beans", "PropertyEditor", True, "setValue", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "PropertyEditorSupport", True, "PropertyEditorSupport", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.beans", "PropertyEditorSupport", True, "getSource", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.beans", "PropertyEditorSupport", True, "setSource", "(Object)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.io.model.yml b/java/ql/lib/ext/generated/java.io.model.yml
index 248971d2a5a..8ecad6c31d6 100644
--- a/java/ql/lib/ext/generated/java.io.model.yml
+++ b/java/ql/lib/ext/generated/java.io.model.yml
@@ -38,18 +38,6 @@ extensions:
       - ["java.io", "EOFException", True, "EOFException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "Externalizable", True, "readExternal", "(ObjectInput)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "Externalizable", True, "writeExternal", "(ObjectOutput)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "listFiles", "(FileFilter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "listFiles", "(FilenameFilter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "File", True, "toURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.io", "FileInputStream", True, "FileInputStream", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "FileInputStream", True, "FileInputStream", "(FileDescriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.io", "FileInputStream", True, "FileInputStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "FileInputStream", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "FileInputStream", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "FileNotFoundException", True, "FileNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -90,7 +78,6 @@ extensions:
       - ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "NotActiveException", True, "NotActiveException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.io", "NotSerializableException", True, "NotSerializableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.io", "ObjectInput", True, "readObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectInputFilter$Config", False, "createFilter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectInputFilter", True, "allowFilter", "(Predicate,ObjectInputFilter$Status)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.io", "ObjectInputFilter", True, "merge", "(ObjectInputFilter,ObjectInputFilter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.lang.model.yml b/java/ql/lib/ext/generated/java.lang.model.yml
index c8af5bdc004..e9b8c6c85ea 100644
--- a/java/ql/lib/ext/generated/java.lang.model.yml
+++ b/java/ql/lib/ext/generated/java.lang.model.yml
@@ -22,17 +22,6 @@ extensions:
       - ["java.lang", "ClassCastException", True, "ClassCastException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ClassCircularityError", True, "ClassCircularityError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ClassFormatError", True, "ClassFormatError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "findResource", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "getDefinedPackage", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "getDefinedPackage", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "getSystemResource", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "getUnnamedModule", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "loadClass", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "loadClass", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "setClassAssertionStatus", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.lang", "ClassLoader", True, "setPackageAssertionStatus", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -200,16 +189,12 @@ extensions:
       - ["java.lang", "StackWalker$StackFrame", True, "toStackTraceElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "StackWalker", False, "getInstance", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "StackWalker", False, "getInstance", "(Set,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "String", False, "lines", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "StringIndexOutOfBoundsException", True, "StringIndexOutOfBoundsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System", False, "getLogger", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "System", False, "getProperty", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "System", False, "setProperty", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "System", False, "setProperty", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -240,8 +225,6 @@ extensions:
       - ["java.lang", "ThreadGroup", True, "enumerate", "(Thread[],boolean)", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
       - ["java.lang", "ThreadGroup", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.lang", "ThreadGroup", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Throwable", True, "fillInStackTrace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.lang", "Throwable", True, "printStackTrace", "(PrintWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.lang", "TypeNotPresentException", True, "typeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -711,7 +694,6 @@ extensions:
       - ["java.lang", "ProcessHandle", "pid", "()", "summary", "df-generated"]
       - ["java.lang", "ProcessHandle", "supportsNormalTermination", "()", "summary", "df-generated"]
       - ["java.lang", "Readable", "read", "(CharBuffer)", "summary", "df-generated"]
-      - ["java.lang", "Runnable", "run", "()", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "compareToIgnoreOptional", "(Runtime$Version)", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "equalsIgnoreOptional", "(Object)", "summary", "df-generated"]
       - ["java.lang", "Runtime$Version", "feature", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.net.model.yml b/java/ql/lib/ext/generated/java.net.model.yml
index 7ca397cdb5c..6f0a35897f2 100644
--- a/java/ql/lib/ext/generated/java.net.model.yml
+++ b/java/ql/lib/ext/generated/java.net.model.yml
@@ -132,11 +132,8 @@ extensions:
       - ["java.net", "Socket", True, "Socket", "(String,int,InetAddress,int)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "Socket", True, "Socket", "(String,int,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "Socket", True, "bind", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "connect", "(SocketAddress)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "connect", "(SocketAddress,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "Socket", True, "getInetAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "Socket", True, "getInputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "Socket", True, "getOutputStream", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "Socket", True, "getRemoteSocketAddress", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "Socket", True, "setOption", "(SocketOption,Object)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.net", "Socket", True, "supportedOptions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -181,14 +178,11 @@ extensions:
       - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URL", False, "URL", "(URL,String,URLStreamHandler)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
       - ["java.net", "URL", False, "getAuthority", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URL", False, "getContent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getContent", "(Class[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getHost", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getProtocol", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URL", False, "getQuery", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getRef", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "getUserInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.net", "URL", False, "openConnection", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "openConnection", "(Proxy)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URL", False, "openConnection", "(Proxy)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.net", "URLClassLoader", True, "URLClassLoader", "(String,URL[],ClassLoader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -430,9 +424,6 @@ extensions:
       - ["java.net", "URI", "isAbsolute", "()", "summary", "df-generated"]
       - ["java.net", "URI", "isOpaque", "()", "summary", "df-generated"]
       - ["java.net", "URISyntaxException", "getIndex", "()", "summary", "df-generated"]
-      - ["java.net", "URL", "getDefaultPort", "()", "summary", "df-generated"]
-      - ["java.net", "URL", "getPort", "()", "summary", "df-generated"]
-      - ["java.net", "URL", "openStream", "()", "summary", "df-generated"]
       - ["java.net", "URL", "sameFile", "(URL)", "summary", "df-generated"]
       - ["java.net", "URL", "setURLStreamHandlerFactory", "(URLStreamHandlerFactory)", "summary", "df-generated"]
       - ["java.net", "URLClassLoader", "URLClassLoader", "(URL[])", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.nio.file.model.yml b/java/ql/lib/ext/generated/java.nio.file.model.yml
index 342de82e556..4c88fbbe5ec 100644
--- a/java/ql/lib/ext/generated/java.nio.file.model.yml
+++ b/java/ql/lib/ext/generated/java.nio.file.model.yml
@@ -40,49 +40,21 @@ extensions:
       - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map,ClassLoader)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "FileSystems", False, "newFileSystem", "(URI,Map,ClassLoader)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "copy", "(Path,OutputStream)", "", "Argument[0].Element", "Argument[1]", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "copy", "(Path,Path,CopyOption[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createDirectories", "(Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createDirectory", "(Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createFile", "(Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createLink", "(Path,Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createSymbolicLink", "(Path,Path,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempDirectory", "(Path,String,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempDirectory", "(Path,String,FileAttribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempDirectory", "(String,FileAttribute[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempFile", "(String,String,FileAttribute[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "createTempFile", "(String,String,FileAttribute[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "getAttribute", "(Path,String,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "getAttribute", "(Path,String,LinkOption[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "getFileAttributeView", "(Path,Class,LinkOption[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "getFileStore", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "move", "(Path,Path,CopyOption[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "newDirectoryStream", "(Path,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "newInputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "newOutputStream", "(Path,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "readAllBytes", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "readAllLines", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "readAllLines", "(Path,Charset)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "readAttributes", "(Path,Class,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "readAttributes", "(Path,String,LinkOption[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "readString", "(Path)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "readString", "(Path,Charset)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "setAttribute", "(Path,String,Object,LinkOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "setLastModifiedTime", "(Path,FileTime)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "setOwner", "(Path,UserPrincipal)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "setPosixFilePermissions", "(Path,Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "Files", False, "walkFileTree", "(Path,Set,int,FileVisitor)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "write", "(Path,Iterable,Charset,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "write", "(Path,Iterable,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "write", "(Path,byte[],OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "writeString", "(Path,CharSequence,Charset,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.nio.file", "Files", False, "writeString", "(Path,CharSequence,OpenOption[])", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.nio.file", "InvalidPathException", True, "InvalidPathException", "(String,String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -127,9 +99,6 @@ extensions:
       - ["java.nio.file", "FileSystem", "supportedFileAttributeViews", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileSystems", "getDefault", "()", "summary", "df-generated"]
       - ["java.nio.file", "FileSystems", "getFileSystem", "(URI)", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "copy", "(InputStream,Path,CopyOption[])", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "delete", "(Path)", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "deleteIfExists", "(Path)", "summary", "df-generated"]
       - ["java.nio.file", "Files", "getLastModifiedTime", "(Path,LinkOption[])", "summary", "df-generated"]
       - ["java.nio.file", "Files", "getOwner", "(Path,LinkOption[])", "summary", "df-generated"]
       - ["java.nio.file", "Files", "getPosixFilePermissions", "(Path,LinkOption[])", "summary", "df-generated"]
@@ -141,13 +110,7 @@ extensions:
       - ["java.nio.file", "Files", "isSameFile", "(Path,Path)", "summary", "df-generated"]
       - ["java.nio.file", "Files", "isSymbolicLink", "(Path)", "summary", "df-generated"]
       - ["java.nio.file", "Files", "isWritable", "(Path)", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "lines", "(Path)", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "lines", "(Path,Charset)", "summary", "df-generated"]
       - ["java.nio.file", "Files", "mismatch", "(Path,Path)", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "newBufferedWriter", "(Path,Charset,OpenOption[])", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "newBufferedWriter", "(Path,OpenOption[])", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "notExists", "(Path,LinkOption[])", "summary", "df-generated"]
-      - ["java.nio.file", "Files", "probeContentType", "(Path)", "summary", "df-generated"]
       - ["java.nio.file", "Files", "size", "(Path)", "summary", "df-generated"]
       - ["java.nio.file", "Files", "walk", "(Path,int,FileVisitOption[])", "summary", "df-generated"]
       - ["java.nio.file", "InvalidPathException", "getIndex", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.cert.model.yml b/java/ql/lib/ext/generated/java.security.cert.model.yml
index 4d98781cac2..7f08c1a7d20 100644
--- a/java/ql/lib/ext/generated/java.security.cert.model.yml
+++ b/java/ql/lib/ext/generated/java.security.cert.model.yml
@@ -42,18 +42,7 @@ extensions:
       - ["java.security.cert", "CertPathValidatorException", True, "CertPathValidatorException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertPathValidatorException", True, "getCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertPathValidatorException", True, "getReason", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getCRLs", "(CRLSelector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertStore", True, "getCertStoreParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getCertificates", "(CertSelector)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,Provider)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,Provider)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getInstance", "(String,CertStoreParameters,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertStore", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertStoreException", True, "CertStoreException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -68,15 +57,6 @@ extensions:
       - ["java.security.cert", "CertificateException", True, "CertificateException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateException", True, "CertificateException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateExpiredException", True, "CertificateExpiredException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "generateCRL", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "generateCertPath", "(List)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "generateCertificate", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", True, "getType", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "CertificateNotYetValidException", True, "CertificateNotYetValidException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "CertificateParsingException", True, "CertificateParsingException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -105,23 +85,7 @@ extensions:
       - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPolicyTree", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getPublicKey", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "PKIXCertPathValidatorResult", True, "getTrustAnchor", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "PKIXParameters", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "addCertPathChecker", "(PKIXCertPathChecker)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "addCertStore", "(CertStore)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "getCertPathCheckers", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "getCertStores", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "getDate", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "getInitialPolicies", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "getSigProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "getTargetCertConstraints", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "getTrustAnchors", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "setCertPathCheckers", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "setCertStores", "(List)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "setDate", "(Date)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "PKIXParameters", True, "setInitialPolicies", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "setSigProvider", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "setTargetCertConstraints", "(CertSelector)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", True, "setTrustAnchors", "(Set)", "", "Argument[0].Element", "Argument[this]", "taint", "df-generated"]
       - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponder", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security.cert", "PKIXRevocationChecker", True, "getOcspResponderCert", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -215,7 +179,6 @@ extensions:
       - ["java.security.cert", "CertPathValidatorSpi", "engineGetRevocationChecker", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertPathValidatorSpi", "engineValidate", "(CertPath,CertPathParameters)", "summary", "df-generated"]
       - ["java.security.cert", "CertSelector", "match", "(Certificate)", "summary", "df-generated"]
-      - ["java.security.cert", "CertStore", "getDefaultType", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertStoreSpi", "CertStoreSpi", "(CertStoreParameters)", "summary", "df-generated"]
       - ["java.security.cert", "CertStoreSpi", "engineGetCRLs", "(CRLSelector)", "summary", "df-generated"]
       - ["java.security.cert", "CertStoreSpi", "engineGetCertificates", "(CertSelector)", "summary", "df-generated"]
@@ -224,11 +187,6 @@ extensions:
       - ["java.security.cert", "Certificate", "verify", "(PublicKey)", "summary", "df-generated"]
       - ["java.security.cert", "Certificate", "verify", "(PublicKey,Provider)", "summary", "df-generated"]
       - ["java.security.cert", "Certificate", "verify", "(PublicKey,String)", "summary", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", "generateCRLs", "(InputStream)", "summary", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", "generateCertPath", "(InputStream)", "summary", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", "generateCertPath", "(InputStream,String)", "summary", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", "generateCertificates", "(InputStream)", "summary", "df-generated"]
-      - ["java.security.cert", "CertificateFactory", "getCertPathEncodings", "()", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCRL", "(InputStream)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCRLs", "(InputStream)", "summary", "df-generated"]
       - ["java.security.cert", "CertificateFactorySpi", "engineGenerateCertPath", "(InputStream)", "summary", "df-generated"]
@@ -244,13 +202,10 @@ extensions:
       - ["java.security.cert", "PKIXBuilderParameters", "setMaxPathLength", "(int)", "summary", "df-generated"]
       - ["java.security.cert", "PKIXCertPathChecker", "check", "(Certificate,Collection)", "summary", "df-generated"]
       - ["java.security.cert", "PKIXCertPathChecker", "getSupportedExtensions", "()", "summary", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", "PKIXParameters", "(KeyStore)", "summary", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", "getPolicyQualifiersRejected", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "isAnyPolicyInhibited", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "isExplicitPolicyRequired", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "isPolicyMappingInhibited", "()", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "isRevocationEnabled", "()", "summary", "df-generated"]
-      - ["java.security.cert", "PKIXParameters", "setAnyPolicyInhibited", "(boolean)", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "setExplicitPolicyRequired", "(boolean)", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "setPolicyMappingInhibited", "(boolean)", "summary", "df-generated"]
       - ["java.security.cert", "PKIXParameters", "setPolicyQualifiersRejected", "(boolean)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.security.model.yml b/java/ql/lib/ext/generated/java.security.model.yml
index d170abb8188..15b410e1fe8 100644
--- a/java/ql/lib/ext/generated/java.security.model.yml
+++ b/java/ql/lib/ext/generated/java.security.model.yml
@@ -48,13 +48,6 @@ extensions:
       - ["java.security", "CodeSigner", False, "CodeSigner", "(CertPath,Timestamp)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "CodeSigner", False, "getSignerCertPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "CodeSigner", False, "getTimestamp", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "CodeSource", True, "CodeSource", "(URL,Certificate[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "CodeSource", True, "CodeSource", "(URL,Certificate[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "CodeSource", True, "CodeSource", "(URL,CodeSigner[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "CodeSource", True, "CodeSource", "(URL,CodeSigner[])", "", "Argument[1].ArrayElement", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "CodeSource", True, "getCertificates", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "CodeSource", True, "getCodeSigners", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.security", "CodeSource", True, "getLocation", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "DigestException", True, "DigestException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "DigestException", True, "DigestException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "DigestException", True, "DigestException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -200,7 +193,6 @@ extensions:
       - ["java.security", "KeyStoreException", True, "KeyStoreException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.security", "KeyStoreSpi", True, "engineGetEntry", "(String,KeyStore$ProtectionParameter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "KeyStoreSpi", True, "engineSetEntry", "(String,KeyStore$Entry,KeyStore$ProtectionParameter)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.security", "MessageDigest", True, "digest", "(byte[],int,int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["java.security", "MessageDigest", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "MessageDigest", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.security", "MessageDigest", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.text.model.yml b/java/ql/lib/ext/generated/java.text.model.yml
index 6418b607358..2f384e7c178 100644
--- a/java/ql/lib/ext/generated/java.text.model.yml
+++ b/java/ql/lib/ext/generated/java.text.model.yml
@@ -88,24 +88,11 @@ extensions:
       - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "FieldPosition", True, "FieldPosition", "(Format$Field,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.text", "FieldPosition", True, "getFieldAttribute", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "format", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "format", "(Object)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.text", "Format", True, "format", "(Object,StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "Format", True, "parseObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "Format", True, "parseObject", "(String,ParsePosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "MessageFormat", True, "MessageFormat", "(String,Locale)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[0].ArrayElement", "Argument[1]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "format", "(Object[],StringBuffer,FieldPosition)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.text", "MessageFormat", True, "format", "(String,Object[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "MessageFormat", True, "getFormats", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "MessageFormat", True, "getFormatsByArgumentIndex", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.text", "MessageFormat", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.logging.model.yml b/java/ql/lib/ext/generated/java.util.logging.model.yml
index 2ad409bc45e..5ca7ed9013a 100644
--- a/java/ql/lib/ext/generated/java.util.logging.model.yml
+++ b/java/ql/lib/ext/generated/java.util.logging.model.yml
@@ -37,7 +37,6 @@ extensions:
       - ["java.util.logging", "LogRecord", True, "getLoggerName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "getMessage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "getResourceBundle", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "getResourceBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "getSourceClassName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "getSourceMethodName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -47,7 +46,6 @@ extensions:
       - ["java.util.logging", "LogRecord", True, "setLoggerName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "setLongThreadID", "(long)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "setMessage", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.logging", "LogRecord", True, "setParameters", "(Object[])", "", "Argument[0].ArrayElement", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "setResourceBundle", "(ResourceBundle)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "setResourceBundleName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.logging", "LogRecord", True, "setSourceClassName", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.model.yml b/java/ql/lib/ext/generated/java.util.model.yml
index a8532c297ad..e6170696fba 100644
--- a/java/ql/lib/ext/generated/java.util.model.yml
+++ b/java/ql/lib/ext/generated/java.util.model.yml
@@ -4,7 +4,6 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["java.util", "Arrays", True, "deepToString", "(Object[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Base64$Encoder", True, "withoutPadding", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.util", "Base64", True, "getMimeEncoder", "(int,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Calendar$Builder", True, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -29,10 +28,6 @@ extensions:
       - ["java.util", "Calendar", True, "getInstance", "(TimeZone,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Calendar", True, "getTimeZone", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Calendar", True, "setTimeZone", "(TimeZone)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Collections", True, "asLifoQueue", "(Deque)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Collections", True, "checkedQueue", "(Queue,Class)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Collections", True, "newSetFromMap", "(Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Collections", True, "reverseOrder", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Comparator", True, "nullsFirst", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Comparator", True, "nullsLast", "(Comparator)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Comparator", True, "reversed", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -51,26 +46,6 @@ extensions:
       - ["java.util", "Currency", False, "getSymbol", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "DuplicateFormatFlagsException", True, "DuplicateFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "DuplicateFormatFlagsException", True, "getFlags", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "complementOf", "(EnumSet)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "copyOf", "(Collection)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "copyOf", "(EnumSet)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum,Enum,Enum,Enum)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "EnumSet", True, "of", "(Enum,Enum[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "EventListenerProxy", True, "EventListenerProxy", "(EventListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "EventListenerProxy", True, "getListener", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "FormatFlagsConversionMismatchException", True, "FormatFlagsConversionMismatchException", "(String,char)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -125,62 +100,6 @@ extensions:
       - ["java.util", "InputMismatchException", True, "InputMismatchException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "InvalidPropertiesFormatException", True, "InvalidPropertiesFormatException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "InvalidPropertiesFormatException", True, "InvalidPropertiesFormatException", "(Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "addUnicodeLocaleAttribute", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "build", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "clear", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "clearExtensions", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "removeUnicodeLocaleAttribute", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setExtension", "(char,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setLanguage", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setLanguageTag", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setLocale", "(Locale)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setLocale", "(Locale)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setRegion", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setScript", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setUnicodeLocaleKeyword", "(String,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setVariant", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale$Builder", False, "setVariant", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "LanguageRange", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "LanguageRange", "(String,double)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "getRange", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "mapEquivalents", "(List,Map)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "mapEquivalents", "(List,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "parse", "(String,Map)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale$LanguageRange", False, "parse", "(String,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "Locale", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "Locale", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "Locale", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "Locale", "(String,String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "Locale", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "Locale", "(String,String,String)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "filterTags", "(List,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "filterTags", "(List,Collection,Locale$FilteringMode)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getCountry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayCountry", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayCountry", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayCountry", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayLanguage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayLanguage", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayLanguage", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayName", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayName", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayScript", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayScript", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayScript", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayVariant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayVariant", "(Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getDisplayVariant", "(Locale)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getExtensionKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getISO3Language", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getLanguage", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getScript", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "getVariant", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "lookupTag", "(List,Collection)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "stripExtensions", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Locale", False, "toLanguageTag", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Map$Entry", True, "copyOf", "(Map$Entry)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Map", True, "compute", "(Object,BiFunction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "Map", True, "compute", "(Object,BiFunction)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "Map", True, "computeIfPresent", "(Object,BiFunction)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -217,19 +136,6 @@ extensions:
       - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle$Control", True, "toResourceName", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "getBaseBundleName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader,ResourceBundle$Control)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ClassLoader,ResourceBundle$Control)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ResourceBundle$Control)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Locale,ResourceBundle$Control)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "ResourceBundle", True, "getBundle", "(String,ResourceBundle$Control)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "getKeys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "getLocale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "getObject", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -238,15 +144,6 @@ extensions:
       - ["java.util", "ResourceBundle", True, "getStringArray", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "handleGetObject", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ResourceBundle", True, "keySet", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "delimiter", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "findAll", "(Pattern)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "findAll", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "findAll", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "hasNext", "(Pattern)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "hasNext", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "ioException", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "locale", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util", "Scanner", False, "match", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "ServiceConfigurationError", True, "ServiceConfigurationError", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -284,8 +181,6 @@ extensions:
       - ["java.util", "Timer", True, "Timer", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "Timer", True, "Timer", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "TooManyListenersException", True, "TooManyListenersException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "TreeMap", True, "TreeMap", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util", "TreeSet", True, "TreeSet", "(Comparator)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "UnknownFormatConversionException", True, "UnknownFormatConversionException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util", "UnknownFormatConversionException", True, "getConversion", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util", "UnknownFormatFlagsException", True, "UnknownFormatFlagsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -592,8 +487,6 @@ extensions:
       - ["java.util", "DoubleSummaryStatistics", "getMin", "()", "summary", "df-generated"]
       - ["java.util", "DoubleSummaryStatistics", "getSum", "()", "summary", "df-generated"]
       - ["java.util", "EnumMap", "EnumMap", "(Class)", "summary", "df-generated"]
-      - ["java.util", "EnumSet", "allOf", "(Class)", "summary", "df-generated"]
-      - ["java.util", "EnumSet", "noneOf", "(Class)", "summary", "df-generated"]
       - ["java.util", "EnumSet", "range", "(Enum,Enum)", "summary", "df-generated"]
       - ["java.util", "FormatFlagsConversionMismatchException", "getConversion", "()", "summary", "df-generated"]
       - ["java.util", "Formatter", "Formatter", "(File)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.prefs.model.yml b/java/ql/lib/ext/generated/java.util.prefs.model.yml
index bb056466a61..e87f3c13a9a 100644
--- a/java/ql/lib/ext/generated/java.util.prefs.model.yml
+++ b/java/ql/lib/ext/generated/java.util.prefs.model.yml
@@ -24,22 +24,11 @@ extensions:
       - ["java.util.prefs", "Preferences", True, "addNodeChangeListener", "(NodeChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "addPreferenceChangeListener", "(PreferenceChangeListener)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "childrenNames", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "get", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "get", "(String,String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "getByteArray", "(String,byte[])", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "keys", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "node", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "node", "(String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.util.prefs", "Preferences", True, "parent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "put", "(String,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "put", "(String,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "putBoolean", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "putByteArray", "(String,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "putDouble", "(String,double)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "putFloat", "(String,float)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "putInt", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["java.util.prefs", "Preferences", True, "putLong", "(String,long)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
@@ -48,14 +37,8 @@ extensions:
       - ["java.util.prefs", "Preferences", "exportNode", "(OutputStream)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "exportSubtree", "(OutputStream)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "flush", "()", "summary", "df-generated"]
-      - ["java.util.prefs", "Preferences", "getBoolean", "(String,boolean)", "summary", "df-generated"]
-      - ["java.util.prefs", "Preferences", "getDouble", "(String,double)", "summary", "df-generated"]
-      - ["java.util.prefs", "Preferences", "getFloat", "(String,float)", "summary", "df-generated"]
-      - ["java.util.prefs", "Preferences", "getInt", "(String,int)", "summary", "df-generated"]
-      - ["java.util.prefs", "Preferences", "getLong", "(String,long)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "importPreferences", "(InputStream)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "isUserNode", "()", "summary", "df-generated"]
-      - ["java.util.prefs", "Preferences", "nodeExists", "(String)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "remove", "(String)", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "removeNode", "()", "summary", "df-generated"]
       - ["java.util.prefs", "Preferences", "removeNodeChangeListener", "(NodeChangeListener)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.regex.model.yml b/java/ql/lib/ext/generated/java.util.regex.model.yml
index 6796f7ba32a..8b5680b1311 100644
--- a/java/ql/lib/ext/generated/java.util.regex.model.yml
+++ b/java/ql/lib/ext/generated/java.util.regex.model.yml
@@ -6,17 +6,6 @@ extensions:
     data:
       - ["java.util.regex", "MatchResult", True, "group", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.regex", "MatchResult", True, "group", "(int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuffer,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuffer,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuilder,String)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendReplacement", "(StringBuilder,String)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuffer)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuffer)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "appendTail", "(StringBuilder)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["java.util.regex", "Matcher", False, "pattern", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.regex", "Matcher", False, "quoteReplacement", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["java.util.regex", "Matcher", False, "region", "(int,int)", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
       - ["java.util.regex", "Matcher", False, "reset", "()", "", "Argument[this]", "ReturnValue", "value", "df-generated"]
@@ -44,12 +33,10 @@ extensions:
       - ["java.util.regex", "MatchResult", "start", "()", "summary", "df-generated"]
       - ["java.util.regex", "MatchResult", "start", "(int)", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "end", "(String)", "summary", "df-generated"]
-      - ["java.util.regex", "Matcher", "find", "(int)", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "hasAnchoringBounds", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "hasTransparentBounds", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "hitEnd", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "lookingAt", "()", "summary", "df-generated"]
-      - ["java.util.regex", "Matcher", "matches", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "regionEnd", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "regionStart", "()", "summary", "df-generated"]
       - ["java.util.regex", "Matcher", "requireEnd", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/java.util.stream.model.yml b/java/ql/lib/ext/generated/java.util.stream.model.yml
index edd36e33405..ce97043b8dd 100644
--- a/java/ql/lib/ext/generated/java.util.stream.model.yml
+++ b/java/ql/lib/ext/generated/java.util.stream.model.yml
@@ -116,9 +116,6 @@ extensions:
       - ["java.util.stream", "Collectors", "groupingBy", "(Function,Collector)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "groupingByConcurrent", "(Function)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "groupingByConcurrent", "(Function,Collector)", "summary", "df-generated"]
-      - ["java.util.stream", "Collectors", "joining", "()", "summary", "df-generated"]
-      - ["java.util.stream", "Collectors", "joining", "(CharSequence)", "summary", "df-generated"]
-      - ["java.util.stream", "Collectors", "joining", "(CharSequence,CharSequence,CharSequence)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "maxBy", "(Comparator)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "minBy", "(Comparator)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "partitioningBy", "(Predicate)", "summary", "df-generated"]
@@ -134,8 +131,6 @@ extensions:
       - ["java.util.stream", "Collectors", "summingLong", "(ToLongFunction)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toConcurrentMap", "(Function,Function)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toConcurrentMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
-      - ["java.util.stream", "Collectors", "toMap", "(Function,Function)", "summary", "df-generated"]
-      - ["java.util.stream", "Collectors", "toMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toUnmodifiableList", "()", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toUnmodifiableMap", "(Function,Function)", "summary", "df-generated"]
       - ["java.util.stream", "Collectors", "toUnmodifiableMap", "(Function,Function,BinaryOperator)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.crypto.model.yml b/java/ql/lib/ext/generated/javax.crypto.model.yml
index 84a2a5c724b..727ba26863f 100644
--- a/java/ql/lib/ext/generated/javax.crypto.model.yml
+++ b/java/ql/lib/ext/generated/javax.crypto.model.yml
@@ -6,65 +6,6 @@ extensions:
     data:
       - ["javax.crypto", "AEADBadTagException", True, "AEADBadTagException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "BadPaddingException", True, "BadPaddingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[this]", "Argument[3]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getExemptionMechanism", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getInstance", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getParameters", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Certificate,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameters,SecureRandom)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "init", "(int,Key,SecureRandom)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "unwrap", "(byte[],String,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "unwrap", "(byte[],String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "unwrap", "(byte[],String,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[this]", "Argument[1]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[3]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "updateAAD", "(ByteBuffer)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "updateAAD", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "updateAAD", "(byte[],int,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "wrap", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Cipher", True, "wrap", "(Key)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "CipherInputStream", True, "CipherInputStream", "(InputStream,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "CipherInputStream", True, "CipherInputStream", "(InputStream,Cipher)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "CipherOutputStream", True, "CipherOutputStream", "(OutputStream,Cipher)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -120,7 +61,6 @@ extensions:
       - ["javax.crypto", "KeyGenerator", True, "init", "(AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "init", "(SecureRandom)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "KeyGenerator", True, "init", "(int,SecureRandom)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "doFinal", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "Mac", True, "doFinal", "(byte[])", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "Mac", True, "doFinal", "(byte[],int)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
       - ["javax.crypto", "Mac", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -129,7 +69,6 @@ extensions:
       - ["javax.crypto", "Mac", True, "getInstance", "(String,Provider)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "Mac", True, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto", "Mac", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto", "Mac", True, "init", "(Key)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "Mac", True, "init", "(Key,AlgorithmParameterSpec)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "NoSuchPaddingException", True, "NoSuchPaddingException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
       - ["javax.crypto", "SealedObject", True, "SealedObject", "(Serializable,Cipher)", "", "Argument[0]", "Argument[1]", "taint", "df-generated"]
diff --git a/java/ql/lib/ext/generated/javax.crypto.spec.model.yml b/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
index d8eab143d30..9f7408d3e36 100644
--- a/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
+++ b/java/ql/lib/ext/generated/javax.crypto.spec.model.yml
@@ -39,10 +39,6 @@ extensions:
       - ["javax.crypto.spec", "PSource", True, "getAlgorithm", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto.spec", "RC2ParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
       - ["javax.crypto.spec", "RC5ParameterSpec", True, "getIV", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],int,int,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["javax.crypto.spec", "SecretKeySpec", True, "SecretKeySpec", "(byte[],int,int,String)", "", "Argument[3]", "Argument[this]", "taint", "df-generated"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel

From 52e6ea30e72fb1c8f9fce1228b5f02991f798f6b Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Sat, 13 Jan 2024 16:17:54 +0000
Subject: [PATCH 039/136] Accept more capture summary models

This line is added because `FileOutputStream`'s constructor is now modeled as propagating taint, not just as a sink.
| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];ReturnValue;taint;df-generated |
---
 .../utils/modelgenerator/dataflow/CaptureNeutralModels.expected  | 1 -
 .../utils/modelgenerator/dataflow/CaptureSummaryModels.expected  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.expected b/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.expected
index 5ae6398fb6f..df6a7bfc854 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.expected
+++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.expected
@@ -14,7 +14,6 @@
 | p;Pojo;getFloatArray;();summary;df-generated |
 | p;Pojo;getIntValue;();summary;df-generated |
 | p;Pojo;getPrimitiveArray;();summary;df-generated |
-| p;PrivateFlowViaPublicInterface$SPI;openStream;();summary;df-generated |
 | p;PrivateFlowViaPublicInterface$SPI;openStreamNone;();summary;df-generated |
 | p;PrivateFlowViaPublicInterface;createAnSPIWithoutTrackingFile;(File);summary;df-generated |
 | p;Sinks;copyFileToDirectory;(Path,Path,CopyOption[]);summary;df-generated |
diff --git a/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.expected b/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.expected
index 2654c4d94d6..50536e850d9 100644
--- a/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.expected
+++ b/java/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.expected
@@ -43,4 +43,5 @@
 | p;Pojo;false;getCharArray;();;Argument[this];ReturnValue;taint;df-generated |
 | p;Pojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated |
 | p;Pojo;false;setValue;(String);;Argument[0];Argument[this];taint;df-generated |
+| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[this];ReturnValue;taint;df-generated |
 | p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint;df-generated |

From 776c9d9eb23e5fa4454b3aa21a09891bfd7d0f63 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Sat, 13 Jan 2024 16:19:04 +0000
Subject: [PATCH 040/136] Accept changes to top jdk apis test

---
 .../TopJdkApisTest/TopJdkApisTest.expected                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected
index 64748f77765..d5176a7a4de 100644
--- a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected
+++ b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected
@@ -14,10 +14,10 @@
 | java.time.chrono | 0 | 0 | 0 | 1 | 1 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.time.format | 0 | 0 | 0 | 2 | 2 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.util | 0 | 0 | 86 | 64 | 150 | 0.5733333333333334 | 0.0 | 0.5733333333333334 | 0.0 | NaN | 0.4266666666666667 |
-| java.util.concurrent | 0 | 0 | 9 | 9 | 18 | 0.5 | 0.0 | 0.5 | 0.0 | NaN | 0.5 |
+| java.util.concurrent | 1 | 0 | 9 | 8 | 18 | 0.5555555555555556 | 0.05555555555555555 | 0.5 | 0.0 | 0.0 | 0.4444444444444444 |
 | java.util.concurrent.atomic | 0 | 0 | 2 | 11 | 13 | 0.15384615384615385 | 0.0 | 0.15384615384615385 | 0.0 | NaN | 0.8461538461538461 |
 | java.util.concurrent.locks | 0 | 0 | 0 | 2 | 2 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.util.function | 0 | 0 | 0 | 1 | 1 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.util.logging | 0 | 0 | 1 | 1 | 2 | 0.5 | 0.0 | 0.5 | 0.0 | NaN | 0.5 |
 | java.util.regex | 0 | 0 | 3 | 1 | 4 | 0.75 | 0.0 | 0.75 | 0.0 | NaN | 0.25 |
-| java.util.stream | 0 | 0 | 18 | 8 | 26 | 0.6923076923076923 | 0.0 | 0.6923076923076923 | 0.0 | NaN | 0.3076923076923077 |
+| java.util.stream | 1 | 0 | 18 | 7 | 26 | 0.7307692307692307 | 0.038461538461538464 | 0.6923076923076923 | 0.0 | 0.0 | 0.2692307692307692 |

From 9067a337b004a074d5f94c8edea152ef77cdc0e0 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Sat, 13 Jan 2024 16:21:00 +0000
Subject: [PATCH 041/136] Test fixed by model for `BasicAttributes(String,
 Object)`

---
 .../security/CWE-090/LdapInjection.expected       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected b/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
index 69c97ca8487..caf00094074 100644
--- a/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
+++ b/java/ql/test/query-tests/security/CWE-090/LdapInjection.expected
@@ -8,14 +8,20 @@ edges
 | LdapInjection.java:63:28:63:59 | jBadInitial : String | LdapInjection.java:65:29:65:55 | ... + ... | provenance |  |
 | LdapInjection.java:69:28:69:52 | jBad : String | LdapInjection.java:71:84:71:103 | ... + ... | provenance |  |
 | LdapInjection.java:69:55:69:88 | jBadDNNameAdd : String | LdapInjection.java:71:53:71:79 | ... + ... : String | provenance |  |
+| LdapInjection.java:71:16:71:31 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:81 | addAll(...) | provenance |  |
+| LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:31 | new LdapName(...) : LdapName | provenance |  |
 | LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | LdapInjection.java:71:16:71:81 | addAll(...) | provenance |  |
 | LdapInjection.java:71:53:71:79 | ... + ... : String | LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | provenance |  |
 | LdapInjection.java:75:28:75:52 | jBad : String | LdapInjection.java:79:47:79:66 | ... + ... | provenance |  |
 | LdapInjection.java:75:55:75:89 | jBadDNNameAdd2 : String | LdapInjection.java:78:30:78:57 | ... + ... : String | provenance |  |
 | LdapInjection.java:78:5:78:8 | name : LdapName | LdapInjection.java:79:40:79:43 | name : LdapName | provenance |  |
+| LdapInjection.java:78:5:78:8 | name [post update] : LdapName | LdapInjection.java:79:40:79:43 | name : LdapName | provenance |  |
 | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | LdapInjection.java:78:17:78:68 | getRdns(...) : List | provenance |  |
 | LdapInjection.java:78:17:78:68 | getRdns(...) : List | LdapInjection.java:78:5:78:8 | name : LdapName | provenance |  |
+| LdapInjection.java:78:17:78:68 | getRdns(...) : List | LdapInjection.java:78:5:78:8 | name [post update] : LdapName | provenance |  |
 | LdapInjection.java:78:30:78:57 | ... + ... : String | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | provenance |  |
+| LdapInjection.java:79:16:79:31 | new LdapName(...) : LdapName | LdapInjection.java:79:16:79:44 | addAll(...) | provenance |  |
+| LdapInjection.java:79:40:79:43 | name : LdapName | LdapInjection.java:79:16:79:31 | new LdapName(...) : LdapName | provenance |  |
 | LdapInjection.java:79:40:79:43 | name : LdapName | LdapInjection.java:79:16:79:44 | addAll(...) | provenance |  |
 | LdapInjection.java:83:28:83:52 | jBad : String | LdapInjection.java:85:75:85:94 | ... + ... | provenance |  |
 | LdapInjection.java:83:55:83:93 | jBadDNNameToString : String | LdapInjection.java:85:29:85:60 | ... + ... : String | provenance |  |
@@ -26,6 +32,8 @@ edges
 | LdapInjection.java:91:23:91:65 | new LdapName(...) : LdapName | LdapInjection.java:91:23:91:73 | clone(...) : Object | provenance |  |
 | LdapInjection.java:91:23:91:73 | clone(...) : Object | LdapInjection.java:91:16:91:73 | (...)... | provenance |  |
 | LdapInjection.java:91:36:91:64 | ... + ... : String | LdapInjection.java:91:23:91:65 | new LdapName(...) : LdapName | provenance |  |
+| LdapInjection.java:100:27:100:59 | jOkAttribute : String | LdapInjection.java:101:49:101:60 | jOkAttribute : String | provenance |  |
+| LdapInjection.java:101:49:101:60 | jOkAttribute : String | LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | provenance |  |
 | LdapInjection.java:106:31:106:55 | uBad : String | LdapInjection.java:108:67:108:86 | ... + ... | provenance |  |
 | LdapInjection.java:106:58:106:84 | uBadDN : String | LdapInjection.java:108:20:108:39 | ... + ... | provenance |  |
 | LdapInjection.java:112:31:112:67 | uBadFilterCreate : String | LdapInjection.java:113:72:113:87 | uBadFilterCreate : String | provenance |  |
@@ -154,6 +162,7 @@ nodes
 | LdapInjection.java:65:29:65:55 | ... + ... | semmle.label | ... + ... |
 | LdapInjection.java:69:28:69:52 | jBad : String | semmle.label | jBad : String |
 | LdapInjection.java:69:55:69:88 | jBadDNNameAdd : String | semmle.label | jBadDNNameAdd : String |
+| LdapInjection.java:71:16:71:31 | new LdapName(...) : LdapName | semmle.label | new LdapName(...) : LdapName |
 | LdapInjection.java:71:16:71:81 | addAll(...) | semmle.label | addAll(...) |
 | LdapInjection.java:71:40:71:80 | new LdapName(...) : LdapName | semmle.label | new LdapName(...) : LdapName |
 | LdapInjection.java:71:53:71:79 | ... + ... : String | semmle.label | ... + ... : String |
@@ -161,9 +170,11 @@ nodes
 | LdapInjection.java:75:28:75:52 | jBad : String | semmle.label | jBad : String |
 | LdapInjection.java:75:55:75:89 | jBadDNNameAdd2 : String | semmle.label | jBadDNNameAdd2 : String |
 | LdapInjection.java:78:5:78:8 | name : LdapName | semmle.label | name : LdapName |
+| LdapInjection.java:78:5:78:8 | name [post update] : LdapName | semmle.label | name [post update] : LdapName |
 | LdapInjection.java:78:17:78:58 | new LdapName(...) : LdapName | semmle.label | new LdapName(...) : LdapName |
 | LdapInjection.java:78:17:78:68 | getRdns(...) : List | semmle.label | getRdns(...) : List |
 | LdapInjection.java:78:30:78:57 | ... + ... : String | semmle.label | ... + ... : String |
+| LdapInjection.java:79:16:79:31 | new LdapName(...) : LdapName | semmle.label | new LdapName(...) : LdapName |
 | LdapInjection.java:79:16:79:44 | addAll(...) | semmle.label | addAll(...) |
 | LdapInjection.java:79:40:79:43 | name : LdapName | semmle.label | name : LdapName |
 | LdapInjection.java:79:47:79:66 | ... + ... | semmle.label | ... + ... |
@@ -180,6 +191,9 @@ nodes
 | LdapInjection.java:91:23:91:73 | clone(...) : Object | semmle.label | clone(...) : Object |
 | LdapInjection.java:91:36:91:64 | ... + ... : String | semmle.label | ... + ... : String |
 | LdapInjection.java:91:76:91:95 | ... + ... | semmle.label | ... + ... |
+| LdapInjection.java:100:27:100:59 | jOkAttribute : String | semmle.label | jOkAttribute : String |
+| LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | semmle.label | new BasicAttributes(...) |
+| LdapInjection.java:101:49:101:60 | jOkAttribute : String | semmle.label | jOkAttribute : String |
 | LdapInjection.java:106:31:106:55 | uBad : String | semmle.label | uBad : String |
 | LdapInjection.java:106:58:106:84 | uBadDN : String | semmle.label | uBadDN : String |
 | LdapInjection.java:108:20:108:39 | ... + ... | semmle.label | ... + ... |
@@ -348,6 +362,7 @@ subpaths
 | LdapInjection.java:85:75:85:94 | ... + ... | LdapInjection.java:83:28:83:52 | jBad : String | LdapInjection.java:85:75:85:94 | ... + ... | This LDAP query depends on a $@. | LdapInjection.java:83:28:83:52 | jBad | user-provided value |
 | LdapInjection.java:91:16:91:73 | (...)... | LdapInjection.java:89:55:89:90 | jBadDNNameClone : String | LdapInjection.java:91:16:91:73 | (...)... | This LDAP query depends on a $@. | LdapInjection.java:89:55:89:90 | jBadDNNameClone | user-provided value |
 | LdapInjection.java:91:76:91:95 | ... + ... | LdapInjection.java:89:28:89:52 | jBad : String | LdapInjection.java:91:76:91:95 | ... + ... | This LDAP query depends on a $@. | LdapInjection.java:89:28:89:52 | jBad | user-provided value |
+| LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | LdapInjection.java:100:27:100:59 | jOkAttribute : String | LdapInjection.java:101:29:101:75 | new BasicAttributes(...) | This LDAP query depends on a $@. | LdapInjection.java:100:27:100:59 | jOkAttribute | user-provided value |
 | LdapInjection.java:108:20:108:39 | ... + ... | LdapInjection.java:106:58:106:84 | uBadDN : String | LdapInjection.java:108:20:108:39 | ... + ... | This LDAP query depends on a $@. | LdapInjection.java:106:58:106:84 | uBadDN | user-provided value |
 | LdapInjection.java:108:67:108:86 | ... + ... | LdapInjection.java:106:31:106:55 | uBad : String | LdapInjection.java:108:67:108:86 | ... + ... | This LDAP query depends on a $@. | LdapInjection.java:106:31:106:55 | uBad | user-provided value |
 | LdapInjection.java:113:58:113:88 | create(...) | LdapInjection.java:112:31:112:67 | uBadFilterCreate : String | LdapInjection.java:113:58:113:88 | create(...) | This LDAP query depends on a $@. | LdapInjection.java:112:31:112:67 | uBadFilterCreate | user-provided value |

From 2d24fe011bfc70b5518cd69b9b24bb79bd3c1285 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Sat, 13 Jan 2024 16:35:39 +0000
Subject: [PATCH 042/136] Accept that lots of sinks are now summaries as well

---
 .../modeleditor/ApplicationModeEndpoints.expected    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected b/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected
index 4d32cb7e922..d6ee3584afd 100644
--- a/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected
+++ b/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected
@@ -1,13 +1,23 @@
 | com/github/codeql/test/NonPublicClass.java:5:5:5:28 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/NonPublicClass.java:5:5:5:28 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:8:5:8:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicClass.java:8:5:8:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:12:5:12:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicClass.java:12:5:12:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:16:5:16:45 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicClass.java:16:5:16:45 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:16:24:16:44 | get(...) | java.nio.file | Paths | get | (String,String[]) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:20:5:20:68 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
-| com/github/codeql/test/PublicClass.java:20:24:20:47 | getDefault(...) | java.nio.file | FileSystems | getDefault | () | false | rt.jar |  |  | source |
+| com/github/codeql/test/PublicClass.java:20:5:20:68 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
+| com/github/codeql/test/PublicClass.java:20:24:20:47 | getDefault(...) | java.nio.file | FileSystems | getDefault | () | true | rt.jar |  | neutral | source |
 | com/github/codeql/test/PublicClass.java:20:24:20:67 | getPath(...) | java.nio.file | FileSystem | getPath | (String,String[]) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicClass.java:24:5:24:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicClass.java:24:5:24:27 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicGenericClass.java:7:5:7:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicGenericClass.java:7:5:7:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicGenericClass.java:11:5:11:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicGenericClass.java:11:5:11:27 | println(...) | java.io | PrintStream | println | (Object) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicGenericInterface.java:8:7:8:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicGenericInterface.java:8:7:8:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |
 | com/github/codeql/test/PublicInterface.java:7:7:7:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | sink | source |
+| com/github/codeql/test/PublicInterface.java:7:7:7:29 | println(...) | java.io | PrintStream | println | (String) | true | rt.jar |  | summary | source |

From fa614df3f4c5c506bb6a7f0c4698c4dd965aa397 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 6 Dec 2023 17:09:08 +0000
Subject: [PATCH 043/136] Tests fixed by model for `CharBuffer.wrap(char[])`

---
 .../frameworks/apache-commons-lang3/StrBuilderTest.java     | 6 +++---
 .../frameworks/apache-commons-lang3/StrBuilderTextTest.java | 6 +++---
 .../apache-commons-lang3/TextStringBuilderTest.java         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java
index 35a118f8048..fe197b4f264 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java
@@ -18,8 +18,8 @@ class StrBuilderTest {
 
         StrBuilder sb1 = new StrBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $hasTaintFlow
         StrBuilder sb2 = new StrBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $hasTaintFlow
-        StrBuilder sb3 = new StrBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ MISSING: hasTaintFlow
-        StrBuilder sb4 = new StrBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ MISSING: hasTaintFlow
+        StrBuilder sb3 = new StrBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ hasTaintFlow
+        StrBuilder sb4 = new StrBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ hasTaintFlow
         StrBuilder sb5 = new StrBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $hasTaintFlow
         StrBuilder sb6 = new StrBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $hasTaintFlow
         StrBuilder sb7 = new StrBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $hasTaintFlow
@@ -206,4 +206,4 @@ class StrBuilderTest {
         sink(fluentAllMethodsTest2); // $hasTaintFlow
     }
 
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java
index 43171647004..b3aa3ed9997 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java
@@ -18,8 +18,8 @@ class StrBuilderTextTest {
 
         StrBuilder sb1 = new StrBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $hasTaintFlow
         StrBuilder sb2 = new StrBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $hasTaintFlow
-        StrBuilder sb3 = new StrBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ MISSING: hasTaintFlow
-        StrBuilder sb4 = new StrBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ MISSING: hasTaintFlow
+        StrBuilder sb3 = new StrBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ hasTaintFlow
+        StrBuilder sb4 = new StrBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ hasTaintFlow
         StrBuilder sb5 = new StrBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $hasTaintFlow
         StrBuilder sb6 = new StrBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $hasTaintFlow
         StrBuilder sb7 = new StrBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $hasTaintFlow
@@ -206,4 +206,4 @@ class StrBuilderTextTest {
         sink(fluentAllMethodsTest2); // $hasTaintFlow
     }
 
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java
index 41941cca223..5a7c66c7526 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java
@@ -19,8 +19,8 @@ class TextStringBuilderTest {
 
         TextStringBuilder sb1 = new TextStringBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $hasTaintFlow
         TextStringBuilder sb2 = new TextStringBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $hasTaintFlow
-        TextStringBuilder sb3 = new TextStringBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ MISSING: hasTaintFlow
-        TextStringBuilder sb4 = new TextStringBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ MISSING: hasTaintFlow
+        TextStringBuilder sb3 = new TextStringBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ hasTaintFlow
+        TextStringBuilder sb4 = new TextStringBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ hasTaintFlow
         TextStringBuilder sb5 = new TextStringBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $hasTaintFlow
         TextStringBuilder sb6 = new TextStringBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $hasTaintFlow
         TextStringBuilder sb7 = new TextStringBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $hasTaintFlow
@@ -207,4 +207,4 @@ class TextStringBuilderTest {
         sink(fluentAllMethodsTest2); // $hasTaintFlow
     }
 
-}
\ No newline at end of file
+}

From a5979e209ae332f03c2d0e2f66c8f941d12022fc Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Tue, 19 Mar 2024 13:53:10 +0000
Subject: [PATCH 044/136] Add change note

---
 .../lib/change-notes/2024-03-19-many-generated-jdk-models.md  | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md

diff --git a/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md b/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
new file mode 100644
index 00000000000..c4abc9a0385
--- /dev/null
+++ b/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* About 15,000 summary models and neutral summary models for the JDK that were generated using data flow have been added. This may lead to new results being reported.

From e3fb40a842aa64a4a44a5f5f562a02d27ef7d126 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 20 Mar 2024 14:49:22 +0000
Subject: [PATCH 045/136] Adjust change note

---
 .../ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md b/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
index c4abc9a0385..271e313d6d0 100644
--- a/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
+++ b/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
@@ -1,4 +1,4 @@
 ---
 category: minorAnalysis
 ---
-* About 15,000 summary models and neutral summary models for the JDK that were generated using data flow have been added. This may lead to new results being reported.
+* About 15,000 summary models and neutral summary models for the JDK that were generated using data flow have been added. This may lead to new alerts being reported.

From fdafaa2ff4e7226ea222df27ebf2271497f9aae9 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Mon, 25 Mar 2024 15:09:06 +0000
Subject: [PATCH 046/136] Change note: update numbers of models added

---
 .../ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md b/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
index 271e313d6d0..72279ea8983 100644
--- a/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
+++ b/java/ql/lib/change-notes/2024-03-19-many-generated-jdk-models.md
@@ -1,4 +1,4 @@
 ---
 category: minorAnalysis
 ---
-* About 15,000 summary models and neutral summary models for the JDK that were generated using data flow have been added. This may lead to new alerts being reported.
+* About 6,700 summary models and 6,800 neutral summary models for the JDK that were generated using data flow have been added. This may lead to new alerts being reported.

From 20202aba908a7d0a3e6fc3aa64d2991e838e8768 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 2 Apr 2024 13:21:46 +0200
Subject: [PATCH 047/136] Python: Deprecate `AttributeName`

---
 python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll b/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll
index 9d0bcb3c487..8d1c691915b 100644
--- a/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/TypeTracking.qll
@@ -7,8 +7,12 @@ private import internal.TypeTrackingImpl as Impl
 import Impl::Shared::TypeTracking<Impl::TypeTrackingInput>
 private import semmle.python.dataflow.new.internal.DataFlowPublic as DataFlowPublic
 
-/** A string that may appear as the name of an attribute or access path. */
-class AttributeName = Impl::TypeTrackingInput::Content;
+/**
+ * DEPRECATED.
+ *
+ * A string that may appear as the name of an attribute or access path.
+ */
+deprecated class AttributeName = Impl::TypeTrackingInput::Content;
 
 /**
  * A summary of the steps needed to track a value to a given dataflow node.

From 8707a63edb9440890234bc4ab0019c099087f56f Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 2 Apr 2024 13:26:26 +0200
Subject: [PATCH 048/136] Python: Add comments around `storeStepCommon`

---
 .../python/dataflow/new/internal/DataFlowPrivate.qll       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index f2a52377544..1ad6d0f7e6e 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -643,6 +643,13 @@ predicate jumpStepNotSharedWithTypeTracker(Node nodeFrom, Node nodeTo) {
 //--------
 /**
  * Subset of `storeStep` that should be shared with type-tracking.
+ *
+ * NOTE: This does not include attributeStoreStep right now, since it has its' own
+ * modeling in the type-tracking library (which is slightly different due to
+ * PostUpdateNodes).
+ *
+ * As of 2024-04-02 the type-tracking library only supports precise content, so there is
+ * no reason to include steps for list content right now.
  */
 predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) {
   tupleStoreStep(nodeFrom, c, nodeTo)

From a22b9947c02eee14b05205ab7c520a2add13de5b Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 2 Apr 2024 14:52:36 +0200
Subject: [PATCH 049/136] Python: Revert `IterableSequenceNode` as
 LocalSourceNode

When looking things over a bit more, we could actually exclude the steps
that would never be used instead. A much more involved solution, but
more performance oriented and clear in terms of what is supported (at
least until we start supporting type-tracking with more than depth 1
access-path, if that ever happens)
---
 .../TypeTrackingConsistency.ql                |  4 --
 .../dataflow/new/internal/LocalSources.qll    |  2 -
 .../new/internal/TypeTrackingImpl.qll         | 45 +++++++++++++++++--
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/python/ql/consistency-queries/TypeTrackingConsistency.ql b/python/ql/consistency-queries/TypeTrackingConsistency.ql
index 551573a7aef..645bdef5219 100644
--- a/python/ql/consistency-queries/TypeTrackingConsistency.ql
+++ b/python/ql/consistency-queries/TypeTrackingConsistency.ql
@@ -27,10 +27,6 @@ private module ConsistencyChecksInput implements ConsistencyChecksInputSig {
       TypeTrackingInput::simpleLocalSmallStep*(m, n)
     )
     or
-    // TODO: when adding support for proper content, handle iterable unpacking better
-    // such as `for k,v in items:`, or `a, (b,c) = ...`
-    n instanceof DataFlow::IterableSequenceNode
-    or
     // We have missing use-use flow in
     // https://github.com/python/cpython/blob/0fb18b02c8ad56299d6a2910be0bab8ad601ef24/Lib/socketserver.py#L276-L303
     // which I couldn't just fix. We ignore the problems here, and instead rely on the
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
index 92d9e5887ad..34b137b3511 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
@@ -74,8 +74,6 @@ class LocalSourceNode extends Node {
     this instanceof ScopeEntryDefinitionNode
     or
     this instanceof ParameterNode
-    or
-    this instanceof IterableSequenceNode
   }
 
   /** Holds if this `LocalSourceNode` can flow to `nodeTo` in one or more local flow steps. */
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index ce95a6cca4e..42ce5cdd237 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -8,6 +8,7 @@ private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPr
 private import codeql.typetracking.internal.SummaryTypeTracker as SummaryTypeTracker
 private import semmle.python.dataflow.new.internal.FlowSummaryImpl as FlowSummaryImpl
 private import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch
+private import semmle.python.dataflow.new.internal.IterableUnpacking as IterableUnpacking
 
 private module SummaryTypeTrackerInput implements SummaryTypeTracker::Input {
   // Dataflow nodes
@@ -135,7 +136,27 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
   }
 
   /** Holds if there is a simple local flow step from `nodeFrom` to `nodeTo` */
-  predicate simpleLocalSmallStep = DataFlowPrivate::simpleLocalFlowStepForTypetracking/2;
+  predicate simpleLocalSmallStep(Node nodeFrom, Node nodeTo) {
+    DataFlowPrivate::simpleLocalFlowStepForTypetracking(nodeFrom, nodeTo) and
+    // for `for k,v in foo` no need to do local flow step from the synthetic sequence
+    // node for `k,v` to the tuple `k,v` -- since type-tracking only supports one level
+    // of content tracking, and there is one read-step from `foo` the synthetic sequence
+    // node required, we can skip the flow step from the synthetic sequence node to the
+    // tuple itself, since the read-step from the tuple to the tuple elements will not
+    // matter.
+    not (
+      IterableUnpacking::iterableUnpackingForReadStep(_, _, nodeFrom) and
+      IterableUnpacking::iterableUnpackingTupleFlowStep(nodeFrom, nodeTo)
+    ) and
+    // for nested iterable unpacking, such as `[[a]] = foo` or `((a,b),) = bar`, we can
+    // ignore the flow steps from the synthetic sequence node to the real sequence node,
+    // since we only support one level of content in type-trackers, and the nested
+    // structure requires two levels at least to be useful.
+    not exists(SequenceNode outer |
+      outer.getAnElement() = nodeTo.asCfgNode() and
+      IterableUnpacking::iterableUnpackingTupleFlowStep(nodeFrom, nodeTo)
+    )
+  }
 
   /** Holds if there is a level step from `nodeFrom` to `nodeTo`, which may depend on the call graph. */
   predicate levelStepCall(Node nodeFrom, LocalSourceNode nodeTo) { none() }
@@ -200,7 +221,10 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       nodeTo = storeTarget
       or
       nodeTo = storeTarget.(DataFlowPrivate::SyntheticPostUpdateNode).getPreUpdateNode()
-    )
+    ) and
+    // when only supporting precise content, no need for IterableElementNode (since it
+    // is only fed set/list content)
+    not nodeFrom instanceof DataFlowPublic::IterableElementNode
     or
     TypeTrackerSummaryFlow::basicStoreStep(nodeFrom, nodeTo, content)
   }
@@ -216,7 +240,22 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       nodeTo = a
     )
     or
-    DataFlowPrivate::readStepCommon(nodeFrom, content, nodeTo)
+    DataFlowPrivate::readStepCommon(nodeFrom, content, nodeTo) and
+    // Since we only support one level of content in type-trackers we don't actually
+    // support `(aa, ab), (ba, bb) = ...`. Therefore we exclude the read-step from `(aa,
+    // ab)` to `aa` (since it is not needed).
+    not exists(SequenceNode outer |
+      outer.getAnElement() = nodeFrom.asCfgNode() and
+      IterableUnpacking::iterableUnpackingTupleFlowStep(_, nodeFrom)
+    ) and
+    // Again, due to only supporting one level deep, for `for (k,v) in ...` we exclude read-step from
+    // the tuple to `k` and `v`.
+    not exists(DataFlowPublic::IterableSequenceNode seq, DataFlowPublic::IterableElementNode elem |
+      IterableUnpacking::iterableUnpackingForReadStep(_, _, seq) and
+      IterableUnpacking::iterableUnpackingConvertingReadStep(seq, _, elem) and
+      IterableUnpacking::iterableUnpackingConvertingStoreStep(elem, _, nodeFrom) and
+      nodeFrom.asCfgNode() instanceof SequenceNode
+    )
     or
     TypeTrackerSummaryFlow::basicLoadStep(nodeFrom, nodeTo, content)
   }

From ce98353d2267558ab05574d2e2c4e2f773e973c8 Mon Sep 17 00:00:00 2001
From: Dave Bartolomeo <dbartol@github.com>
Date: Tue, 2 Apr 2024 15:15:11 -0400
Subject: [PATCH 050/136] Allow `@param` tags to apply to record parameters

---
 .../Advisory/Documentation/SpuriousJavadocParam.ql  | 12 ++++++++++++
 .../src/change-notes/2024-04-02-javadoc-records.md  |  5 +++++
 .../test/query-tests/SpuriousJavadocParam/Test.java | 13 +++++++++++++
 .../test/query-tests/SpuriousJavadocParam/options   |  1 +
 .../query-tests/SpuriousJavadocParam/test.expected  |  2 ++
 5 files changed, 33 insertions(+)
 create mode 100644 java/ql/src/change-notes/2024-04-02-javadoc-records.md
 create mode 100644 java/ql/test/query-tests/SpuriousJavadocParam/options

diff --git a/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql b/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql
index 691811687a7..43afd978f01 100644
--- a/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql
+++ b/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql
@@ -32,12 +32,24 @@ where
     )
     or
     documentable instanceof ClassOrInterface and
+    not documentable instanceof Record and
     not exists(TypeVariable tv | tv.getGenericType() = documentable |
       "<" + tv.getName() + ">" = paramTag.getParamName()
     ) and
     msg =
       "@param tag \"" + paramTag.getParamName() +
         "\" does not match any actual type parameter of type \"" + documentable.getName() + "\"."
+    or
+    documentable instanceof Record and
+    not exists(TypeVariable tv | tv.getGenericType() = documentable |
+      "<" + tv.getName() + ">" = paramTag.getParamName()
+    ) and
+    not documentable.(Record).getCanonicalConstructor().getAParameter().getName() =
+      paramTag.getParamName() and
+    msg =
+      "@param tag \"" + paramTag.getParamName() +
+        "\" does not match any actual type parameter or record parameter of record \"" +
+        documentable.getName() + "\"."
   else
     // The tag has no value at all.
     msg = "This @param tag does not have a value."
diff --git a/java/ql/src/change-notes/2024-04-02-javadoc-records.md b/java/ql/src/change-notes/2024-04-02-javadoc-records.md
new file mode 100644
index 00000000000..e3859c9618b
--- /dev/null
+++ b/java/ql/src/change-notes/2024-04-02-javadoc-records.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* The `java/unknown-javadoc-parameter` now accepts `@param` tags that apply to the parameters of a
+  record.
diff --git a/java/ql/test/query-tests/SpuriousJavadocParam/Test.java b/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
index 84e05540c05..de108008ee8 100644
--- a/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
+++ b/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
@@ -120,5 +120,18 @@ public class Test<V> {
    */
   interface GenericInterface<T> {}
 
+  /**
+   * @param i exists
+   * @param k does not
+   */
+  static record SomeRecord(int i, int j) {}
+
+  /**
+   * @param <T> exists
+   * @param i exists
+   * @param k does not
+   */
+  static record GenericRecord<T>(int i, int j) {}
+
   // Diagnostic Matches: Incomplete inheritance relation for type java.lang.Object and supertype none
 }
diff --git a/java/ql/test/query-tests/SpuriousJavadocParam/options b/java/ql/test/query-tests/SpuriousJavadocParam/options
new file mode 100644
index 00000000000..fc57fe025b9
--- /dev/null
+++ b/java/ql/test/query-tests/SpuriousJavadocParam/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -source 16 -target 16
diff --git a/java/ql/test/query-tests/SpuriousJavadocParam/test.expected b/java/ql/test/query-tests/SpuriousJavadocParam/test.expected
index 42bdb93e60c..0ade1a7d519 100644
--- a/java/ql/test/query-tests/SpuriousJavadocParam/test.expected
+++ b/java/ql/test/query-tests/SpuriousJavadocParam/test.expected
@@ -12,3 +12,5 @@
 | Test.java:112:6:112:12 | @param | @param tag "<X>" does not match any actual type parameter of type "GenericClass". |
 | Test.java:118:6:118:12 | @param | @param tag "T" does not match any actual type parameter of type "GenericInterface". |
 | Test.java:119:6:119:12 | @param | @param tag "<X>" does not match any actual type parameter of type "GenericInterface". |
+| Test.java:125:6:125:12 | @param | @param tag "k" does not match any actual type parameter or record parameter of record "SomeRecord". |
+| Test.java:132:6:132:12 | @param | @param tag "k" does not match any actual type parameter or record parameter of record "GenericRecord". |

From 698debfa20911680bf3fba590871ff1e7bd56818 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Thu, 28 Mar 2024 16:05:16 +0000
Subject: [PATCH 051/136] Extractor: explicitly deal with extracting `x.(type)`
 in type switches

---
 go/extractor/extractor.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index f2ba68a20f0..d9e649401e3 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -1010,7 +1010,10 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 		}
 		kind = dbscheme.TypeAssertExpr.Index()
 		extractExpr(tw, expr.X, lbl, 0)
-		extractExpr(tw, expr.Type, lbl, 1)
+		// expr.Type can be `nil` if this is the `x.(type)` in a type switch.
+		if expr.Type != nil {
+			extractExpr(tw, expr.Type, lbl, 1)
+		}
 	case *ast.CallExpr:
 		if expr == nil {
 			return

From c7f2e991ed360ddd6aab9661f77199975f90d20a Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Thu, 28 Mar 2024 16:41:47 +0000
Subject: [PATCH 052/136] Improve QLDoc for TypeAssertExpr

Include information about the type assert `x.(type)` used in type switches.
---
 go/ql/lib/semmle/go/Expr.qll | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/go/ql/lib/semmle/go/Expr.qll b/go/ql/lib/semmle/go/Expr.qll
index 66d79f1d8f4..b1e1a169784 100644
--- a/go/ql/lib/semmle/go/Expr.qll
+++ b/go/ql/lib/semmle/go/Expr.qll
@@ -754,13 +754,19 @@ class SliceExpr extends @sliceexpr, Expr {
  *
  * ```go
  * x.(T)
+ * x.(type)
  * ```
  */
 class TypeAssertExpr extends @typeassertexpr, Expr {
   /** Gets the base expression whose type is being asserted. */
   Expr getExpr() { result = this.getChildExpr(0) }
 
-  /** Gets the expression representing the asserted type. */
+  /**
+   * Gets the expression representing the asserted type.
+   *
+   * Note that this is not defined when the type assertion is of the form
+   * `x.(type)`, as found in type switches.
+   */
   Expr getTypeExpr() { result = this.getChildExpr(1) }
 
   override predicate mayHaveOwnSideEffects() { any() }

From fe24710c9671e7a16f27dc10eab24f5047365576 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 3 Apr 2024 14:09:37 +0100
Subject: [PATCH 053/136] Improve QLDoc of `Entity.getDeclaration`

---
 go/ql/lib/semmle/go/Scopes.qll | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 153ca8d6307..740bb39cfec 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -119,7 +119,13 @@ class Entity extends @object {
    */
   Scope getScope() { objectscopes(this, result) }
 
-  /** Gets the declaring identifier for this entity. */
+  /**
+   * Gets the declaring identifier for this entity, if any.
+   *
+   * Note that type switch statements which define a new variable in the guard
+   * actually have a new variable (of the right type) implicitly declared at
+   * the beginning of each case clause, and these do not have a declaration.
+   */
   Ident getDeclaration() { result.declares(this) }
 
   /** Gets a reference to this entity. */

From 137594cf36f6c3c33ecc4f458d9968c59fdd2e51 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 3 Apr 2024 14:51:13 +0200
Subject: [PATCH 054/136] Ruby: Add regression test

---
 .../dataflow/regressions/Regressions.expected |  1 +
 .../dataflow/regressions/Regressions.ql       | 39 +++++++++++++++++++
 .../dataflow/regressions/regressions.rb       |  3 ++
 3 files changed, 43 insertions(+)
 create mode 100644 ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected
 create mode 100644 ruby/ql/test/library-tests/dataflow/regressions/Regressions.ql
 create mode 100644 ruby/ql/test/library-tests/dataflow/regressions/regressions.rb

diff --git a/ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected b/ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected
new file mode 100644
index 00000000000..ef846359c3b
--- /dev/null
+++ b/ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected
@@ -0,0 +1 @@
+| regressions.rb:2:1:2:9 | [post] call to reverse | regressions.rb:3:6:3:6 | x |
diff --git a/ruby/ql/test/library-tests/dataflow/regressions/Regressions.ql b/ruby/ql/test/library-tests/dataflow/regressions/Regressions.ql
new file mode 100644
index 00000000000..2d6c879aa39
--- /dev/null
+++ b/ruby/ql/test/library-tests/dataflow/regressions/Regressions.ql
@@ -0,0 +1,39 @@
+private import codeql.ruby.dataflow.FlowSummary
+
+private class ReverseSummary extends SimpleSummarizedCallable {
+  ReverseSummary() { this = "reverse" }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    input = "Argument[self].WithElement[any]" and
+    output = "ReturnValue" and
+    preservesValue = true
+  }
+}
+
+private module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source
+        .(DataFlow::PostUpdateNode)
+        .getPreUpdateNode()
+        .asExpr()
+        .getExpr()
+        .(MethodCall)
+        .getMethodName() = "reverse"
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(MethodCall mc |
+      mc.getMethodName() = "sink" and
+      sink.asExpr().getExpr() = mc.getAnArgument()
+    )
+  }
+}
+
+/**
+ * This predicate should not have a result. We check that the flow summary for
+ * `reverse` does not get picked up by the `reverseStepThroughInputOutputAlias`
+ * logic in `DataFlowImplCommon.qll`.
+ */
+query predicate noReverseStepThroughInputOutputAlias(DataFlow::Node source, DataFlow::Node sink) {
+  DataFlow::Global<Config>::flow(source, sink)
+}
diff --git a/ruby/ql/test/library-tests/dataflow/regressions/regressions.rb b/ruby/ql/test/library-tests/dataflow/regressions/regressions.rb
new file mode 100644
index 00000000000..f3e22585a8d
--- /dev/null
+++ b/ruby/ql/test/library-tests/dataflow/regressions/regressions.rb
@@ -0,0 +1,3 @@
+x = foo
+x.reverse.bar
+sink(x)
\ No newline at end of file

From 7871fb8ce66474da9b5e85eb26bf87e7134e8c07 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Wed, 3 Apr 2024 14:54:36 +0200
Subject: [PATCH 055/136] Data flow: Block flow at `expectsContents` nodes in
 `parameterValueFlow`

---
 .../dataflow/regressions/Regressions.expected |  1 -
 .../dataflow/internal/DataFlowImplCommon.qll  | 59 ++++++++++---------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected b/ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected
index ef846359c3b..e69de29bb2d 100644
--- a/ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected
+++ b/ruby/ql/test/library-tests/dataflow/regressions/Regressions.expected
@@ -1 +0,0 @@
-| regressions.rb:2:1:2:9 | [post] call to reverse | regressions.rb:3:6:3:6 | x |
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
index e83752fcced..81091303ff4 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -863,34 +863,37 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
          */
         pragma[nomagic]
         private predicate parameterValueFlowCand(ParamNode p, Node node, boolean read) {
-          p = node and
-          read = false
-          or
-          // local flow
-          exists(Node mid |
-            parameterValueFlowCand(p, mid, read) and
-            simpleLocalFlowStep(mid, node) and
-            validParameterAliasStep(mid, node)
-          )
-          or
-          // read
-          exists(Node mid |
-            parameterValueFlowCand(p, mid, false) and
-            readSet(mid, _, node) and
-            read = true
-          )
-          or
-          // flow through: no prior read
-          exists(ArgNode arg |
-            parameterValueFlowArgCand(p, arg, false) and
-            argumentValueFlowsThroughCand(arg, node, read)
-          )
-          or
-          // flow through: no read inside method
-          exists(ArgNode arg |
-            parameterValueFlowArgCand(p, arg, read) and
-            argumentValueFlowsThroughCand(arg, node, false)
-          )
+          (
+            p = node and
+            read = false
+            or
+            // local flow
+            exists(Node mid |
+              parameterValueFlowCand(p, mid, read) and
+              simpleLocalFlowStep(mid, node) and
+              validParameterAliasStep(mid, node)
+            )
+            or
+            // read
+            exists(Node mid |
+              parameterValueFlowCand(p, mid, false) and
+              readSet(mid, _, node) and
+              read = true
+            )
+            or
+            // flow through: no prior read
+            exists(ArgNode arg |
+              parameterValueFlowArgCand(p, arg, false) and
+              argumentValueFlowsThroughCand(arg, node, read)
+            )
+            or
+            // flow through: no read inside method
+            exists(ArgNode arg |
+              parameterValueFlowArgCand(p, arg, read) and
+              argumentValueFlowsThroughCand(arg, node, false)
+            )
+          ) and
+          not expectsContentCached(node, _)
         }
 
         pragma[nomagic]

From 55d1f43239cd0676bdf410e9e169dc9db37eaec8 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Thu, 4 Apr 2024 10:18:56 +0200
Subject: [PATCH 056/136] C++: Update supported compiler versions based on
 frontend documentation

---
 docs/codeql/reusables/supported-versions-compilers.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 15e1cfa6444..b41673d0845 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -4,11 +4,11 @@
    :stub-columns: 1
 
    Language,Variants,Compilers,Extensions
-   C/C++,"C89, C99, C11, C17, C++98, C++03, C++11, C++14, C++17, C++20 [1]_ [2]_","Clang (including clang-cl [3]_ and armclang) extensions (up to Clang 12.0),
+   C/C++,"C89, C99, C11, C17, C++98, C++03, C++11, C++14, C++17, C++20 [1]_ [2]_","Clang (including clang-cl [3]_ and armclang) extensions (up to Clang 17.0),
 
-   GNU extensions (up to GCC 11.1),
+   GNU extensions (up to GCC 13.2),
 
-   Microsoft extensions (up to VS 2019),
+   Microsoft extensions (up to VS 2022),
 
    Arm Compiler 5 [4]_","``.cpp``, ``.c++``, ``.cxx``, ``.hpp``, ``.hh``, ``.h++``, ``.hxx``, ``.c``, ``.cc``, ``.h``"
    C#,C# up to 12,"Microsoft Visual Studio up to 2019 with .NET up to 4.8,
@@ -29,7 +29,7 @@
 
 .. container:: footnote-group
 
-    .. [1] C++20 support is currently in beta. Supported for GCC on Linux only. Modules are *not* supported.
+    .. [1] C++20 support is currently in beta. Modules are *not* supported.
     .. [2] Objective-C, Objective-C++, C++/CLI, and C++/CX are not supported.
     .. [3] Support for the clang-cl compiler is preliminary.
     .. [4] Support for the Arm Compiler (armcc) is preliminary.

From 720961787bdcd102f25c51dfdb412d13617154ef Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Thu, 4 Apr 2024 10:33:36 +0100
Subject: [PATCH 057/136] Improve QLDoc for `CaseClause`

---
 go/ql/lib/semmle/go/Stmt.qll | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/go/ql/lib/semmle/go/Stmt.qll b/go/ql/lib/semmle/go/Stmt.qll
index b4164398b02..e02d6766657 100644
--- a/go/ql/lib/semmle/go/Stmt.qll
+++ b/go/ql/lib/semmle/go/Stmt.qll
@@ -747,13 +747,25 @@ class IfStmt extends @ifstmt, Stmt, ScopeNode {
  * ```
  */
 class CaseClause extends @caseclause, Stmt, ScopeNode {
-  /** Gets the `i`th expression of this `case` clause (0-based). */
+  /**
+   * Gets the `i`th expression of this `case` clause (0-based).
+   *
+   * Note that the default clause does not have any expressions.
+   */
   Expr getExpr(int i) { result = this.getChildExpr(-(i + 1)) }
 
-  /** Gets an expression of this `case` clause. */
+  /**
+   * Gets an expression of this `case` clause, if any.
+   *
+   * Note that the default clause does not have any expressions.
+   */
   Expr getAnExpr() { result = this.getAChildExpr() }
 
-  /** Gets the number of expressions of this `case` clause. */
+  /**
+   * Gets the number of expressions of this `case` clause.
+   *
+   * Note that the default clause does not have any expressions.
+   */
   int getNumExpr() { result = this.getNumChildExpr() }
 
   /** Gets the `i`th statement of this `case` clause (0-based). */

From d9fe39d5aeca60c574cf9eae2c58766463d01c81 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 3 Apr 2024 14:13:12 +0100
Subject: [PATCH 058/136] Extractor: add comment about
 `tw.Package.TypesInfo.Defs`

---
 go/extractor/extractor.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index d9e649401e3..dc4a9ffe7b7 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -870,6 +870,10 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 		kind = dbscheme.IdentExpr.Index()
 		dbscheme.LiteralsTable.Emit(tw, lbl, expr.Name, expr.Name)
 		def := tw.Package.TypesInfo.Defs[expr]
+		// Note that there are some cases where `expr` is in the map but `def`
+		// is nil. The docs for `tw.Package.TypesInfo.Defs` give the following
+		// examples: the package name in package clauses, or symbolic variables
+		// `t` in `t := x.(type)` of type switch headers.
 		if def != nil {
 			defTyp := extractType(tw, def.Type())
 			objlbl, exists := tw.Labeler.LookupObjectID(def, defTyp)

From 68321dd9ec71f83495e43a90e1b2f419c4cbd421 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 3 Apr 2024 15:58:10 +0100
Subject: [PATCH 059/136] Use nil for optional argument to packages.Visit

---
 go/extractor/extractor.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index dc4a9ffe7b7..f43950abb32 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -132,9 +132,7 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 	pkgsNotFound := make([]string, 0, len(pkgs))
 
 	// Do a post-order traversal and extract the package scope of each package
-	packages.Visit(pkgs, func(pkg *packages.Package) bool {
-		return true
-	}, func(pkg *packages.Package) {
+	packages.Visit(pkgs, nil, func(pkg *packages.Package) {
 		log.Printf("Processing package %s.", pkg.PkgPath)
 
 		if _, ok := pkgInfos[pkg.PkgPath]; !ok {
@@ -200,9 +198,7 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 	noExtractRe := regexp.MustCompile(`.*(^|` + sep + `)(\.\.|vendor)($|` + sep + `).*`)
 
 	// extract AST information for all packages
-	packages.Visit(pkgs, func(pkg *packages.Package) bool {
-		return true
-	}, func(pkg *packages.Package) {
+	packages.Visit(pkgs, nil, func(pkg *packages.Package) {
 		for root, _ := range wantedRoots {
 			pkgInfo := pkgInfos[pkg.PkgPath]
 			relDir, err := filepath.Rel(root, pkgInfo.PkgDir)

From 7fc52651686effb76cf6de0c3a758637f22058d0 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 3 Apr 2024 16:03:45 +0100
Subject: [PATCH 060/136] Misc small tidy-ups mostly suggested by linter

---
 go/extractor/extractor.go | 43 +++++++++++++--------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index f43950abb32..d06686954fa 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -199,7 +199,7 @@ func ExtractWithFlags(buildFlags []string, patterns []string) error {
 
 	// extract AST information for all packages
 	packages.Visit(pkgs, nil, func(pkg *packages.Package) {
-		for root, _ := range wantedRoots {
+		for root := range wantedRoots {
 			pkgInfo := pkgInfos[pkg.PkgPath]
 			relDir, err := filepath.Rel(root, pkgInfo.PkgDir)
 			if err != nil || noExtractRe.MatchString(relDir) {
@@ -397,15 +397,15 @@ func extractObjects(tw *trap.Writer, scope *types.Scope, scopeLabel trap.Label)
 			// do not appear as objects in any scope, so they have to be dealt
 			// with separately in extractMethods.
 			if funcObj, ok := obj.(*types.Func); ok {
-				populateTypeParamParents(tw, funcObj.Type().(*types.Signature).TypeParams(), obj)
-				populateTypeParamParents(tw, funcObj.Type().(*types.Signature).RecvTypeParams(), obj)
+				populateTypeParamParents(funcObj.Type().(*types.Signature).TypeParams(), obj)
+				populateTypeParamParents(funcObj.Type().(*types.Signature).RecvTypeParams(), obj)
 			}
 			// Populate type parameter parents for named types. Note that we
 			// skip type aliases as the original type should be the parent
 			// of any type parameters.
 			if typeNameObj, ok := obj.(*types.TypeName); ok && !typeNameObj.IsAlias() {
 				if tp, ok := typeNameObj.Type().(*types.Named); ok {
-					populateTypeParamParents(tw, tp.TypeParams(), obj)
+					populateTypeParamParents(tp.TypeParams(), obj)
 				}
 			}
 			extractObject(tw, obj, lbl)
@@ -431,8 +431,8 @@ func extractMethod(tw *trap.Writer, meth *types.Func) trap.Label {
 	if !exists {
 		// Populate type parameter parents for methods. They do not appear as
 		// objects in any scope, so they have to be dealt with separately here.
-		populateTypeParamParents(tw, meth.Type().(*types.Signature).TypeParams(), meth)
-		populateTypeParamParents(tw, meth.Type().(*types.Signature).RecvTypeParams(), meth)
+		populateTypeParamParents(meth.Type().(*types.Signature).TypeParams(), meth)
+		populateTypeParamParents(meth.Type().(*types.Signature).RecvTypeParams(), meth)
 		extractObject(tw, meth, methlbl)
 	}
 
@@ -490,7 +490,7 @@ func extractObject(tw *trap.Writer, obj types.Object, lbl trap.Label) {
 func extractObjectTypes(tw *trap.Writer) {
 	// calling `extractType` on a named type will extract all methods defined
 	// on it, which will add new objects. Therefore we need to do this first
-	// before we loops over all objects and emit them.
+	// before we loop over all objects and emit them.
 	changed := true
 	for changed {
 		changed = tw.ForEachObject(extractObjectType)
@@ -1129,11 +1129,9 @@ func extractExpr(tw *trap.Writer, expr ast.Expr, parent trap.Label, idx int) {
 // each child over its preceding child (usually either 1 for assigning increasing indices, or
 // -1 for decreasing indices)
 func extractExprs(tw *trap.Writer, exprs []ast.Expr, parent trap.Label, idx int, dir int) {
-	if exprs != nil {
-		for _, expr := range exprs {
-			extractExpr(tw, expr, parent, idx)
-			idx += dir
-		}
+	for _, expr := range exprs {
+		extractExpr(tw, expr, parent, idx)
+		idx += dir
 	}
 }
 
@@ -1389,13 +1387,10 @@ func extractStmt(tw *trap.Writer, stmt ast.Stmt, parent trap.Label, idx int) {
 // each child over its preceding child (usually either 1 for assigning increasing indices, or
 // -1 for decreasing indices)
 func extractStmts(tw *trap.Writer, stmts []ast.Stmt, parent trap.Label, idx int, dir int) {
-	if stmts != nil {
-		for _, stmt := range stmts {
-			extractStmt(tw, stmt, parent, idx)
-			idx += dir
-		}
+	for _, stmt := range stmts {
+		extractStmt(tw, stmt, parent, idx)
+		idx += dir
 	}
-
 }
 
 // extractDecl extracts AST information for the given declaration
@@ -1944,7 +1939,7 @@ func extractTypeParamDecls(tw *trap.Writer, fields *ast.FieldList, parent trap.L
 }
 
 // populateTypeParamParents sets `parent` as the parent of the elements of `typeparams`
-func populateTypeParamParents(tw *trap.Writer, typeparams *types.TypeParamList, parent types.Object) {
+func populateTypeParamParents(typeparams *types.TypeParamList, parent types.Object) {
 	if typeparams != nil {
 		for idx := 0; idx < typeparams.Len(); idx++ {
 			setTypeParamParent(typeparams.At(idx), parent)
@@ -1966,16 +1961,6 @@ func getObjectBeingUsed(tw *trap.Writer, ident *ast.Ident) types.Object {
 	}
 }
 
-// tryGetGenericType returns the generic type of `tp`, and a boolean indicating
-// whether it is the same as `tp`.
-func tryGetGenericType(tp types.Type) (*types.Named, bool) {
-	if namedType, ok := tp.(*types.Named); ok {
-		originType := namedType.Origin()
-		return originType, namedType == originType
-	}
-	return nil, false
-}
-
 // trackInstantiatedStructFields tries to give the fields of an instantiated
 // struct type underlying `tp` the same labels as the corresponding fields of
 // the generic struct type. This is so that when we come across the

From 6d2d9654b53a59db7c45333896c6c0b52e2bce4a Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 4 Apr 2024 13:01:00 +0200
Subject: [PATCH 061/136] Ruby: Add CFG test

---
 .../controlflow/graph/Cfg.expected            | 105 +++++++++++++++---
 .../controlflow/graph/Nodes.expected          |   4 +
 .../library-tests/controlflow/graph/ifs.rb    |   2 +-
 .../library-tests/controlflow/graph/raise.rb  |  12 ++
 4 files changed, 105 insertions(+), 18 deletions(-)

diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
index e3b0e01adfe..2571a9dfeeb 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -2397,18 +2397,9 @@ cfg.rb:
 #   90| ...
 #-----|  -> $global
 
-#   90| ... = ...
-#-----|  -> if ...
-
 #   90| ... = ...
 #-----|  -> x
 
-#   90| [false] ! ...
-#-----| false -> if ...
-
-#   90| [true] ! ...
-#-----| true -> x
-
 #   90| __synth__0__1
 #-----|  -> x
 
@@ -2418,10 +2409,6 @@ cfg.rb:
 #   90| call to each
 #-----|  -> ...
 
-#   90| defined? ...
-#-----| false -> [true] ! ...
-#-----| true -> [false] ! ...
-
 #   90| enter { ... }
 #-----|  -> __synth__0__1
 
@@ -2430,6 +2417,22 @@ cfg.rb:
 #   90| exit { ... } (normal)
 #-----|  -> exit { ... }
 
+#   90| { ... }
+#-----|  -> call to each
+
+#   90| ... = ...
+#-----|  -> if ...
+
+#   90| [false] ! ...
+#-----| false -> if ...
+
+#   90| [true] ! ...
+#-----| true -> x
+
+#   90| defined? ...
+#-----| false -> [true] ! ...
+#-----| true -> [false] ! ...
+
 #   90| if ...
 #-----|  -> Array
 
@@ -2442,9 +2445,6 @@ cfg.rb:
 #   90| x
 #-----|  -> defined? ...
 
-#   90| { ... }
-#-----|  -> call to each
-
 #   90| x
 #-----|  -> __synth__0__1
 
@@ -6915,7 +6915,7 @@ raise.rb:
 #-----|  -> exit m
 
 #  167| m
-#-----|  -> exit raise.rb (normal)
+#-----|  -> m16
 
 #  167| self
 #-----|  -> m
@@ -6928,3 +6928,74 @@ raise.rb:
 
 #  168| ""
 #-----|  -> call to raise
+
+#  172| enter m16
+#-----|  -> b1
+
+#  172| exit m16
+
+#  172| exit m16 (abnormal)
+#-----|  -> exit m16
+
+#  172| exit m16 (normal)
+#-----|  -> exit m16
+
+#  172| m16
+#-----|  -> exit raise.rb (normal)
+
+#  172| b1
+#-----|  -> b2
+
+#  172| b2
+#-----|  -> b1
+
+#  174| b1
+#-----| true -> [true] ... || ...
+#-----| false -> b2
+
+#  174| ... || ...
+#-----| true -> 1
+#-----| false -> 2
+#-----| raise -> ExceptionA
+
+#  174| [false] ... || ...
+#-----| false -> 2
+#-----| raise -> ExceptionA
+
+#  174| [true] ... || ...
+#-----| true -> 1
+#-----| raise -> ExceptionA
+
+#  174| b2
+#-----|  -> true
+
+#  174| ... == ...
+#-----| false -> [false] ... || ...
+#-----|  -> ... || ...
+#-----| true -> [true] ... || ...
+#-----| raise -> ExceptionA
+
+#  174| true
+#-----|  -> ... == ...
+
+#  175| return
+#-----| return -> exit m16 (normal)
+
+#  175| 1
+#-----|  -> return
+
+#  177| return
+#-----| return -> exit m16 (normal)
+
+#  177| 2
+#-----|  -> return
+
+#  179| ExceptionA
+#-----| raise -> exit m16 (abnormal)
+#-----| match -> 3
+
+#  180| return
+#-----| return -> exit m16 (normal)
+
+#  180| 3
+#-----|  -> return
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
index f7bc8a1b1e7..bc691d673b9 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
@@ -367,6 +367,10 @@ positionalArguments
 | raise.rb:160:5:162:7 | call to bar | raise.rb:160:9:162:7 | -> { ... } |
 | raise.rb:161:7:161:14 | call to raise | raise.rb:161:13:161:14 | "" |
 | raise.rb:168:5:168:12 | call to raise | raise.rb:168:11:168:12 | "" |
+| raise.rb:174:8:174:23 | ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
+| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
+| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:174:20:174:23 | true |
 keywordArguments
 | cfg.html.erb:6:9:6:58 | call to stylesheet_link_tag | media | cfg.html.erb:6:54:6:58 | "all" |
 | cfg.html.erb:12:11:12:33 | call to link_to | id | cfg.html.erb:12:31:12:33 | "a" |
diff --git a/ruby/ql/test/library-tests/controlflow/graph/ifs.rb b/ruby/ql/test/library-tests/controlflow/graph/ifs.rb
index 0e66c0da8cb..f081095051f 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/ifs.rb
+++ b/ruby/ql/test/library-tests/controlflow/graph/ifs.rb
@@ -55,4 +55,4 @@ def disjunct (b1, b2)
   if (b1 || b2) then
     puts "b1 or b2"
   end
-end
\ No newline at end of file
+end
diff --git a/ruby/ql/test/library-tests/controlflow/graph/raise.rb b/ruby/ql/test/library-tests/controlflow/graph/raise.rb
index e5f0c0e50f5..3caf234ab14 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/raise.rb
+++ b/ruby/ql/test/library-tests/controlflow/graph/raise.rb
@@ -168,3 +168,15 @@ class C
     raise ""
   end
 end
+
+def m16(b1, b2)
+  begin
+    if b1 || b2 == true
+      return 1
+    else
+      return 2
+    end
+  rescue ExceptionA
+    return 3
+  end
+end

From ce3b359813d1cf44b5d6da16cff6704163c7118d Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 4 Apr 2024 13:03:08 +0200
Subject: [PATCH 062/136] Ruby: Fix CFG for nodes that may raise

---
 .../codeql/ruby/controlflow/internal/Completion.qll | 13 +++++++++----
 .../library-tests/controlflow/graph/Cfg.expected    |  6 ------
 .../library-tests/controlflow/graph/Nodes.expected  |  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
index 39fefcbeae1..83ea11e9d23 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
@@ -90,9 +90,7 @@ private predicate mayRaise(Call c) { c = getARescuableBodyChild() }
 
 /** A completion of a statement or an expression. */
 abstract class Completion extends TCompletion {
-  private predicate isValidForSpecific(AstNode n) {
-    exists(AstNode other | n = other.getDesugared() and this.isValidForSpecific(other))
-    or
+  private predicate isValidForSpecific0(AstNode n) {
     this = n.(NonReturningCall).getACompletion()
     or
     completionIsValidForStmt(n, this)
@@ -110,12 +108,19 @@ abstract class Completion extends TCompletion {
     or
     n = any(RescueModifierExpr parent).getBody() and
     this = [TSimpleCompletion().(TCompletion), TRaiseCompletion()]
+  }
+
+  private predicate isValidForSpecific(AstNode n) {
+    this.isValidForSpecific0(n)
+    or
+    exists(AstNode other | n = other.getDesugared() and this.isValidForSpecific(other))
     or
     mayRaise(n) and
     (
       this = TRaiseCompletion()
       or
-      this = TSimpleCompletion() and not n instanceof NonReturningCall
+      not any(Completion c).isValidForSpecific0(n) and
+      this = TSimpleCompletion()
     )
   }
 
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
index 2571a9dfeeb..dfb5c8dfee4 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -6953,11 +6953,6 @@ raise.rb:
 #-----| true -> [true] ... || ...
 #-----| false -> b2
 
-#  174| ... || ...
-#-----| true -> 1
-#-----| false -> 2
-#-----| raise -> ExceptionA
-
 #  174| [false] ... || ...
 #-----| false -> 2
 #-----| raise -> ExceptionA
@@ -6971,7 +6966,6 @@ raise.rb:
 
 #  174| ... == ...
 #-----| false -> [false] ... || ...
-#-----|  -> ... || ...
 #-----| true -> [true] ... || ...
 #-----| raise -> ExceptionA
 
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
index bc691d673b9..2bc683f894e 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
@@ -367,7 +367,6 @@ positionalArguments
 | raise.rb:160:5:162:7 | call to bar | raise.rb:160:9:162:7 | -> { ... } |
 | raise.rb:161:7:161:14 | call to raise | raise.rb:161:13:161:14 | "" |
 | raise.rb:168:5:168:12 | call to raise | raise.rb:168:11:168:12 | "" |
-| raise.rb:174:8:174:23 | ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
 | raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
 | raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:174:14:174:23 | ... == ... |
 | raise.rb:174:14:174:23 | ... == ... | raise.rb:174:20:174:23 | true |

From e42639852c6b26abef54e52ebd5e74eeecbac8f9 Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Thu, 4 Apr 2024 14:25:05 +0200
Subject: [PATCH 063/136] C#: Move nuget related `DependencyManager` methods to
 separate file

---
 .../DependencyManager.Nuget.cs                | 364 ++++++++++++++++++
 .../DependencyManager.cs                      | 351 -----------------
 2 files changed, 364 insertions(+), 351 deletions(-)
 create mode 100644 csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
new file mode 100644
index 00000000000..8e0be8ab141
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -0,0 +1,364 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Semmle.Util;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    public sealed partial class DependencyManager
+    {
+        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<string> dllPaths)
+        {
+            try
+            {
+                using (var nuget = new NugetPackages(sourceDir.FullName, legacyPackageDirectory, logger))
+                {
+                    var count = nuget.InstallPackages();
+
+                    if (nuget.PackageCount > 0)
+                    {
+                        CompilationInfos.Add(("packages.config files", nuget.PackageCount.ToString()));
+                        CompilationInfos.Add(("Successfully restored packages.config files", count.ToString()));
+                    }
+                }
+
+                var nugetPackageDlls = legacyPackageDirectory.DirInfo.GetFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = true });
+                var nugetPackageDllPaths = nugetPackageDlls.Select(f => f.FullName).ToHashSet();
+                var excludedPaths = nugetPackageDllPaths
+                    .Where(path => IsPathInSubfolder(path, legacyPackageDirectory.DirInfo.FullName, "tools"))
+                    .ToList();
+
+                if (nugetPackageDllPaths.Count > 0)
+                {
+                    logger.LogInfo($"Restored {nugetPackageDllPaths.Count} Nuget DLLs.");
+                }
+                if (excludedPaths.Count > 0)
+                {
+                    logger.LogInfo($"Excluding {excludedPaths.Count} Nuget DLLs.");
+                }
+
+                foreach (var excludedPath in excludedPaths)
+                {
+                    logger.LogInfo($"Excluded Nuget DLL: {excludedPath}");
+                }
+
+                nugetPackageDllPaths.ExceptWith(excludedPaths);
+                dllPaths.UnionWith(nugetPackageDllPaths);
+            }
+            catch (Exception exc)
+            {
+                logger.LogError($"Failed to restore Nuget packages with nuget.exe: {exc.Message}");
+            }
+
+            var restoredProjects = RestoreSolutions(allSolutions, out var assets1);
+            var projects = allProjects.Except(restoredProjects);
+            RestoreProjects(projects, out var assets2);
+
+            var dependencies = Assets.GetCompilationDependencies(logger, assets1.Union(assets2));
+
+            var paths = dependencies
+                .Paths
+                .Select(d => Path.Combine(packageDirectory.DirInfo.FullName, d))
+                .ToList();
+            dllPaths.UnionWith(paths);
+
+            LogAllUnusedPackages(dependencies);
+            DownloadMissingPackages(allNonBinaryFiles, dllPaths);
+        }
+
+        /// <summary>
+        /// Executes `dotnet restore` on all solution files in solutions.
+        /// As opposed to RestoreProjects this is not run in parallel using PLINQ
+        /// as `dotnet restore` on a solution already uses multiple threads for restoring
+        /// the projects (this can be disabled with the `--disable-parallel` flag).
+        /// Populates assets with the relative paths to the assets files generated by the restore.
+        /// Returns a list of projects that are up to date with respect to restore.
+        /// </summary>
+        /// <param name="solutions">A list of paths to solution files.</param>
+        private IEnumerable<string> RestoreSolutions(IEnumerable<string> solutions, out IEnumerable<string> assets)
+        {
+            var successCount = 0;
+            var nugetSourceFailures = 0;
+            var assetFiles = new List<string>();
+            var projects = solutions.SelectMany(solution =>
+                {
+                    logger.LogInfo($"Restoring solution {solution}...");
+                    var res = dotnet.Restore(new(solution, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));
+                    if (res.Success)
+                    {
+                        successCount++;
+                    }
+                    if (res.HasNugetPackageSourceError)
+                    {
+                        nugetSourceFailures++;
+                    }
+                    assetFiles.AddRange(res.AssetsFilePaths);
+                    return res.RestoredProjects;
+                }).ToList();
+            assets = assetFiles;
+            CompilationInfos.Add(("Successfully restored solution files", successCount.ToString()));
+            CompilationInfos.Add(("Failed solution restore with package source error", nugetSourceFailures.ToString()));
+            CompilationInfos.Add(("Restored projects through solution files", projects.Count.ToString()));
+            return projects;
+        }
+
+        /// <summary>
+        /// Executes `dotnet restore` on all projects in projects.
+        /// This is done in parallel for performance reasons.
+        /// Populates assets with the relative paths to the assets files generated by the restore.
+        /// </summary>
+        /// <param name="projects">A list of paths to project files.</param>
+        private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<string> assets)
+        {
+            var successCount = 0;
+            var nugetSourceFailures = 0;
+            var assetFiles = new List<string>();
+            var sync = new object();
+            Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = threads }, project =>
+            {
+                logger.LogInfo($"Restoring project {project}...");
+                var res = dotnet.Restore(new(project, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));
+                lock (sync)
+                {
+                    if (res.Success)
+                    {
+                        successCount++;
+                    }
+                    if (res.HasNugetPackageSourceError)
+                    {
+                        nugetSourceFailures++;
+                    }
+                    assetFiles.AddRange(res.AssetsFilePaths);
+                }
+            });
+            assets = assetFiles;
+            CompilationInfos.Add(("Successfully restored project files", successCount.ToString()));
+            CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
+        }
+
+        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<string> dllPaths)
+        {
+            var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);
+            var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
+
+            var notYetDownloadedPackages = new HashSet<PackageReference>(fileContent.AllPackages);
+            foreach (var alreadyDownloadedPackage in alreadyDownloadedPackages)
+            {
+                notYetDownloadedPackages.Remove(new(alreadyDownloadedPackage, PackageReferenceSource.SdkCsProj));
+            }
+            foreach (var alreadyDownloadedLegacyPackage in alreadyDownloadedLegacyPackages)
+            {
+                notYetDownloadedPackages.Remove(new(alreadyDownloadedLegacyPackage, PackageReferenceSource.PackagesConfig));
+            }
+
+            if (notYetDownloadedPackages.Count == 0)
+            {
+                return;
+            }
+
+            var multipleVersions = notYetDownloadedPackages
+                .GroupBy(p => p.Name)
+                .Where(g => g.Count() > 1)
+                .Select(g => g.Key)
+                .ToList();
+
+            foreach (var package in multipleVersions)
+            {
+                logger.LogWarning($"Found multiple not yet restored packages with name '{package}'.");
+                notYetDownloadedPackages.Remove(new(package, PackageReferenceSource.PackagesConfig));
+            }
+
+            logger.LogInfo($"Found {notYetDownloadedPackages.Count} packages that are not yet restored");
+
+            var nugetConfigs = allFiles.SelectFileNamesByName("nuget.config").ToArray();
+            string? nugetConfig = null;
+            if (nugetConfigs.Length > 1)
+            {
+                logger.LogInfo($"Found multiple nuget.config files: {string.Join(", ", nugetConfigs)}.");
+                nugetConfig = allFiles
+                    .SelectRootFiles(sourceDir)
+                    .SelectFileNamesByName("nuget.config")
+                    .FirstOrDefault();
+                if (nugetConfig == null)
+                {
+                    logger.LogInfo("Could not find a top-level nuget.config file.");
+                }
+            }
+            else
+            {
+                nugetConfig = nugetConfigs.FirstOrDefault();
+            }
+
+            if (nugetConfig != null)
+            {
+                logger.LogInfo($"Using nuget.config file {nugetConfig}.");
+            }
+
+            CompilationInfos.Add(("Fallback nuget restore", notYetDownloadedPackages.Count.ToString()));
+
+            var successCount = 0;
+            var sync = new object();
+
+            Parallel.ForEach(notYetDownloadedPackages, new ParallelOptions { MaxDegreeOfParallelism = threads }, package =>
+            {
+                var success = TryRestorePackageManually(package.Name, nugetConfig, package.PackageReferenceSource);
+                if (!success)
+                {
+                    return;
+                }
+
+                lock (sync)
+                {
+                    successCount++;
+                }
+            });
+
+            CompilationInfos.Add(("Successfully ran fallback nuget restore", successCount.ToString()));
+
+            dllPaths.Add(missingPackageDirectory.DirInfo.FullName);
+        }
+
+        private void LogAllUnusedPackages(DependencyContainer dependencies)
+        {
+            var allPackageDirectories = GetAllPackageDirectories();
+
+            logger.LogInfo($"Restored {allPackageDirectories.Count} packages");
+            logger.LogInfo($"Found {dependencies.Packages.Count} packages in project.assets.json files");
+
+            allPackageDirectories
+                .Where(package => !dependencies.Packages.Contains(package))
+                .Order()
+                .ForEach(package => logger.LogInfo($"Unused package: {package}"));
+        }
+
+
+        private ICollection<string> GetAllPackageDirectories()
+        {
+            return new DirectoryInfo(packageDirectory.DirInfo.FullName)
+                .EnumerateDirectories("*", new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive, RecurseSubdirectories = false })
+                .Select(d => d.Name)
+                .ToList();
+        }
+
+        private static bool IsPathInSubfolder(string path, string rootFolder, string subFolder)
+        {
+            return path.IndexOf(
+                $"{Path.DirectorySeparatorChar}{subFolder}{Path.DirectorySeparatorChar}",
+                rootFolder.Length,
+                StringComparison.InvariantCultureIgnoreCase) >= 0;
+        }
+
+        private IEnumerable<string> GetRestoredLegacyPackageNames()
+        {
+            var oldPackageDirectories = GetRestoredPackageDirectoryNames(legacyPackageDirectory.DirInfo);
+            foreach (var oldPackageDirectory in oldPackageDirectories)
+            {
+                // nuget install restores packages to 'packagename.version' folders (dotnet restore to 'packagename/version' folders)
+                // typical folder names look like:
+                //   newtonsoft.json.13.0.3
+                // there are more complex ones too, such as:
+                //   runtime.tizen.4.0.0-armel.Microsoft.NETCore.DotNetHostResolver.2.0.0-preview2-25407-01
+
+                var match = LegacyNugetPackage().Match(oldPackageDirectory);
+                if (!match.Success)
+                {
+                    logger.LogWarning($"Package directory '{oldPackageDirectory}' doesn't match the expected pattern.");
+                    continue;
+                }
+
+                yield return match.Groups[1].Value.ToLowerInvariant();
+            }
+        }
+
+        private static IEnumerable<string> GetRestoredPackageDirectoryNames(DirectoryInfo root)
+        {
+            return Directory.GetDirectories(root.FullName)
+                .Select(d => Path.GetFileName(d).ToLowerInvariant());
+        }
+
+        [GeneratedRegex(@"<TargetFramework>.*</TargetFramework>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
+        private static partial Regex TargetFramework();
+
+        private bool TryRestorePackageManually(string package, string? nugetConfig, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj)
+        {
+            logger.LogInfo($"Restoring package {package}...");
+            using var tempDir = new TemporaryDirectory(ComputeTempDirectory(package, "missingpackages_workingdir"));
+            var success = dotnet.New(tempDir.DirInfo.FullName);
+            if (!success)
+            {
+                return false;
+            }
+
+            if (packageReferenceSource == PackageReferenceSource.PackagesConfig)
+            {
+                TryChangeTargetFrameworkMoniker(tempDir.DirInfo);
+            }
+
+            success = dotnet.AddPackage(tempDir.DirInfo.FullName, package);
+            if (!success)
+            {
+                return false;
+            }
+
+            var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig));
+            if (!res.Success)
+            {
+                if (res.HasNugetPackageSourceError && nugetConfig is not null)
+                {
+                    // Restore could not be completed because the listed source is unavailable. Try without the nuget.config:
+                    res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: null, ForceReevaluation: true));
+                }
+
+                // TODO: the restore might fail, we could retry with
+                // - a prerelease (*-* instead of *) version of the package,
+                // - a different target framework moniker.
+
+                if (!res.Success)
+                {
+                    logger.LogInfo($"Failed to restore nuget package {package}");
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private void TryChangeTargetFrameworkMoniker(DirectoryInfo tempDir)
+        {
+            try
+            {
+                logger.LogInfo($"Changing the target framework moniker in {tempDir.FullName}...");
+
+                var csprojs = tempDir.GetFiles("*.csproj", new EnumerationOptions { RecurseSubdirectories = false, MatchCasing = MatchCasing.CaseInsensitive });
+                if (csprojs.Length != 1)
+                {
+                    logger.LogError($"Could not find the .csproj file in {tempDir.FullName}, count = {csprojs.Length}");
+                    return;
+                }
+
+                var csproj = csprojs[0];
+                var content = File.ReadAllText(csproj.FullName);
+                var matches = TargetFramework().Matches(content);
+                if (matches.Count == 0)
+                {
+                    logger.LogError($"Could not find target framework in {csproj.FullName}");
+                }
+                else
+                {
+                    content = TargetFramework().Replace(content, $"<TargetFramework>{FrameworkPackageNames.LatestNetFrameworkMoniker}</TargetFramework>", 1);
+                    File.WriteAllText(csproj.FullName, content);
+                }
+            }
+            catch (Exception exc)
+            {
+                logger.LogError($"Failed to update target framework in {tempDir.FullName}: {exc}");
+            }
+        }
+
+        [GeneratedRegex(@"^(.+)\.(\d+\.\d+\.\d+(-(.+))?)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
+        private static partial Regex LegacyNugetPackage();
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 713d52d8e3f..04716a64db4 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -230,73 +230,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return frameworkLocations;
         }
 
-        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<string> dllPaths)
-        {
-            try
-            {
-                using (var nuget = new NugetPackages(sourceDir.FullName, legacyPackageDirectory, logger))
-                {
-                    var count = nuget.InstallPackages();
-
-                    if (nuget.PackageCount > 0)
-                    {
-                        CompilationInfos.Add(("packages.config files", nuget.PackageCount.ToString()));
-                        CompilationInfos.Add(("Successfully restored packages.config files", count.ToString()));
-                    }
-                }
-
-                var nugetPackageDlls = legacyPackageDirectory.DirInfo.GetFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = true });
-                var nugetPackageDllPaths = nugetPackageDlls.Select(f => f.FullName).ToHashSet();
-                var excludedPaths = nugetPackageDllPaths
-                    .Where(path => IsPathInSubfolder(path, legacyPackageDirectory.DirInfo.FullName, "tools"))
-                    .ToList();
-
-                if (nugetPackageDllPaths.Count > 0)
-                {
-                    logger.LogInfo($"Restored {nugetPackageDllPaths.Count} Nuget DLLs.");
-                }
-                if (excludedPaths.Count > 0)
-                {
-                    logger.LogInfo($"Excluding {excludedPaths.Count} Nuget DLLs.");
-                }
-
-                foreach (var excludedPath in excludedPaths)
-                {
-                    logger.LogInfo($"Excluded Nuget DLL: {excludedPath}");
-                }
-
-                nugetPackageDllPaths.ExceptWith(excludedPaths);
-                dllPaths.UnionWith(nugetPackageDllPaths);
-            }
-            catch (Exception exc)
-            {
-                logger.LogError($"Failed to restore Nuget packages with nuget.exe: {exc.Message}");
-            }
-
-            var restoredProjects = RestoreSolutions(allSolutions, out var assets1);
-            var projects = allProjects.Except(restoredProjects);
-            RestoreProjects(projects, out var assets2);
-
-            var dependencies = Assets.GetCompilationDependencies(logger, assets1.Union(assets2));
-
-            var paths = dependencies
-                .Paths
-                .Select(d => Path.Combine(packageDirectory.DirInfo.FullName, d))
-                .ToList();
-            dllPaths.UnionWith(paths);
-
-            LogAllUnusedPackages(dependencies);
-            DownloadMissingPackages(allNonBinaryFiles, dllPaths);
-        }
-
-        private static bool IsPathInSubfolder(string path, string rootFolder, string subFolder)
-        {
-            return path.IndexOf(
-                $"{Path.DirectorySeparatorChar}{subFolder}{Path.DirectorySeparatorChar}",
-                rootFolder.Length,
-                StringComparison.InvariantCultureIgnoreCase) >= 0;
-        }
-
         private void RemoveNugetAnalyzerReferences()
         {
             var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();
@@ -483,27 +416,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .FullName;
         }
 
-        private ICollection<string> GetAllPackageDirectories()
-        {
-            return new DirectoryInfo(packageDirectory.DirInfo.FullName)
-                .EnumerateDirectories("*", new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive, RecurseSubdirectories = false })
-                .Select(d => d.Name)
-                .ToList();
-        }
-
-        private void LogAllUnusedPackages(DependencyContainer dependencies)
-        {
-            var allPackageDirectories = GetAllPackageDirectories();
-
-            logger.LogInfo($"Restored {allPackageDirectories.Count} packages");
-            logger.LogInfo($"Found {dependencies.Packages.Count} packages in project.assets.json files");
-
-            allPackageDirectories
-                .Where(package => !dependencies.Packages.Contains(package))
-                .Order()
-                .ForEach(package => logger.LogInfo($"Unused package: {package}"));
-        }
-
         private void GenerateSourceFileFromImplicitUsings()
         {
             var usings = new HashSet<string>();
@@ -807,269 +719,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        /// <summary>
-        /// Executes `dotnet restore` on all solution files in solutions.
-        /// As opposed to RestoreProjects this is not run in parallel using PLINQ
-        /// as `dotnet restore` on a solution already uses multiple threads for restoring
-        /// the projects (this can be disabled with the `--disable-parallel` flag).
-        /// Populates assets with the relative paths to the assets files generated by the restore.
-        /// Returns a list of projects that are up to date with respect to restore.
-        /// </summary>
-        /// <param name="solutions">A list of paths to solution files.</param>
-        private IEnumerable<string> RestoreSolutions(IEnumerable<string> solutions, out IEnumerable<string> assets)
-        {
-            var successCount = 0;
-            var nugetSourceFailures = 0;
-            var assetFiles = new List<string>();
-            var projects = solutions.SelectMany(solution =>
-                {
-                    logger.LogInfo($"Restoring solution {solution}...");
-                    var res = dotnet.Restore(new(solution, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));
-                    if (res.Success)
-                    {
-                        successCount++;
-                    }
-                    if (res.HasNugetPackageSourceError)
-                    {
-                        nugetSourceFailures++;
-                    }
-                    assetFiles.AddRange(res.AssetsFilePaths);
-                    return res.RestoredProjects;
-                }).ToList();
-            assets = assetFiles;
-            CompilationInfos.Add(("Successfully restored solution files", successCount.ToString()));
-            CompilationInfos.Add(("Failed solution restore with package source error", nugetSourceFailures.ToString()));
-            CompilationInfos.Add(("Restored projects through solution files", projects.Count.ToString()));
-            return projects;
-        }
-
-        /// <summary>
-        /// Executes `dotnet restore` on all projects in projects.
-        /// This is done in parallel for performance reasons.
-        /// Populates assets with the relative paths to the assets files generated by the restore.
-        /// </summary>
-        /// <param name="projects">A list of paths to project files.</param>
-        private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<string> assets)
-        {
-            var successCount = 0;
-            var nugetSourceFailures = 0;
-            var assetFiles = new List<string>();
-            var sync = new object();
-            Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = threads }, project =>
-            {
-                logger.LogInfo($"Restoring project {project}...");
-                var res = dotnet.Restore(new(project, packageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));
-                lock (sync)
-                {
-                    if (res.Success)
-                    {
-                        successCount++;
-                    }
-                    if (res.HasNugetPackageSourceError)
-                    {
-                        nugetSourceFailures++;
-                    }
-                    assetFiles.AddRange(res.AssetsFilePaths);
-                }
-            });
-            assets = assetFiles;
-            CompilationInfos.Add(("Successfully restored project files", successCount.ToString()));
-            CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
-        }
-
-        [GeneratedRegex(@"^(.+)\.(\d+\.\d+\.\d+(-(.+))?)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
-        private static partial Regex LegacyNugetPackage();
-
-
-        private static IEnumerable<string> GetRestoredPackageDirectoryNames(DirectoryInfo root)
-        {
-            return Directory.GetDirectories(root.FullName)
-                .Select(d => Path.GetFileName(d).ToLowerInvariant());
-        }
-
-        private IEnumerable<string> GetRestoredLegacyPackageNames()
-        {
-            var oldPackageDirectories = GetRestoredPackageDirectoryNames(legacyPackageDirectory.DirInfo);
-            foreach (var oldPackageDirectory in oldPackageDirectories)
-            {
-                // nuget install restores packages to 'packagename.version' folders (dotnet restore to 'packagename/version' folders)
-                // typical folder names look like:
-                //   newtonsoft.json.13.0.3
-                // there are more complex ones too, such as:
-                //   runtime.tizen.4.0.0-armel.Microsoft.NETCore.DotNetHostResolver.2.0.0-preview2-25407-01
-
-                var match = LegacyNugetPackage().Match(oldPackageDirectory);
-                if (!match.Success)
-                {
-                    logger.LogWarning($"Package directory '{oldPackageDirectory}' doesn't match the expected pattern.");
-                    continue;
-                }
-
-                yield return match.Groups[1].Value.ToLowerInvariant();
-            }
-        }
-
-        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<string> dllPaths)
-        {
-            var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);
-            var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
-
-            var notYetDownloadedPackages = new HashSet<PackageReference>(fileContent.AllPackages);
-            foreach (var alreadyDownloadedPackage in alreadyDownloadedPackages)
-            {
-                notYetDownloadedPackages.Remove(new(alreadyDownloadedPackage, PackageReferenceSource.SdkCsProj));
-            }
-            foreach (var alreadyDownloadedLegacyPackage in alreadyDownloadedLegacyPackages)
-            {
-                notYetDownloadedPackages.Remove(new(alreadyDownloadedLegacyPackage, PackageReferenceSource.PackagesConfig));
-            }
-
-            if (notYetDownloadedPackages.Count == 0)
-            {
-                return;
-            }
-
-            var multipleVersions = notYetDownloadedPackages
-                .GroupBy(p => p.Name)
-                .Where(g => g.Count() > 1)
-                .Select(g => g.Key)
-                .ToList();
-
-            foreach (var package in multipleVersions)
-            {
-                logger.LogWarning($"Found multiple not yet restored packages with name '{package}'.");
-                notYetDownloadedPackages.Remove(new(package, PackageReferenceSource.PackagesConfig));
-            }
-
-            logger.LogInfo($"Found {notYetDownloadedPackages.Count} packages that are not yet restored");
-
-            var nugetConfigs = allFiles.SelectFileNamesByName("nuget.config").ToArray();
-            string? nugetConfig = null;
-            if (nugetConfigs.Length > 1)
-            {
-                logger.LogInfo($"Found multiple nuget.config files: {string.Join(", ", nugetConfigs)}.");
-                nugetConfig = allFiles
-                    .SelectRootFiles(sourceDir)
-                    .SelectFileNamesByName("nuget.config")
-                    .FirstOrDefault();
-                if (nugetConfig == null)
-                {
-                    logger.LogInfo("Could not find a top-level nuget.config file.");
-                }
-            }
-            else
-            {
-                nugetConfig = nugetConfigs.FirstOrDefault();
-            }
-
-            if (nugetConfig != null)
-            {
-                logger.LogInfo($"Using nuget.config file {nugetConfig}.");
-            }
-
-            CompilationInfos.Add(("Fallback nuget restore", notYetDownloadedPackages.Count.ToString()));
-
-            var successCount = 0;
-            var sync = new object();
-
-            Parallel.ForEach(notYetDownloadedPackages, new ParallelOptions { MaxDegreeOfParallelism = threads }, package =>
-            {
-                var success = TryRestorePackageManually(package.Name, nugetConfig, package.PackageReferenceSource);
-                if (!success)
-                {
-                    return;
-                }
-
-                lock (sync)
-                {
-                    successCount++;
-                }
-            });
-
-            CompilationInfos.Add(("Successfully ran fallback nuget restore", successCount.ToString()));
-
-            dllPaths.Add(missingPackageDirectory.DirInfo.FullName);
-        }
-
-        [GeneratedRegex(@"<TargetFramework>.*</TargetFramework>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
-        private static partial Regex TargetFramework();
-
-        private bool TryRestorePackageManually(string package, string? nugetConfig, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj)
-        {
-            logger.LogInfo($"Restoring package {package}...");
-            using var tempDir = new TemporaryDirectory(ComputeTempDirectory(package, "missingpackages_workingdir"));
-            var success = dotnet.New(tempDir.DirInfo.FullName);
-            if (!success)
-            {
-                return false;
-            }
-
-            if (packageReferenceSource == PackageReferenceSource.PackagesConfig)
-            {
-                TryChangeTargetFrameworkMoniker(tempDir.DirInfo);
-            }
-
-            success = dotnet.AddPackage(tempDir.DirInfo.FullName, package);
-            if (!success)
-            {
-                return false;
-            }
-
-            var res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: nugetConfig));
-            if (!res.Success)
-            {
-                if (res.HasNugetPackageSourceError && nugetConfig is not null)
-                {
-                    // Restore could not be completed because the listed source is unavailable. Try without the nuget.config:
-                    res = dotnet.Restore(new(tempDir.DirInfo.FullName, missingPackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: false, PathToNugetConfig: null, ForceReevaluation: true));
-                }
-
-                // TODO: the restore might fail, we could retry with
-                // - a prerelease (*-* instead of *) version of the package,
-                // - a different target framework moniker.
-
-                if (!res.Success)
-                {
-                    logger.LogInfo($"Failed to restore nuget package {package}");
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private void TryChangeTargetFrameworkMoniker(DirectoryInfo tempDir)
-        {
-            try
-            {
-                logger.LogInfo($"Changing the target framework moniker in {tempDir.FullName}...");
-
-                var csprojs = tempDir.GetFiles("*.csproj", new EnumerationOptions { RecurseSubdirectories = false, MatchCasing = MatchCasing.CaseInsensitive });
-                if (csprojs.Length != 1)
-                {
-                    logger.LogError($"Could not find the .csproj file in {tempDir.FullName}, count = {csprojs.Length}");
-                    return;
-                }
-
-                var csproj = csprojs[0];
-                var content = File.ReadAllText(csproj.FullName);
-                var matches = TargetFramework().Matches(content);
-                if (matches.Count == 0)
-                {
-                    logger.LogError($"Could not find target framework in {csproj.FullName}");
-                }
-                else
-                {
-                    content = TargetFramework().Replace(content, $"<TargetFramework>{FrameworkPackageNames.LatestNetFrameworkMoniker}</TargetFramework>", 1);
-                    File.WriteAllText(csproj.FullName, content);
-                }
-            }
-            catch (Exception exc)
-            {
-                logger.LogError($"Failed to update target framework in {tempDir.FullName}: {exc}");
-            }
-        }
-
         public void Dispose(TemporaryDirectory? dir, string name)
         {
             try

From 2336e1462749386aa3db178df112d81c2f569e09 Mon Sep 17 00:00:00 2001
From: Dave Bartolomeo <dbartol@github.com>
Date: Thu, 4 Apr 2024 10:31:05 -0400
Subject: [PATCH 064/136] Remove expectation of spurious diagnostic

---
 java/ql/test/query-tests/SpuriousJavadocParam/Test.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java/ql/test/query-tests/SpuriousJavadocParam/Test.java b/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
index de108008ee8..434353f4c67 100644
--- a/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
+++ b/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
@@ -132,6 +132,4 @@ public class Test<V> {
    * @param k does not
    */
   static record GenericRecord<T>(int i, int j) {}
-
-  // Diagnostic Matches: Incomplete inheritance relation for type java.lang.Object and supertype none
 }

From 4faff83aa0311d363598302ab4a5cbc921c7b3a8 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Thu, 4 Apr 2024 16:49:55 +0200
Subject: [PATCH 065/136] Python: Extractor: Remove dependency installation
 fallback

---
 python/extractor/buildtools/index.py | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/python/extractor/buildtools/index.py b/python/extractor/buildtools/index.py
index 10521868313..ec6f45d62c7 100644
--- a/python/extractor/buildtools/index.py
+++ b/python/extractor/buildtools/index.py
@@ -76,28 +76,11 @@ def get_filter_options():
         return []
 
 def get_path_options(version):
-    # We want to stop extracting libraries, and only extract the code that is in the
-    # repo. While in the transition period for stopping to install dependencies in the
-    # codeql-action, we will need to be able to support both old and new behavior.
-    #
-    # Like PYTHONUNBUFFERED for Python, we treat any non-empty string as meaning the
-    # flag is enabled.
-    # https://docs.python.org/3/using/cmdline.html#envvar-PYTHONUNBUFFERED
-    if os.environ.get("CODEQL_EXTRACTOR_PYTHON_DISABLE_LIBRARY_EXTRACTION"):
-        return []
+    # Before 2.17.1 it was possible to extract installed libraries
+    # where this function would return ["-p", "/path/to/library"].
+    # However, from 2.17.1 onwards, this is no longer supported.
 
-    # Not extracting dependencies will be default in CodeQL CLI release 2.16.0. Until
-    # 2.17.0, we provide an escape hatch to get the old behavior.
-    force_enable_envvar_name = "CODEQL_EXTRACTOR_PYTHON_FORCE_ENABLE_LIBRARY_EXTRACTION_UNTIL_2_17_0"
-    if os.environ.get(force_enable_envvar_name):
-        print("WARNING: We plan to remove the availability of the {} option in CodeQL CLI release 2.17.0 and beyond. Please let us know by submitting an issue to https://github.com/github/codeql why you needed to re-enable dependency extraction.".format(force_enable_envvar_name))
-        path_option = [ "-p", install.get_library(version)]
-        if PATH_TAG in os.environ:
-            path_option = split_into_options(os.environ[PATH_TAG], "-p") + path_option
-        return path_option
-    else:
-        print("INFO: The Python extractor has recently (from 2.16.0 CodeQL CLI release) stopped extracting dependencies by default, and therefore stopped analyzing the source code of dependencies by default. We plan to remove this entirely in CodeQL CLI release 2.17.0. If you encounter problems, please let us know by submitting an issue to https://github.com/github/codeql, so we can consider adjusting our plans. It is possible to re-enable dependency extraction by exporting '{}=1'.".format(force_enable_envvar_name))
-        return []
+    return []
 
 def get_stdlib():
     return os.path.dirname(os.__file__)

From 0604b4cc14bdfa515a148995b01c6b1834deccb5 Mon Sep 17 00:00:00 2001
From: Pierre <turbo@github.com>
Date: Fri, 5 Apr 2024 09:33:51 +0200
Subject: [PATCH 066/136] Changelog mergeback for versions prior to 2.17.0

---
 .../codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst   | 3 +--
 .../codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst   | 5 ++---
 .../codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst   | 2 +-
 .../codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst   | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
index b0888bd8bea..a9092f71f18 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
@@ -53,8 +53,7 @@ New Features
     |link-code-paths-and-code-paths-ignore-configuration-1|_.
     
 *   In the VS Code extension, recursive calls will be marked with inlay hints. These can be disabled with the global inlay hints setting
-    (:code:`editor.inlayHints.enabled`). If you just want to disable them for
-    codeql the settings can be scoped to just codeql files (language id is :code:`ql`).
+    (:code:`editor.inlayHints.enabled`). If you just want to disable them for codeql the settings can be scoped to just codeql files (language id is :code:`ql`).
     See `Language Specific Editor Settings <https://code.visualstudio.com/docs/getstarted/settings#_language-specific-editor-settings>`__ in the VS Code documentation for more information.
     
 *   The CLI now gives a more helpful error message when asked to run queries on a database that has not been finalized.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst
index 8b7feb9e683..aa61cc37f8b 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst
@@ -38,12 +38,11 @@ New Features
 Known Issues
 ~~~~~~~~~~~~
 
-*   We recommend that customers using the CodeQL CLI in a third party CI system do not upgrade to this release, due to an issue with :code:`codeql  github upload-results`. Instead, please use CodeQL 2.12.5, or, when available, CodeQL 2.12.7 or 2.13.1.
+*   We recommend that customers using the CodeQL CLI in a third party CI system do not upgrade to this release, due to an issue with :code:`codeql github upload-results`. Instead, please use CodeQL 2.12.5, or, when available, CodeQL 2.12.7 or 2.13.1.
     
     This issue occurs when uploading certain kinds of diagnostic information and causes the subcommand to fail with "A fatal error occurred: Invalid SARIF.", reporting an :code:`InvalidDefinitionException`.
     
-    Customers who wish to use CodeQL 2.12.6 or 2.13.0 can
-    work around the problem by passing :code:`--no-sarif-include-diagnostics` to any invocations of :code:`codeql database analyze` or :code:`codeql database interpret-results`.
+    Customers who wish to use CodeQL 2.12.6 or 2.13.0 can work around the problem by passing :code:`--no-sarif-include-diagnostics` to any invocations of :code:`codeql database analyze` or :code:`codeql database interpret-results`.
 
 Query Packs
 -----------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst
index 032b7a71014..748e2ff3b64 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst
@@ -73,7 +73,7 @@ New Features
 Known Issues
 ~~~~~~~~~~~~
 
-*   We recommend that customers using the CodeQL CLI in a third party CI system do not upgrade to this release, due to an issue with :code:`codeql  github upload-results`. Instead, please use CodeQL 2.12.5, or, when available, CodeQL 2.12.7 or 2.13.1. For more information, see the
+*   We recommend that customers using the CodeQL CLI in a third party CI system do not upgrade to this release, due to an issue with :code:`codeql github upload-results`. Instead, please use CodeQL 2.12.5, or, when available, CodeQL 2.12.7 or 2.13.1. For more information, see the
     "Known issues" section for CodeQL 2.12.6.
 
 Query Packs
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst
index b82d2dd5a5a..d51911d3d69 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst
@@ -26,8 +26,7 @@ Bug Fixes
     
 *   Fixed a bug that could have caused the compiler to incorrectly infer that a class matched a type signature. The bug only affected classes with overriding member predicates that had stronger binding sets than their root definitions.
     
-*   Fixed a bug where a query could not be run from VS Code when there were packs nested within sibling directories
-    of the query.
+*   Fixed a bug where a query could not be run from VS Code when there were packs nested within sibling directories of the query.
 
 New Features
 ~~~~~~~~~~~~

From 9e49c5f1850f15eae4962140976ea0386a83a38e Mon Sep 17 00:00:00 2001
From: Pierre <turbo@github.com>
Date: Fri, 5 Apr 2024 09:34:27 +0200
Subject: [PATCH 067/136] Add changelogs for 2.16.6 (to this branch) and 2.17.0
 (new)

---
 .../codeql-changelog/codeql-cli-2.16.6.rst    |  25 ++
 .../codeql-changelog/codeql-cli-2.17.0.rst    | 220 ++++++++++++++++++
 .../codeql-changelog/index.rst                |   2 +
 3 files changed, 247 insertions(+)
 create mode 100644 docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst
 create mode 100644 docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst

diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst
new file mode 100644
index 00000000000..dba880ceaae
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst
@@ -0,0 +1,25 @@
+.. _codeql-cli-2.16.6:
+
+==========================
+CodeQL 2.16.6 (2024-03-26)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.16.6 runs a total of 409 security queries when configured with the Default suite (covering 160 CWE). The Extended suite enables an additional 132 queries (covering 34 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixes a bug where extractor logs would be output at a lower than expected verbosity level when using the :code:`codeql database create` command.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst
new file mode 100644
index 00000000000..59b331fc154
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst
@@ -0,0 +1,220 @@
+.. _codeql-cli-2.17.0:
+
+==========================
+CodeQL 2.17.0 (2024-04-04)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.17.0 runs a total of 410 security queries when configured with the Default suite (covering 160 CWE). The Extended suite enables an additional 130 queries (covering 34 more CWE).
+
+CodeQL CLI
+----------
+
+Deprecations
+~~~~~~~~~~~~
+
+*   The :code:`--[no-]analysis-summary-v2` and :code:`--[no-]new-analysis-summary` options that were used to enable (or disable) improved summary information printed at the end of a :code:`codeql database analyze` invocation are no longer supported.
+    Improved summary information is now enabled for all invocations.
+*   Support for overwriting default CodeQL SARIF run properties using the
+    :code:`--sarif-run-property` command line option has been removed. This removes the ability to overwrite the :code:`semmle.formatSpecifier`, :code:`metricResults`, and
+    :code:`codeqlConfigSummary` properties in the SARIF run file.
+
+Improvements
+~~~~~~~~~~~~
+
+*   TRAP import (a part of :code:`codeql database create` and :code:`codeql database finalize`)
+    now performs better in low-memory situations. (Put another way, it now needs less RAM to achieve the same performance as before.)
+    
+*   The worst-case performance of transitive closure computation (using the :code:`+` or :code:`*` postfix operators or the :code:`fastTC` higher-order primitive in QL) has been greatly improved.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   The build of Eclipse Temurin OpenJDK that is used to run the CodeQL CLI has been updated to version 21.0.2.
+
+Query Packs
+-----------
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The :code:`Stored` variants of some queries (:code:`cs/stored-command-line-injection`, :code:`cs/web/stored-xss`, :code:`cs/stored-ldap-injection`, :code:`cs/xml/stored-xpath-injection`, :code:`cs/second-order-sql-injection`) have been removed. If you were using these queries, their results can be restored by enabling the :code:`file` and :code:`database` threat models in your threat model configuration.
+
+Java
+""""
+
+*   The :code:`java/missing-case-in-switch` query now gives only a single alert for each switch statement, giving some examples of the missing cases as well as a count of how many are missing.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The "Missing return-value check for a 'scanf'-like function" query (:code:`cpp/missing-check-scanf`) has been converted to a :code:`path-problem` query.
+*   The "Potentially uninitialized local variable" query (:code:`cpp/uninitialized-local`) has been converted to a :code:`path-problem` query.
+*   Added models for :code:`GLib` allocation and deallocation functions.
+
+C#
+""
+
+*   The alert message of :code:`cs/wrong-compareto-signature` has been changed to remove unnecessary element references.
+*   Data flow queries that track flow from *local* flow sources now use the current *threat model* configuration instead. This may lead to changes in the produced alerts if the threat model configuration only uses *remote* flow sources. The changed queries are :code:`cs/code-injection`, :code:`cs/resource-injection`, :code:`cs/sql-injection`, and :code:`cs/uncontrolled-format-string`.
+
+Golang
+""""""
+
+*   The query :code:`go/hardcoded-credentials` no longer discards string literals based on "weak password" heuristics.
+*   The query :code:`go/sql-injection` now recognizes more sinks in the package :code:`github.com/Masterminds/squirrel`.
+
+Java
+""""
+
+*   Variables named :code:`tokenImage` are no longer sources for  the :code:`java/sensitive-log` query. This is because this variable name is used in parsing code generated by JavaCC, so it causes a large number of false positive alerts.
+*   Added sanitizers for relative URLs, :code:`List.contains()`, and checking the host of a URI to the :code:`java/ssrf` and :code:`java/unvalidated-url-redirection` queries.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The call graph has been improved, leading to more alerts for data flow based queries.
+
+New Queries
+~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a new query, :code:`cpp/type-confusion`, to detect casts to invalid types.
+
+Golang
+""""""
+
+*   The query "Slice memory allocation with excessive size value" (:code:`go/uncontrolled-allocation-size`) has been promoted from experimental to the main query pack. Its results will now appear by default. This query was originally `submitted as an experimental query by @Malayke <https://github.com/github/codeql/pull/15130>`__.
+
+Java
+""""
+
+*   The query :code:`java/unsafe-url-forward-dispatch-load` has been promoted from experimental to the main query pack as :code:`java/unvalidated-url-forward`. Its results will now appear by default. This query was originally submitted as an experimental query `by @haby0 <https://github.com/github/codeql/pull/6240>`__ and `by @luchua-bc <https://github.com/github/codeql/pull/7286>`__.
+
+Query Metadata Changes
+~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   :code:`@precision medium` metadata was added to the :code:`cpp/boost/tls-settings-misconfiguration` and :code:`cpp/boost/use-of-deprecated-hardcoded-security-protocol` queries, and these queries are now included in the security-extended suite. The :code:`@name` metadata of these queries were also updated.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`@precision` of the :code:`js/unsafe-external-link` has been reduced to :code:`low` to reflect the fact that modern browsers do not expose the opening window for such links. This mitigates the potential security risk of having a link with :code:`target="_blank"`.
+
+Language Libraries
+------------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The CIL extractor has been deleted and the corresponding extractor option :code:`cil` has been removed. It is no longer possible to do CIL extraction.
+*   The QL library C# classes no longer extend their corresponding :code:`DotNet` classes. Furthermore, CIL related data flow functionality has been deleted and all :code:`DotNet` and :code:`CIL` related classes have been deprecated. This effectively means that it no longer has any effect to enable CIL extraction.
+
+Java
+""""
+
+*   The Java extractor no longer supports the :code:`ODASA_SNAPSHOT` legacy environment variable.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for TypeScript 5.4.
+
+Swift
+"""""
+
+*   Upgraded to Swift 5.10
+*   New AST node is extracted: :code:`ThenStmt`
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added destructors for temporary objects with extended lifetimes to the intermediate representation.
+
+C#
+""
+
+*   Added new source models for the :code:`Dapper` package. These models can be enabled by enabling the :code:`database` threat model.
+*   Additional models have been added for :code:`System.IO`. These are primarily source models with the :code:`file` threat model, and summaries related to reading from a file or stream.
+*   Support for C# 12 / .NET8.
+*   Added the :code:`windows-registry` source kind and threat model to represent values which come from the registry on Windows.
+*   The models for :code:`System.Net.Http.HttpRequestMessage` have been modified to better model the flow of tainted URIs.
+*   The .NET standard libraries APIs for accessing command line arguments and environment variables have been modeled using the :code:`commandargs` and :code:`environment` threat models.
+*   The :code:`cs/assembly-path-injection` query has been modified so that it's sources rely on :code:`ThreatModelFlowSource`. In order to restore results from command line arguments, you should enable the :code:`commandargs` threat model.
+*   The models for :code:`System.IO.TextReader` have been modified to better model the flow of tainted text from a :code:`TextReader`.
+
+Golang
+""""""
+
+*   The :code:`CODEQL_EXTRACTOR_GO_FAST_PACKAGE_INFO` option, which speeds up retrieval of dependency information, is now on by default. This was originally an external contribution by @xhd2015.
+*   Added dataflow sources for the package :code:`gopkg.in/macaron.v1`.
+
+Java
+""""
+
+*   Increased the precision of some dataflow models of the class :code:`java.net.URL` by distinguishing the parts of a URL.
+*   The Java extractor and QL libraries now support Java 22, including support for anonymous variables, lambda parameters and patterns.
+*   Pattern cases with multiple patterns and that fall through to or from other pattern cases are now supported. The :code:`PatternCase` class gains the new :code:`getPatternAtIndex` and :code:`getAPattern` predicates, and deprecates :code:`getPattern`.
+*   Added a :code:`path-injection` sink for the :code:`open` methods of the :code:`android.os.ParcelFileDescriptor` class.
+
+Ruby
+""""
+
+*   Data flow is now tracked through :code:`ActiveRecord` scopes.
+*   Modeled instances of :code:`ActionDispatch::Http::UploadedFile` that can be obtained from element reads of :code:`ActionController::Parameters`, with calls to :code:`original_filename`, :code:`content_type`, and :code:`read` now propagating taint from their receiver.
+*   The second argument, :code:`subquery_name`, of the :code:`ActiveRecord::QueryMethods::from` method, is now recognized as an sql injection sink.
+*   Calls to :code:`Typhoeus::Request.new` are now considered as instances of the :code:`Http::Client::Request` concept, with the response body being treated as a remote flow source.
+*   New command injection sinks have been added, including :code:`Process.spawn`, :code:`Process.exec`, :code:`Terrapin::CommandLine` and the :code:`open4` gem.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a :code:`TaintInheritingContent` class that can be extended to model taint flowing from a qualifier to a field.
+*   Added a predicate :code:`GuardCondition.comparesEq/4` to query whether an expression is compared to a constant.
+*   Added a predicate :code:`GuardCondition.ensuresEq/4` to query whether a basic block is guarded by an expression being equal to a constant.
+*   Added a predicate :code:`GuardCondition.comparesLt/4` to query whether an expression is compared to a constant.
+*   Added a predicate :code:`GuardCondition.ensuresLt/4` to query whether a basic block is guarded by an expression being less than a constant.
+*   Added a predicate :code:`GuardCondition.valueControls` to query whether a basic block is guarded by a particular :code:`case` of a :code:`switch` statement.
+
+Shared Libraries
+----------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dataflow Analysis
+"""""""""""""""""
+
+*   Path explanations now include flow that goes through callbacks passed into library functions. For example, if :code:`map` is a library function, then in :code:`result = map(xs, x => x + 1)` we will now include the step from :code:`x` to :code:`x + 1` in the path explanation, instead of going directly from :code:`xs` to :code:`result`. Note that this change does not affect actual query results, but only how path explanations are computed.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index 5015699e2fa..222e133ed19 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,8 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.17.0
+   codeql-cli-2.16.6
    codeql-cli-2.16.5
    codeql-cli-2.16.4
    codeql-cli-2.16.3

From 7bec41096c182364830c260ce49489d593ca9550 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Wed, 3 Apr 2024 14:18:30 +0000
Subject: [PATCH 068/136] Python: Rename `tsg-build` target to `tsp-build`

The latter makes more sense, as it's actually building
`tree-sitter-python`.
---
 python/extractor/tsg-python/tsp/BUILD.bazel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/extractor/tsg-python/tsp/BUILD.bazel b/python/extractor/tsg-python/tsp/BUILD.bazel
index 71319e894f6..e3389fce1cc 100644
--- a/python/extractor/tsg-python/tsp/BUILD.bazel
+++ b/python/extractor/tsg-python/tsp/BUILD.bazel
@@ -7,7 +7,7 @@ package(default_visibility = ["//visibility:public"])
 # This will run the build script from the root of the workspace, and
 # collect the outputs.
 cargo_build_script(
-    name = "tsg-build",
+    name = "tsp-build",
     srcs = ["bindings/rust/build.rs"],
     data = glob([
         "src/**",
@@ -32,7 +32,7 @@ rust_library(
     proc_macro_deps = all_crate_deps(
         proc_macro = True,
     ),
-    deps = [":tsg-build"] + all_crate_deps(
+    deps = [":tsp-build"] + all_crate_deps(
         normal = True,
     ),
 )

From 752d28c1b9fee6047180b7233e753473028b557a Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Wed, 3 Apr 2024 14:20:54 +0000
Subject: [PATCH 069/136] Python: Update repinning instructions

This aligns us better with the corresponding instructions for
the Ruby extractor.
---
 python/extractor/tsg-python/Cargo.toml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/python/extractor/tsg-python/Cargo.toml b/python/extractor/tsg-python/Cargo.toml
index feecd254159..ac4d4093189 100644
--- a/python/extractor/tsg-python/Cargo.toml
+++ b/python/extractor/tsg-python/Cargo.toml
@@ -7,9 +7,14 @@ authors = ["Taus Brock-Nannestad <tausbn@github.com>"]
 edition = "2018"
 
 # When changing/updating these, the `Cargo.Bazel.lock` file has to be regenerated.
-# Check out the documentation at https://bazelbuild.github.io/rules_rust/crate_universe.html#repinning--updating-dependencies
-# for how to do so. The bazel repository for the tsg-python project is called `py_deps`,
-# and instead of calling `bazel sync`, `./build --bazel sync` should be used instead, to always use the correct bazel version.
+# Run `CARGO_BAZEL_REPIN=true CARGO_BAZEL_REPIN_ONLY=py_deps ./build --bazel sync --only=py_deps`
+# in the `semmle-code` repository to do so.
+# For more information, check out the documentation at
+# https://bazelbuild.github.io/rules_rust/crate_universe.html#repinning--updating-dependencies
+# In the future, the hope is to move this handling of the dependencies entirely into the `codeql` repository,
+# but that depends on `rules_rust` being fully compatible with bzlmod, which they aren't yet
+# (c.f. https://github.com/bazelbuild/rules_rust/issues/2452).
+# Warning: The process takes >5min on my M1 mac, so do wait for a while.
 [dependencies]
 anyhow = "1.0"
 regex = "1"

From 599f573a4abb0b20411aa22298dd3ec0c5a1eaf1 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Wed, 3 Apr 2024 14:25:03 +0000
Subject: [PATCH 070/136] Python: Preserve comments and docstrings in extractor

---
 python/extractor/make_zips.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/python/extractor/make_zips.py b/python/extractor/make_zips.py
index b91b1bf458d..faf595acc37 100755
--- a/python/extractor/make_zips.py
+++ b/python/extractor/make_zips.py
@@ -8,7 +8,6 @@ import optparse
 import compileall
 
 from python_tracer import getzipfilename
-from unparse import strip_comments_and_docstrings
 
 # TO DO -- Add options to set destination directory and source directory
 
@@ -84,9 +83,7 @@ def write_source(zipped, root, name, extensions=[".py"]):
             if ext not in extensions:
                 continue
             path = os.path.join(dirpath, name)
-            temp = strip_comments_and_docstrings(path)
-            zipped.write(temp, os.path.relpath(path, root))
-            os.remove(temp)
+            zipped.write(path, os.path.relpath(path, root))
 
 def main():
     parser = optparse.OptionParser(usage = "usage: %prog [install-dir]")

From ef9f99b3be728d910539c7750e77a11cfda64425 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Wed, 3 Apr 2024 14:30:29 +0000
Subject: [PATCH 071/136] Python: Remove `unparse.py`

---
 python/extractor/BUILD.bazel |   1 -
 python/extractor/licenses.md |   1 -
 python/extractor/unparse.py  | 709 -----------------------------------
 3 files changed, 711 deletions(-)
 delete mode 100644 python/extractor/unparse.py

diff --git a/python/extractor/BUILD.bazel b/python/extractor/BUILD.bazel
index 3b5a5b3a617..697bf8d49a4 100644
--- a/python/extractor/BUILD.bazel
+++ b/python/extractor/BUILD.bazel
@@ -5,7 +5,6 @@ py_binary(
     srcs = [
         "make_zips.py",
         "python_tracer.py",
-        "unparse.py",
     ],
     data = [
         "LICENSE-PSF.md",
diff --git a/python/extractor/licenses.md b/python/extractor/licenses.md
index f3a5c6cc458..d585a84626d 100644
--- a/python/extractor/licenses.md
+++ b/python/extractor/licenses.md
@@ -6,7 +6,6 @@
 | `tsg-python/tree-sitter-python` | Y           | MIT                                      | Used in `tsg-python` to parse Python files                                                                                                                                                     |
 | `tsg-python`                    | Y           | MIT / Apache                             | This is our own creation, so are free to choose what license it is covered by.                                                                                                                 |
 | `tree-sitter-graph`             | N           | MIT / Apache                             | Used in `tsg-python` to execute files written in the `tree-sitter-graph` language.                                                                                                             |
-| `unparse.py`                    | Y           | PSF                                      | Copied and adapted from `Tools/unparse.py` from the `cpython` source code, with attribution.                                                                                                   |
 | `imp.py`                        | Y           | PSF                                      | Copied and adapted from `Lib/imp.py` from the `cpython` source code, with attribution.                                                                                                         |
 | `semmle/data/*.trap`            | Y           | PSF                                      | These files were derived from the C source code of the `cpython` project, and are used in our modelling of built-in objects. No attribution, currently.                                        |
 | `semmle/thrift/parse.py`        | Y           | Apache                                   | Includes a grammar based on https://github.com/apache/thrift/blob/master/doc/specs/idl.md, with comment stating this attribution.                                                              |
diff --git a/python/extractor/unparse.py b/python/extractor/unparse.py
deleted file mode 100644
index b12f1501592..00000000000
--- a/python/extractor/unparse.py
+++ /dev/null
@@ -1,709 +0,0 @@
-#Copied Tools.unparse.py with modifications. Copyright PSF.
-
-"Usage: unparse.py <path to source file>"
-import sys
-import ast
-import tokenize
-import io
-import os
-import shutil
-
-# Large float and imaginary literals get turned into infinities in the AST.
-# We unparse those infinities to INFSTR.
-INFSTR = "1e" + repr(sys.float_info.max_10_exp + 1)
-
-def interleave(inter, f, seq):
-    """Call f on each item in seq, calling inter() in between.
-    """
-    seq = iter(seq)
-    try:
-        f(next(seq))
-    except StopIteration:
-        pass
-    else:
-        for x in seq:
-            inter()
-            f(x)
-
-class Unparser:
-    """Methods in this class recursively traverse an AST and
-    output source code for the abstract syntax; original formatting
-    is disregarded. """
-
-    def __init__(self, tree, file = sys.stdout):
-        """Unparser(tree, file=sys.stdout) -> None.
-         Print the source for tree to file."""
-        self.f = file
-        self._indent = 0
-        self.dispatch(tree)
-        print("", file=self.f)
-        self.f.flush()
-
-    def fill(self, text = ""):
-        "Indent a piece of text, according to the current indentation level"
-        self.f.write("\n"+"    "*self._indent + text)
-
-    def write(self, text):
-        "Append a piece of text to the current line."
-        self.f.write(text)
-
-    def enter(self):
-        "Print ':', and increase the indentation."
-        self.write(":")
-        self._indent += 1
-
-    def leave(self):
-        "Decrease the indentation level."
-        self._indent -= 1
-
-    def dispatch(self, tree):
-        "Dispatcher function, dispatching tree type T to method _T."
-        if isinstance(tree, list):
-            for t in tree:
-                self.dispatch(t)
-            return
-        meth = getattr(self, "_"+tree.__class__.__name__)
-        meth(tree)
-
-    def remove_docstring(self, t):
-        if hasattr(t, "docstring"):
-            return
-        if not t.body:
-            return
-        if not isinstance(t.body[0], ast.Expr):
-            return
-        if not isinstance(t.body[0].value, ast.Str):
-            return
-        t.body = t.body[1:]
-
-    def add_pass(self, t):
-        if  t.body:
-            #No pass needed
-            return
-        t.body = [ast.Pass()]
-
-    ############### Unparsing methods ######################
-    # There should be one method per concrete grammar type #
-    # Constructors should be grouped by sum type. Ideally, #
-    # this would follow the order in the grammar, but      #
-    # currently doesn't.                                   #
-    ########################################################
-
-    def _Module(self, tree):
-        self.remove_docstring(tree)
-        self.add_pass(tree)
-        for stmt in tree.body:
-            self.dispatch(stmt)
-
-    # stmt
-    def _Expr(self, tree):
-        self.fill()
-        self.dispatch(tree.value)
-
-    def _Import(self, t):
-        self.fill("import ")
-        interleave(lambda: self.write(", "), self.dispatch, t.names)
-
-    def _ImportFrom(self, t):
-        self.fill("from ")
-        self.write("." * t.level)
-        if t.module:
-            self.write(t.module)
-        self.write(" import ")
-        interleave(lambda: self.write(", "), self.dispatch, t.names)
-
-    def _Assign(self, t):
-        self.fill()
-        for target in t.targets:
-            self.dispatch(target)
-            self.write(" = ")
-        self.dispatch(t.value)
-
-    def _AugAssign(self, t):
-        self.fill()
-        self.dispatch(t.target)
-        self.write(" "+self.binop[t.op.__class__.__name__]+"= ")
-        self.dispatch(t.value)
-
-    def _AnnAssign(self, t):
-        self.fill()
-        if not t.simple and isinstance(t.target, ast.Name):
-            self.write('(')
-        self.dispatch(t.target)
-        if not t.simple and isinstance(t.target, ast.Name):
-            self.write(')')
-        self.write(": ")
-        self.dispatch(t.annotation)
-        if t.value:
-            self.write(" = ")
-            self.dispatch(t.value)
-
-    def _Return(self, t):
-        self.fill("return")
-        if t.value:
-            self.write(" ")
-            self.dispatch(t.value)
-
-    def _Pass(self, t):
-        self.fill("pass")
-
-    def _Break(self, t):
-        self.fill("break")
-
-    def _Continue(self, t):
-        self.fill("continue")
-
-    def _Delete(self, t):
-        self.fill("del ")
-        interleave(lambda: self.write(", "), self.dispatch, t.targets)
-
-    def _Assert(self, t):
-        self.fill("assert ")
-        self.dispatch(t.test)
-        if t.msg:
-            self.write(", ")
-            self.dispatch(t.msg)
-
-    def _Global(self, t):
-        self.fill("global ")
-        interleave(lambda: self.write(", "), self.write, t.names)
-
-    def _Nonlocal(self, t):
-        self.fill("nonlocal ")
-        interleave(lambda: self.write(", "), self.write, t.names)
-
-    def _Await(self, t):
-        self.write("(")
-        self.write("await")
-        if t.value:
-            self.write(" ")
-            self.dispatch(t.value)
-        self.write(")")
-
-    def _Yield(self, t):
-        self.write("(")
-        self.write("yield")
-        if t.value:
-            self.write(" ")
-            self.dispatch(t.value)
-        self.write(")")
-
-    def _YieldFrom(self, t):
-        self.write("(")
-        self.write("yield from")
-        if t.value:
-            self.write(" ")
-            self.dispatch(t.value)
-        self.write(")")
-
-    def _Raise(self, t):
-        self.fill("raise")
-        if not t.exc:
-            assert not t.cause
-            return
-        self.write(" ")
-        self.dispatch(t.exc)
-        if t.cause:
-            self.write(" from ")
-            self.dispatch(t.cause)
-
-    def _Try(self, t):
-        self.fill("try")
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-        for ex in t.handlers:
-            self.dispatch(ex)
-        if t.orelse:
-            self.fill("else")
-            self.enter()
-            self.dispatch(t.orelse)
-            self.leave()
-        if t.finalbody:
-            self.fill("finally")
-            self.enter()
-            self.dispatch(t.finalbody)
-            self.leave()
-
-    def _ExceptHandler(self, t):
-        self.fill("except")
-        if t.type:
-            self.write(" ")
-            self.dispatch(t.type)
-        if t.name:
-            self.write(" as ")
-            self.write(t.name)
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-
-    def _ClassDef(self, t):
-        self.write("\n")
-        for deco in t.decorator_list:
-            self.fill("@")
-            self.dispatch(deco)
-        self.fill("class "+t.name)
-        self.write("(")
-        comma = False
-        for e in t.bases:
-            if comma: self.write(", ")
-            else: comma = True
-            self.dispatch(e)
-        for e in t.keywords:
-            if comma: self.write(", ")
-            else: comma = True
-            self.dispatch(e)
-        self.write(")")
-
-        self.enter()
-        self.remove_docstring(t)
-        self.add_pass(t)
-        self.dispatch(t.body)
-        self.leave()
-
-    def _FunctionDef(self, t):
-        self.__FunctionDef_helper(t, "def")
-
-    def _AsyncFunctionDef(self, t):
-        self.__FunctionDef_helper(t, "async def")
-
-    def __FunctionDef_helper(self, t, fill_suffix):
-        self.write("\n")
-        for deco in t.decorator_list:
-            self.fill("@")
-            self.dispatch(deco)
-        def_str = fill_suffix+" "+t.name + "("
-        self.fill(def_str)
-        self.dispatch(t.args)
-        self.write(")")
-        if t.returns:
-            self.write(" -> ")
-            self.dispatch(t.returns)
-        self.enter()
-        self.remove_docstring(t)
-        self.add_pass(t)
-        self.dispatch(t.body)
-        self.leave()
-
-    def _For(self, t):
-        self.__For_helper("for ", t)
-
-    def _AsyncFor(self, t):
-        self.__For_helper("async for ", t)
-
-    def __For_helper(self, fill, t):
-        self.fill(fill)
-        self.dispatch(t.target)
-        self.write(" in ")
-        self.dispatch(t.iter)
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-        if t.orelse:
-            self.fill("else")
-            self.enter()
-            self.dispatch(t.orelse)
-            self.leave()
-
-    def _If(self, t):
-        self.fill("if ")
-        self.dispatch(t.test)
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-        # collapse nested ifs into equivalent elifs.
-        while (t.orelse and len(t.orelse) == 1 and
-               isinstance(t.orelse[0], ast.If)):
-            t = t.orelse[0]
-            self.fill("elif ")
-            self.dispatch(t.test)
-            self.enter()
-            self.dispatch(t.body)
-            self.leave()
-        # final else
-        if t.orelse:
-            self.fill("else")
-            self.enter()
-            self.dispatch(t.orelse)
-            self.leave()
-
-    def _While(self, t):
-        self.fill("while ")
-        self.dispatch(t.test)
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-        if t.orelse:
-            self.fill("else")
-            self.enter()
-            self.dispatch(t.orelse)
-            self.leave()
-
-    def _With(self, t):
-        self.fill("with ")
-        interleave(lambda: self.write(", "), self.dispatch, t.items)
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-
-    def _AsyncWith(self, t):
-        self.fill("async with ")
-        interleave(lambda: self.write(", "), self.dispatch, t.items)
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-
-    # expr
-    def _Bytes(self, t):
-        self.write(repr(t.s))
-
-    def _Str(self, tree):
-        s = repr(tree.s).encode("ascii", errors="backslashreplace").decode("ascii")
-        self.write(s)
-
-    def _JoinedStr(self, t):
-        self.write("f")
-        string = io.StringIO()
-        self._fstring_JoinedStr(t, string.write)
-        self.write(repr(string.getvalue()))
-
-    def _FormattedValue(self, t):
-        self.write("f")
-        string = io.StringIO()
-        self._fstring_FormattedValue(t, string.write)
-        self.write(repr(string.getvalue()))
-
-    def _fstring_JoinedStr(self, t, write):
-        for value in t.values:
-            meth = getattr(self, "_fstring_" + type(value).__name__)
-            meth(value, write)
-
-    def _fstring_Str(self, t, write):
-        value = t.s.replace("{", "{{").replace("}", "}}")
-        write(value)
-
-    def _fstring_Constant(self, t, write):
-        assert isinstance(t.value, str)
-        value = t.value.replace("{", "{{").replace("}", "}}")
-        write(value)
-
-    def _fstring_FormattedValue(self, t, write):
-        write("{")
-        expr = io.StringIO()
-        Unparser(t.value, expr)
-        expr = expr.getvalue().rstrip("\n")
-        if expr.startswith("{"):
-            write(" ")  # Separate pair of opening brackets as "{ {"
-        write(expr)
-        if t.conversion != -1:
-            conversion = chr(t.conversion)
-            assert conversion in "sra"
-            write("!%s" % conversion)
-        if t.format_spec:
-            write(":")
-            meth = getattr(self, "_fstring_" + type(t.format_spec).__name__)
-            meth(t.format_spec, write)
-        write("}")
-
-    def _Name(self, t):
-        self.write(t.id)
-
-    def _write_constant(self, value):
-        if isinstance(value, (float, complex)):
-            self.write(repr(value).replace("inf", INFSTR))
-        else:
-            self.write(repr(value))
-
-    def _Constant(self, t):
-        value = t.value
-        if isinstance(value, tuple):
-            self.write("(")
-            if len(value) == 1:
-                self._write_constant(value[0])
-                self.write(",")
-            else:
-                interleave(lambda: self.write(", "), self._write_constant, value)
-            self.write(")")
-        else:
-            self._write_constant(t.value)
-
-    def _NameConstant(self, t):
-        self.write(repr(t.value))
-
-    def _Num(self, t):
-        # Substitute overflowing decimal literal for AST infinities.
-        self.write(repr(t.n).replace("inf", INFSTR))
-
-    def _List(self, t):
-        self.write("[")
-        interleave(lambda: self.write(", "), self.dispatch, t.elts)
-        self.write("]")
-
-    def _ListComp(self, t):
-        self.write("[")
-        self.dispatch(t.elt)
-        for gen in t.generators:
-            self.dispatch(gen)
-        self.write("]")
-
-    def _GeneratorExp(self, t):
-        self.write("(")
-        self.dispatch(t.elt)
-        for gen in t.generators:
-            self.dispatch(gen)
-        self.write(")")
-
-    def _SetComp(self, t):
-        self.write("{")
-        self.dispatch(t.elt)
-        for gen in t.generators:
-            self.dispatch(gen)
-        self.write("}")
-
-    def _DictComp(self, t):
-        self.write("{")
-        self.dispatch(t.key)
-        self.write(": ")
-        self.dispatch(t.value)
-        for gen in t.generators:
-            self.dispatch(gen)
-        self.write("}")
-
-    def _comprehension(self, t):
-        if hasattr(t, "is_async") and t.is_async:
-            self.write(" async for ")
-        else:
-            self.write(" for ")
-        self.dispatch(t.target)
-        self.write(" in ")
-        self.dispatch(t.iter)
-        for if_clause in t.ifs:
-            self.write(" if ")
-            self.dispatch(if_clause)
-
-    def _IfExp(self, t):
-        self.write("(")
-        self.dispatch(t.body)
-        self.write(" if ")
-        self.dispatch(t.test)
-        self.write(" else ")
-        self.dispatch(t.orelse)
-        self.write(")")
-
-    def _Set(self, t):
-        assert(t.elts) # should be at least one element
-        self.write("{")
-        interleave(lambda: self.write(", "), self.dispatch, t.elts)
-        self.write("}")
-
-    def _Dict(self, t):
-        self.write("{")
-        def write_key_value_pair(k, v):
-            self.dispatch(k)
-            self.write(": ")
-            self.dispatch(v)
-
-        def write_item(item):
-            k, v = item
-            if k is None:
-                # for dictionary unpacking operator in dicts {**{'y': 2}}
-                # see PEP 448 for details
-                self.write("**")
-                self.dispatch(v)
-            else:
-                write_key_value_pair(k, v)
-        interleave(lambda: self.write(", "), write_item, zip(t.keys, t.values))
-        self.write("}")
-
-    def _Tuple(self, t):
-        self.write("(")
-        if len(t.elts) == 1:
-            elt = t.elts[0]
-            self.dispatch(elt)
-            self.write(",")
-        else:
-            interleave(lambda: self.write(", "), self.dispatch, t.elts)
-        self.write(")")
-
-    unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}
-    def _UnaryOp(self, t):
-        self.write("(")
-        self.write(self.unop[t.op.__class__.__name__])
-        self.write(" ")
-        self.dispatch(t.operand)
-        self.write(")")
-
-    binop = { "Add":"+", "Sub":"-", "Mult":"*", "MatMult":"@", "Div":"/", "Mod":"%",
-                    "LShift":"<<", "RShift":">>", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
-                    "FloorDiv":"//", "Pow": "**"}
-    def _BinOp(self, t):
-        self.write("(")
-        self.dispatch(t.left)
-        self.write(" " + self.binop[t.op.__class__.__name__] + " ")
-        self.dispatch(t.right)
-        self.write(")")
-
-    cmpops = {"Eq":"==", "NotEq":"!=", "Lt":"<", "LtE":"<=", "Gt":">", "GtE":">=",
-                        "Is":"is", "IsNot":"is not", "In":"in", "NotIn":"not in"}
-    def _Compare(self, t):
-        self.write("(")
-        self.dispatch(t.left)
-        for o, e in zip(t.ops, t.comparators):
-            self.write(" " + self.cmpops[o.__class__.__name__] + " ")
-            self.dispatch(e)
-        self.write(")")
-
-    boolops = {ast.And: 'and', ast.Or: 'or'}
-    def _BoolOp(self, t):
-        self.write("(")
-        s = " %s " % self.boolops[t.op.__class__]
-        interleave(lambda: self.write(s), self.dispatch, t.values)
-        self.write(")")
-
-    def _Attribute(self,t):
-        self.dispatch(t.value)
-        # Special case: 3.__abs__() is a syntax error, so if t.value
-        # is an integer literal then we need to either parenthesize
-        # it or add an extra space to get 3 .__abs__().
-        if isinstance(t.value, ast.Num) and isinstance(t.value.n, int):
-            self.write(" ")
-        self.write(".")
-        self.write(t.attr)
-
-    def _Call(self, t):
-        self.dispatch(t.func)
-        self.write("(")
-        comma = False
-        for e in t.args:
-            if comma: self.write(", ")
-            else: comma = True
-            self.dispatch(e)
-        for e in t.keywords:
-            if comma: self.write(", ")
-            else: comma = True
-            self.dispatch(e)
-        self.write(")")
-
-    def _Subscript(self, t):
-        self.dispatch(t.value)
-        self.write("[")
-        self.dispatch(t.slice)
-        self.write("]")
-
-    def _Starred(self, t):
-        self.write("*")
-        self.dispatch(t.value)
-
-    # slice
-    def _Ellipsis(self, t):
-        self.write("...")
-
-    def _Index(self, t):
-        self.dispatch(t.value)
-
-    def _Slice(self, t):
-        if t.lower:
-            self.dispatch(t.lower)
-        self.write(":")
-        if t.upper:
-            self.dispatch(t.upper)
-        if t.step:
-            self.write(":")
-            self.dispatch(t.step)
-
-    def _ExtSlice(self, t):
-        interleave(lambda: self.write(', '), self.dispatch, t.dims)
-
-    # argument
-    def _arg(self, t):
-        self.write(t.arg)
-        if t.annotation:
-            self.write(": ")
-            self.dispatch(t.annotation)
-
-    # others
-    def _arguments(self, t):
-        first = True
-        # normal arguments
-        defaults = [None] * (len(t.args) - len(t.defaults)) + t.defaults
-        for a, d in zip(t.args, defaults):
-            if first:first = False
-            else: self.write(", ")
-            self.dispatch(a)
-            if d:
-                self.write("=")
-                self.dispatch(d)
-
-        # varargs, or bare '*' if no varargs but keyword-only arguments present
-        if t.vararg or t.kwonlyargs:
-            if first:first = False
-            else: self.write(", ")
-            self.write("*")
-            if t.vararg:
-                self.write(t.vararg.arg)
-                if t.vararg.annotation:
-                    self.write(": ")
-                    self.dispatch(t.vararg.annotation)
-
-        # keyword-only arguments
-        if t.kwonlyargs:
-            for a, d in zip(t.kwonlyargs, t.kw_defaults):
-                if first:first = False
-                else: self.write(", ")
-                self.dispatch(a),
-                if d:
-                    self.write("=")
-                    self.dispatch(d)
-
-        # kwargs
-        if t.kwarg:
-            if first:first = False
-            else: self.write(", ")
-            self.write("**"+t.kwarg.arg)
-            if t.kwarg.annotation:
-                self.write(": ")
-                self.dispatch(t.kwarg.annotation)
-
-    def _keyword(self, t):
-        if t.arg is None:
-            self.write("**")
-        else:
-            self.write(t.arg)
-            self.write("=")
-        self.dispatch(t.value)
-
-    def _Lambda(self, t):
-        self.write("(")
-        self.write("lambda ")
-        self.dispatch(t.args)
-        self.write(": ")
-        self.dispatch(t.body)
-        self.write(")")
-
-    def _alias(self, t):
-        self.write(t.name)
-        if t.asname:
-            self.write(" as "+t.asname)
-
-    def _withitem(self, t):
-        self.dispatch(t.context_expr)
-        if t.optional_vars:
-            self.write(" as ")
-            self.dispatch(t.optional_vars)
-
-def roundtrip(filename, outpath):
-    with open(filename, "rb") as pyfile:
-        encoding = tokenize.detect_encoding(pyfile.readline)[0]
-    with open(filename, "r", encoding=encoding) as pyfile:
-        source = pyfile.read()
-    tree = compile(source, filename, "exec", ast.PyCF_ONLY_AST)
-    with open(outpath, "w", encoding=encoding) as output:
-        Unparser(tree, output)
-
-def strip_comments_and_docstrings(path):
-    tmp = path + ".tmp"
-    if path.endswith(".py"):
-        roundtrip(path, tmp)
-    else:
-        shutil.copy(path, tmp)
-    return tmp

From 1acbb84444ba40ca106f6bf529a877f39d61ed8a Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 11:58:43 +0100
Subject: [PATCH 072/136] Shared/Java: Make the 'isNull' interface slightly
 prettier.

---
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll        | 7 ++++---
 shared/typeflow/codeql/typeflow/TypeFlow.qll              | 6 ++++++
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index afec2a22ae8..ac781e223f2 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -133,11 +133,12 @@ private module Input implements TypeFlowInput<J::Location> {
       not decl.hasImplicitInit() and
       not exists(decl.getInit())
     )
-    or
-    forex(TypeFlowNode mid | joinStep(mid, n) | Make<J::Location, Input>::isNull(mid)) and
+  }
+
+  predicate isExcludedFromNullAnalysis(TypeFlowNode n) {
     // Fields that are never assigned a non-null value are probably set by
     // reflection and are thus not always null.
-    not exists(n.asField())
+    exists(n.asField())
   }
 
   predicate exactTypeBase(TypeFlowNode n, RefType t) {
diff --git a/shared/typeflow/codeql/typeflow/TypeFlow.qll b/shared/typeflow/codeql/typeflow/TypeFlow.qll
index d2862b77637..7518805ac56 100644
--- a/shared/typeflow/codeql/typeflow/TypeFlow.qll
+++ b/shared/typeflow/codeql/typeflow/TypeFlow.qll
@@ -42,6 +42,12 @@ signature module TypeFlowInput<LocationSig Location> {
   /** Holds if `n` represents a `null` value. */
   predicate isNullValue(TypeFlowNode n);
 
+  /**
+   * Holds if `n` should be excluded from the set of null values even if
+   * the null analysis determines that `n` is always null.
+   */
+  default predicate isExcludedFromNullAnalysis(TypeFlowNode n) { none() }
+
   /** A type. */
   class Type {
     /** Gets a textual representation of this type. */
diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index d640c4b67e1..c06b372afba 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -10,6 +10,9 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     isNullValue(n)
     or
     exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
+    or
+    forex(TypeFlowNode mid | I::joinStep(mid, n) | isNull(mid)) and
+    not isExcludedFromNullAnalysis(n)
   }
 
   /**

From 3f63d3a8650192f7ba64f42e82f3447a0155ff08 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 12:49:40 +0100
Subject: [PATCH 073/136] Update
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll

Co-authored-by: Anders Schack-Mulligen <aschackmull@users.noreply.github.com>
---
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index ac781e223f2..4096b83e5f1 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -157,7 +157,7 @@ private module Input implements TypeFlowInput<J::Location> {
    */
   pragma[nomagic]
   private predicate upcastCand(TypeFlowNode n, RefType t1, RefType t1e, RefType t2, RefType t2e) {
-    exists(TypeFlowNode next | step(n, next) or Make<J::Location, Input>::joinStep(n, next) |
+    exists(TypeFlowNode next | step(n, next) or joinStep(n, next) |
       n.getType() = t1 and
       next.getType() = t2 and
       t1.getErasure() = t1e and

From 26cf8df8d6b473c72d758a3c61ae382c615fe0fc Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 12:50:26 +0100
Subject: [PATCH 074/136] Update
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll

Co-authored-by: Anders Schack-Mulligen <aschackmull@users.noreply.github.com>
---
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index 4096b83e5f1..5463faa4c87 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -23,7 +23,7 @@ private module Input implements TypeFlowInput<J::Location> {
 
   /** Gets `t` if it is a `RefType` or the boxed type if `t` is a primitive type. */
   private RefType boxIfNeeded(J::Type t) {
-    t.(J::PrimitiveType).getBoxedType() = result or
+    t.(PrimitiveType).getBoxedType() = result or
     result = t
   }
 

From 1775bdee5f20f8c957addfad3d31025ac774546c Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 12:52:04 +0100
Subject: [PATCH 075/136] Java: Remove redundant qualifiers.

---
 java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index 5463faa4c87..9dfe44ad5b5 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -14,7 +14,7 @@ private import semmle.code.java.dataflow.internal.BaseSSA
 private import semmle.code.java.controlflow.Guards
 private import codeql.typeflow.TypeFlow
 
-private module Input implements TypeFlowInput<J::Location> {
+private module Input implements TypeFlowInput<Location> {
   private newtype TTypeFlowNode =
     TField(Field f) { not f.getType() instanceof PrimitiveType } or
     TSsa(BaseSsaVariable ssa) { not ssa.getSourceVariable().getType() instanceof PrimitiveType } or
@@ -61,7 +61,7 @@ private module Input implements TypeFlowInput<J::Location> {
     }
   }
 
-  class Type = J::RefType;
+  class Type = RefType;
 
   /**
    * Holds if `arg` is an argument for the parameter `p` in a private callable.
@@ -142,7 +142,7 @@ private module Input implements TypeFlowInput<J::Location> {
   }
 
   predicate exactTypeBase(TypeFlowNode n, RefType t) {
-    exists(J::ClassInstanceExpr e |
+    exists(ClassInstanceExpr e |
       n.asExpr() = e and
       e.getType() = t and
       not e instanceof FunctionalExpr and
@@ -349,7 +349,7 @@ private module Input implements TypeFlowInput<J::Location> {
 
 cached
 private module TypeFlowBounds {
-  private module TypeFlow = Make<J::Location, Input>;
+  private module TypeFlow = Make<Location, Input>;
 
   /**
    * Holds if the runtime type of `f` is bounded by `t` and if this bound is

From 3f6967829e3b152acc5cae6ac33f32e78b874dbf Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 12:53:23 +0100
Subject: [PATCH 076/136] Update
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll

Co-authored-by: Anders Schack-Mulligen <aschackmull@users.noreply.github.com>
---
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index c06b372afba..9f043f9f7b3 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -19,7 +19,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
    * functionally determined by `n2`, and `n1` might take a non-null value.
    */
-  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { I::joinStep(n1, n2) and not isNull(n1) }
+  private predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { I::joinStep(n1, n2) and not isNull(n1) }
 
   private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep(n1, n2) or step(n1, n2) }
 

From a2c29fe094190664f6899468c16d846a300d9654 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 12:57:11 +0100
Subject: [PATCH 077/136] Shared: nomagicify 'getASourceSupertype'.

---
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index 9f043f9f7b3..3871d9c4159 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -19,7 +19,9 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
    * functionally determined by `n2`, and `n1` might take a non-null value.
    */
-  private predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { I::joinStep(n1, n2) and not isNull(n1) }
+  private predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
+    I::joinStep(n1, n2) and not isNull(n1)
+  }
 
   private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep(n1, n2) or step(n1, n2) }
 
@@ -184,6 +186,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
   /**
    * Gets the source declaration of a direct supertype of this type, excluding itself.
    */
+  pragma[nomagic]
   private Type getASourceSupertype(Type t) {
     result = getSourceDeclaration(t.getASupertype()) and
     result != t

From 96e205a4a6688648fb2858feae1fe5beb5878141 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 12:59:07 +0100
Subject: [PATCH 078/136] Docs: Mark Swift 5.10 as supported.

---
 docs/codeql/reusables/supported-versions-compilers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 15e1cfa6444..42b2b4f7b69 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -24,7 +24,7 @@
    JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [8]_"
    Python [9]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12",Not applicable,``.py``
    Ruby [10]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
-   Swift [11]_,"Swift 5.4-5.9.1","Swift compiler","``.swift``"
+   Swift [11]_,"Swift 5.4-5.10","Swift compiler","``.swift``"
    TypeScript [12]_,"2.6-5.4",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
 
 .. container:: footnote-group

From bffa262a2c0251e5553cf3d87e0dfcf19c0bdad6 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 13:04:26 +0100
Subject: [PATCH 079/136] Shared: Make 'getAStrictAncestor' private.

---
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index 3871d9c4159..47fe522dba9 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -255,7 +255,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    * This does not include itself, unless this type is part of a cycle
    * in the type hierarchy.
    */
-  Type getAStrictAncestor(Type sub) { result = getAnAncestor(sub.getASupertype()) }
+  private Type getAStrictAncestor(Type sub) { result = getAnAncestor(sub.getASupertype()) }
 
   /**
    * Holds if we have a bound for `n` that is better than `t`.

From 9deeb67af4f41a0d74e748f34602644f2d4e4229 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 13:10:08 +0100
Subject: [PATCH 080/136] Update
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll

Co-authored-by: Anders Schack-Mulligen <aschackmull@users.noreply.github.com>
---
 shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index 47fe522dba9..c53d6b714f5 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -301,6 +301,11 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     not irrelevantBound(n, t)
   }
 
+    /**
+   * Holds if the runtime type of `n` is bounded by `t` and if this bound is
+   * likely to be better than the static type of `n`. The flag `exact` indicates
+   * whether `t` is an exact bound or merely an upper bound.
+   */
   predicate bestTypeFlow(TypeFlowNode n, Type t, boolean exact) {
     exactType(n, t) and exact = true
     or

From bae633ad24ae9527d14136e75cd816f7cc9589e7 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 13:18:32 +0100
Subject: [PATCH 081/136] Shared: Make 'erasedHaveIntersection' more identical
 to the Java version.

---
 .../codeql/typeflow/internal/TypeFlowImpl.qll  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index c53d6b714f5..f0e299f25b4 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -301,7 +301,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     not irrelevantBound(n, t)
   }
 
-    /**
+  /**
    * Holds if the runtime type of `n` is bounded by `t` and if this bound is
    * likely to be better than the static type of `n`. The flag `exact` indicates
    * whether `t` is an exact bound or merely an upper bound.
@@ -389,14 +389,24 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     )
   }
 
+  /** Holds if this type is the same as its source declaration. */
+  private predicate isSourceDeclaration(Type t) { getSourceDeclaration(t) = t }
+
+  final private class FinalType = Type;
+
+  /** A type that is the same as its source declaration. */
+  private class SrcType extends FinalType {
+    SrcType() { isSourceDeclaration(this) }
+  }
+
   /**
    * Holds if there is a common (reflexive, transitive) subtype of the erased
    * types `t1` and `t2`.
    */
+  pragma[nomagic]
   private predicate erasedHaveIntersection(Type t1, Type t2) {
-    exists(Type commonSub | commonSub = getSourceDeclaration(commonSub) |
-      getASourceSupertype*(commonSub) = t1 and
-      getASourceSupertype*(commonSub) = t2
+    exists(SrcType commonSub |
+      getASourceSupertype*(commonSub) = t1 and getASourceSupertype*(commonSub) = t2
     ) and
     t1 = getErasure(_) and
     t2 = getErasure(_)

From 27688bf1544157373d39b78bdad28d0e69607817 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 13:25:29 +0100
Subject: [PATCH 082/136] Shared: Rename 'joinStep' to 'joinStepNotNull' to
 prevent name clashes. Rename 'sccJoinStep' to 'sccJoinStepNotNull' to match
 the new name.

---
 .../codeql/typeflow/internal/TypeFlowImpl.qll | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
index f0e299f25b4..ac7de53f85a 100644
--- a/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
+++ b/shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll
@@ -11,7 +11,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     or
     exists(TypeFlowNode mid | isNull(mid) and step(mid, n))
     or
-    forex(TypeFlowNode mid | I::joinStep(mid, n) | isNull(mid)) and
+    forex(TypeFlowNode mid | joinStep(mid, n) | isNull(mid)) and
     not isExcludedFromNullAnalysis(n)
   }
 
@@ -19,11 +19,13 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    * Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
    * functionally determined by `n2`, and `n1` might take a non-null value.
    */
-  private predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
-    I::joinStep(n1, n2) and not isNull(n1)
+  private predicate joinStepNotNull(TypeFlowNode n1, TypeFlowNode n2) {
+    joinStep(n1, n2) and not isNull(n1)
   }
 
-  private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep(n1, n2) or step(n1, n2) }
+  private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) {
+    joinStepNotNull(n1, n2) or step(n1, n2)
+  }
 
   private predicate sccEdge(TypeFlowNode n1, TypeFlowNode n2) {
     anyStep(n1, n2) and anyStep+(n2, n1)
@@ -36,9 +38,9 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
   /** Holds if `n` is part of an SCC of size 2 or more represented by `scc`. */
   private predicate sccRepr(TypeFlowNode n, TypeFlowScc scc) { scc = Scc::getEquivalenceClass(n) }
 
-  private predicate sccJoinStep(TypeFlowNode n, TypeFlowScc scc) {
+  private predicate sccJoinStepNotNull(TypeFlowNode n, TypeFlowScc scc) {
     exists(TypeFlowNode mid |
-      joinStep(n, mid) and
+      joinStepNotNull(n, mid) and
       sccRepr(mid, scc) and
       not sccRepr(n, scc)
     )
@@ -141,13 +143,13 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
   private module JoinStep implements Edge {
     class Node = TypeFlowNode;
 
-    predicate edge = joinStep/2;
+    predicate edge = joinStepNotNull/2;
   }
 
   private module SccJoinStep implements Edge {
     class Node = TypeFlowScc;
 
-    predicate edge = sccJoinStep/2;
+    predicate edge = sccJoinStepNotNull/2;
   }
 
   private module RankedJoinStep = RankEdge<JoinStep>;
@@ -172,13 +174,13 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     exists(TypeFlowNode mid | exactType(mid, t) and step(mid, n))
     or
     // The following is an optimized version of
-    // `forex(TypeFlowNode mid | joinStep(mid, n) | exactType(mid, t))`
+    // `forex(TypeFlowNode mid | joinStepNotNull(mid, n) | exactType(mid, t))`
     ForAll<TypeFlowNode, RankedJoinStep, ExactTypePropagation>::flowJoin(n, t)
     or
     exists(TypeFlowScc scc |
       sccRepr(n, scc) and
       // Optimized version of
-      // `forex(TypeFlowNode mid | sccJoinStep(mid, scc) | exactType(mid, t))`
+      // `forex(TypeFlowNode mid | sccJoinStepNotNull(mid, scc) | exactType(mid, t))`
       ForAll<TypeFlowScc, RankedSccJoinStep, ExactTypePropagation>::flowJoin(scc, t)
     )
   }
@@ -327,7 +329,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
    */
   private predicate unionTypeFlowBaseCand(TypeFlowNode n, Type t, boolean exact) {
     exists(TypeFlowNode next |
-      joinStep(n, next) and
+      joinStepNotNull(n, next) and
       bestTypeFlowOrTypeFlowBase(n, t, exact) and
       not bestTypeFlowOrTypeFlowBase(next, t, exact) and
       not exactType(next, _)
@@ -354,7 +356,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
     not exactType(n, _) and
     (
       // Optimized version of
-      // `forex(TypeFlowNode mid | joinStep(mid, n) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
+      // `forex(TypeFlowNode mid | joinStepNotNull(mid, n) | unionTypeFlowBaseCand(mid, _, _) or hasUnionTypeFlow(mid))`
       ForAll<TypeFlowNode, RankedJoinStep, HasUnionTypePropagation>::flowJoin(n, _)
       or
       exists(TypeFlowScc scc |

From cd84fa4beeb8503d54ded224e0983b09acd93bf4 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Fri, 5 Apr 2024 15:01:26 +0200
Subject: [PATCH 083/136] JS: Make getInstance() propagate to subclasses

---
 .../ql/lib/semmle/javascript/ApiGraphs.qll    | 20 +++++++++++++++++++
 .../frameworks/data/test.expected             |  4 ++++
 .../library-tests/frameworks/data/test.js     | 14 +++++++++++++
 .../library-tests/frameworks/data/test.ql     |  1 +
 4 files changed, 39 insertions(+)

diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 0bd79dd2029..0345df3f00e 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -891,6 +891,17 @@ module API {
       (propDesc = Promises::errorProp() or propDesc = "")
     }
 
+    pragma[nomagic]
+    private DataFlow::ClassNode getALocalSubclass(DataFlow::SourceNode node) {
+      result.getASuperClassNode().getALocalSource() = node
+    }
+
+    bindingset[node]
+    pragma[inline_late]
+    private DataFlow::ClassNode getALocalSubclassFwd(DataFlow::SourceNode node) {
+      result = getALocalSubclass(node)
+    }
+
     /**
      * Holds if `ref` is a use of a node that should have an incoming edge from `base` labeled
      * `lbl` in the API graph.
@@ -927,6 +938,15 @@ module API {
           or
           lbl = Label::forwardingFunction() and
           DataFlow::functionForwardingStep(pred.getALocalUse(), ref)
+          or
+          exists(DataFlow::ClassNode cls |
+            lbl = Label::instance() and
+            cls = getALocalSubclassFwd(pred).getADirectSubClass*()
+          |
+            ref = cls.getAReceiverNode()
+            or
+            ref = cls.getAClassReference().getAnInstantiation()
+          )
         )
         or
         exists(DataFlow::Node def, DataFlow::FunctionNode fn |
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.expected b/javascript/ql/test/library-tests/frameworks/data/test.expected
index 28d7229789d..843b1f32d5b 100644
--- a/javascript/ql/test/library-tests/frameworks/data/test.expected
+++ b/javascript/ql/test/library-tests/frameworks/data/test.expected
@@ -74,6 +74,10 @@ taintFlow
 | test.js:249:28:249:35 | source() | test.js:249:28:249:35 | source() |
 | test.js:252:15:252:22 | source() | test.js:252:15:252:22 | source() |
 | test.js:254:32:254:39 | source() | test.js:254:32:254:39 | source() |
+| test.js:262:10:262:31 | this.ba ... ource() | test.js:262:10:262:31 | this.ba ... ource() |
+| test.js:265:6:265:39 | new MyS ... ource() | test.js:265:6:265:39 | new MyS ... ource() |
+| test.js:269:10:269:31 | this.ba ... ource() | test.js:269:10:269:31 | this.ba ... ource() |
+| test.js:272:6:272:40 | new MyS ... ource() | test.js:272:6:272:40 | new MyS ... ource() |
 isSink
 | test.js:54:18:54:25 | source() | test-sink |
 | test.js:55:22:55:29 | source() | test-sink |
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.js b/javascript/ql/test/library-tests/frameworks/data/test.js
index ac702b82a8c..bbcb10418a1 100644
--- a/javascript/ql/test/library-tests/frameworks/data/test.js
+++ b/javascript/ql/test/library-tests/frameworks/data/test.js
@@ -256,3 +256,17 @@ function fuzzy() {
   fuzzyCall(source()); // OK - does not come from 'testlib'
   require('blah').fuzzyCall(source()); // OK - does not come from 'testlib'
 }
+
+class MySubclass extends testlib.BaseClass {
+  foo() {
+    sink(this.baseclassSource()); // NOT OK
+  }
+}
+sink(new MySubclass().baseclassSource()); // NOT OK
+
+class MySubclass2 extends MySubclass {
+  foo2() {
+    sink(this.baseclassSource()); // NOT OK
+  }
+}
+sink(new MySubclass2().baseclassSource()); // NOT OK
diff --git a/javascript/ql/test/library-tests/frameworks/data/test.ql b/javascript/ql/test/library-tests/frameworks/data/test.ql
index 039a0aa3920..6af176f4bf3 100644
--- a/javascript/ql/test/library-tests/frameworks/data/test.ql
+++ b/javascript/ql/test/library-tests/frameworks/data/test.ql
@@ -80,6 +80,7 @@ class Sources extends ModelInput::SourceModelCsv {
         "testlib;Member[ParamDecoratorSource].DecoratedParameter;test-source",
         "testlib;Member[MethodDecorator].DecoratedMember.Parameter[0];test-source",
         "testlib;Member[MethodDecoratorWithArgs].ReturnValue.DecoratedMember.Parameter[0];test-source",
+        "testlib;Member[BaseClass].Instance.Member[baseclassSource].ReturnValue;test-source",
       ]
   }
 }

From d114d09d736ee0f2efca5a0ba6d70fa519c85ff2 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 14:52:19 +0100
Subject: [PATCH 084/136] Docs: Remove Swift version in footnote.

---
 docs/codeql/reusables/supported-versions-compilers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 42b2b4f7b69..9d5c19679b7 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -39,5 +39,5 @@
     .. [8] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
     .. [9] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.
     .. [10] Requires glibc 2.17.
-    .. [11] Swift support is currently in beta. Support for the analysis of Swift 5.4-5.8.1 requires macOS or Linux.
+    .. [11] Swift support is currently in beta. Support for the analysis of Swift requires macOS or Linux.
     .. [12] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default.

From 777755a241e78a1d3c44e3b1a523f31810737033 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 19:02:23 +0100
Subject: [PATCH 085/136] C++: Add alias models for 'fopen'.

---
 cpp/ql/lib/semmle/code/cpp/models/Models.qll  |  1 +
 .../code/cpp/models/implementations/Fopen.qll | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll

diff --git a/cpp/ql/lib/semmle/code/cpp/models/Models.qll b/cpp/ql/lib/semmle/code/cpp/models/Models.qll
index 32377dbd71f..7794424b3f6 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/Models.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/Models.qll
@@ -41,3 +41,4 @@ private import implementations.SqLite3
 private import implementations.PostgreSql
 private import implementations.System
 private import implementations.StructuredExceptionHandling
+private import implementations.Fopen
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
new file mode 100644
index 00000000000..52f56add609
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
@@ -0,0 +1,51 @@
+/**
+ * Provides implementation classes modeling `fopen` and various similar
+ * functions. See `semmle.code.cpp.models.Models` for usage information.
+ */
+
+import semmle.code.cpp.Function
+import semmle.code.cpp.models.interfaces.Alias
+import semmle.code.cpp.models.interfaces.SideEffect
+
+/** The function `fopen` and friends. */
+private class Fopen extends Function, AliasFunction, SideEffectFunction {
+  Fopen() {
+    this.hasGlobalOrStdName(["fopen", "fopen_s", "freopen"])
+    or
+    this.hasGlobalName(["_open", "_wfopen", "_fsopen", "_wfsopen", "_wopen"])
+  }
+
+  override predicate hasOnlySpecificWriteSideEffects() { any() }
+
+  override predicate hasOnlySpecificReadSideEffects() { any() }
+
+  override predicate parameterEscapesOnlyViaReturn(int i) { none() }
+
+  override predicate parameterNeverEscapes(int index) {
+    // None of the parameters escape
+    this.getParameter(index).getUnspecifiedType() instanceof PointerType
+  }
+
+  override predicate hasSpecificReadSideEffect(ParameterIndex i, boolean buffer) {
+    (
+      this.hasGlobalOrStdName(["fopen", "fopen_s"])
+      or
+      this.hasGlobalName(["_wfopen", "_fsopen", "_wfsopen"])
+    ) and
+    i = [0, 1] and
+    buffer = true
+    or
+    this.hasGlobalOrStdName("freopen") and
+    (
+      i = [0, 1] and
+      buffer = true
+      or
+      i = 2 and
+      buffer = false
+    )
+    or
+    this.hasGlobalName(["_open", "_wopen"]) and
+    i = 0 and
+    buffer = true
+  }
+}

From 557555eb7177766d99f15914f51bc0c5c94879f1 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 5 Apr 2024 19:03:03 +0100
Subject: [PATCH 086/136] C++: Make Code Scanning happy.

---
 cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
index 52f56add609..6bc700becf1 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Fopen.qll
@@ -3,7 +3,6 @@
  * functions. See `semmle.code.cpp.models.Models` for usage information.
  */
 
-import semmle.code.cpp.Function
 import semmle.code.cpp.models.interfaces.Alias
 import semmle.code.cpp.models.interfaces.SideEffect
 

From 795b767b6effffbc32ec07f9024638780bbb3ad4 Mon Sep 17 00:00:00 2001
From: erik-krogh <erik-krogh@github.com>
Date: Thu, 4 Apr 2024 22:48:12 +0200
Subject: [PATCH 087/136] add link to the source variable in the alert-message
 for java/implicit-cast-in-compound-assignment

---
 java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql    | 9 +++++----
 .../CWE-190/semmle/tests/InformationLoss.expected        | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql
index d2ff4c24060..4d770b462b8 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
@@ -27,10 +27,11 @@ class DangerousAssignOpExpr extends AssignOp {
 
 predicate problematicCasting(Type t, Expr e) { e.getType().(NumType).widerThan(t) }
 
-from DangerousAssignOpExpr a, Expr e
+from DangerousAssignOpExpr a, Expr e, Variable v
 where
   e = a.getSource() and
-  problematicCasting(a.getDest().getType(), e)
+  problematicCasting(a.getDest().getType(), e) and
+  v = a.getDest().(VarAccess).getVariable()
 select a,
-  "Implicit cast of source type " + e.getType().getName() + " to narrower destination type " +
-    a.getDest().getType().getName() + "."
+  "Implicit cast of source $@ to narrower destination type " + a.getDest().getType().getName() + ".",
+  v, "type " + e.getType().getName()
diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
index 1c4ed46e136..03f39286a19 100644
--- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
+++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
@@ -1,2 +1,2 @@
-| Test.java:68:5:68:25 | ...+=... | Implicit cast of source type long to narrower destination type int. |
-| Test.java:87:4:87:9 | ...+=... | Implicit cast of source type long to narrower destination type int. |
+| Test.java:68:5:68:25 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:64:4:64:13 | int i | type long |
+| Test.java:87:4:87:9 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:81:4:81:13 | int i | type long |

From 8b220cc1b39775c75c2edaef0f2cbacbdc720ff6 Mon Sep 17 00:00:00 2001
From: erik-krogh <erik-krogh@github.com>
Date: Fri, 5 Apr 2024 09:21:18 +0200
Subject: [PATCH 088/136] also get the variable for array accesses

---
 java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql  |  8 +++++++-
 .../CWE-190/semmle/tests/InformationLoss.expected      |  1 +
 .../security/CWE-190/semmle/tests/Test.java            | 10 ++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql
index 4d770b462b8..8a491c33cc3 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
@@ -27,11 +27,17 @@ class DangerousAssignOpExpr extends AssignOp {
 
 predicate problematicCasting(Type t, Expr e) { e.getType().(NumType).widerThan(t) }
 
+Variable getVariable(DangerousAssignOpExpr a) {
+  result = a.getDest().(VarAccess).getVariable()
+  or
+  result = a.getDest().(ArrayAccess).getArray().(VarAccess).getVariable()
+}
+
 from DangerousAssignOpExpr a, Expr e, Variable v
 where
   e = a.getSource() and
   problematicCasting(a.getDest().getType(), e) and
-  v = a.getDest().(VarAccess).getVariable()
+  v = getVariable(a)
 select a,
   "Implicit cast of source $@ to narrower destination type " + a.getDest().getType().getName() + ".",
   v, "type " + e.getType().getName()
diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
index 03f39286a19..91bac65629a 100644
--- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
+++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
@@ -1,2 +1,3 @@
 | Test.java:68:5:68:25 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:64:4:64:13 | int i | type long |
 | Test.java:87:4:87:9 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:81:4:81:13 | int i | type long |
+| Test.java:289:5:289:30 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:285:4:285:27 | int[] arr | type long |
diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java b/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java
index 2935368dccb..6dcfeefd2d1 100644
--- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java
+++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java
@@ -279,6 +279,16 @@ class Test {
 			// subsequently cast to narrower type int
 			int widenedThenNarrowed = (int) (data2 + 10L);
 		}
+
+    // InformationLoss
+		{
+			int[] arr = new int[10];
+			while (arr[2] < 1000000) {
+				// BAD: getLargeNumber is implicitly narrowed to an integer
+				// which will result in overflows if it is large
+				arr[2] += getLargeNumber();
+			}
+		}
 	}
 
 	public static long getLargeNumber() {

From ca4f667053399a04eef7f7992ebdb616eda6cf57 Mon Sep 17 00:00:00 2001
From: erik-krogh <erik-krogh@github.com>
Date: Fri, 5 Apr 2024 16:18:20 +0200
Subject: [PATCH 089/136] add fallback if I can't easily determine the variable

---
 .../Likely Bugs/Arithmetic/InformationLoss.ql | 20 ++++++++++++-------
 .../semmle/tests/InformationLoss.expected     |  7 ++++---
 .../security/CWE-190/semmle/tests/Test.java   |  7 +++++++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql
index 8a491c33cc3..71699fd3a5a 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
@@ -27,17 +27,23 @@ class DangerousAssignOpExpr extends AssignOp {
 
 predicate problematicCasting(Type t, Expr e) { e.getType().(NumType).widerThan(t) }
 
-Variable getVariable(DangerousAssignOpExpr a) {
-  result = a.getDest().(VarAccess).getVariable()
+Variable getVariable(Expr dest) {
+  result = dest.(VarAccess).getVariable()
   or
-  result = a.getDest().(ArrayAccess).getArray().(VarAccess).getVariable()
+  result = dest.(ArrayAccess).getArray().(VarAccess).getVariable()
 }
 
-from DangerousAssignOpExpr a, Expr e, Variable v
+from DangerousAssignOpExpr a, Expr e, Top v
 where
   e = a.getSource() and
   problematicCasting(a.getDest().getType(), e) and
-  v = getVariable(a)
+  (
+    v = getVariable(a.getDest())
+    or
+    // fallback, in case we can't easily determine the variable
+    not exists(getVariable(a.getDest())) and
+    v = a.getDest()
+  )
 select a,
-  "Implicit cast of source $@ to narrower destination type " + a.getDest().getType().getName() + ".",
-  v, "type " + e.getType().getName()
+  "Implicit cast of $@ to narrower destination type " + a.getDest().getType().getName() + ".",
+  v, "source type " + e.getType().getName()
diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
index 91bac65629a..dbda11bff08 100644
--- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
+++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
@@ -1,3 +1,4 @@
-| Test.java:68:5:68:25 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:64:4:64:13 | int i | type long |
-| Test.java:87:4:87:9 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:81:4:81:13 | int i | type long |
-| Test.java:289:5:289:30 | ...+=... | Implicit cast of source $@ to narrower destination type int. | Test.java:285:4:285:27 | int[] arr | type long |
+| Test.java:68:5:68:25 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:64:4:64:13 | int i | source type long |
+| Test.java:87:4:87:9 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:81:4:81:13 | int i | source type long |
+| Test.java:289:5:289:30 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:285:4:285:27 | int[] arr | source type long |
+| Test.java:293:7:293:44 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:293:7:293:24 | ...[...] | source type long |
diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java b/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java
index 6dcfeefd2d1..f24d16a236c 100644
--- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java
+++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/Test.java
@@ -288,6 +288,9 @@ class Test {
 				// which will result in overflows if it is large
 				arr[2] += getLargeNumber();
 			}
+
+      // BAD.
+      getAnIntArray()[0] += getLargeNumber();
 		}
 	}
 
@@ -295,6 +298,10 @@ class Test {
 		return Long.MAX_VALUE / 2;
 	}
 
+  public static int[] getAnIntArray() {
+    return new int[10];
+  }
+
 	public static boolean properlyBounded(int i) {
 		return i < Integer.MAX_VALUE;
 	}

From 018b066b9550571d0e4ebdd6d936c6d2a1b4be73 Mon Sep 17 00:00:00 2001
From: erik-krogh <erik-krogh@github.com>
Date: Mon, 8 Apr 2024 07:15:33 +0200
Subject: [PATCH 090/136] autoformat

---
 java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql
index 71699fd3a5a..e8893f3bcc7 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
@@ -45,5 +45,5 @@ where
     v = a.getDest()
   )
 select a,
-  "Implicit cast of $@ to narrower destination type " + a.getDest().getType().getName() + ".",
-  v, "source type " + e.getType().getName()
+  "Implicit cast of $@ to narrower destination type " + a.getDest().getType().getName() + ".", v,
+  "source type " + e.getType().getName()

From d829dd435f349cb52d7bfc659b764d00f1b9d8d2 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Mon, 8 Apr 2024 10:00:06 +0200
Subject: [PATCH 091/136] JS: Update docs

---
 .../customizing-library-models-for-javascript.rst               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
index 5e3f5d9f74f..b062c66bcca 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
@@ -478,7 +478,7 @@ The following components are supported:
 - **Element** selects an element of an array, iterator, or set object.
 - **MapValue** selects a value of a map object.
 - **Awaited** selects the value of a promise.
-- **Instance** selects instances of a class.
+- **Instance** selects instances of a class, including instances of its subclasses.
 - **Fuzzy** selects all values that are derived from the current value through a combination of the other operations described in this list.
   For example, this can be used to find all values that appear to originate from a particular package. This can be useful for finding method calls
   from a known package, but where the receiver type is not known or is difficult to model.

From 6e931000c28317a65442f4e90e175829880e9843 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Mon, 8 Apr 2024 10:02:22 +0200
Subject: [PATCH 092/136] JS: Rewrite docs for API::Node#getInstance()

---
 .../ql/lib/semmle/javascript/ApiGraphs.qll    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 0345df3f00e..27c1632358e 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -241,15 +241,23 @@ module API {
     }
 
     /**
-     * Gets a node representing an instance of this API component, that is, an object whose
-     * constructor is the function represented by this node.
+     * Gets a node representing an instance of the class represented by this node.
+     * This includes instances of subclasses.
      *
-     * For example, if this node represents a use of some class `A`, then there might be a node
-     * representing instances of `A`, typically corresponding to expressions `new A()` at the
-     * source level.
+     * For example:
+     * ```js
+     * import { C } from "foo";
      *
-     * This predicate may have multiple results when there are multiple constructor calls invoking this API component.
-     * Consider using `getAnInstantiation()` if there is a need to distinguish between individual constructor calls.
+     * new C(); // API::moduleImport("foo").getMember("C").getInstance()
+     *
+     * class D extends C {
+     *   m() {
+     *     this; // API::moduleImport("foo").getMember("C").getInstance()
+     *  }
+     * }
+     *
+     * new D(); // API::moduleImport("foo").getMember("C").getInstance()
+     * ```
      */
     cached
     Node getInstance() {

From ad9838d0fe6868dd93b6f7bd8d70c0462d6506cb Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Mon, 8 Apr 2024 10:02:28 +0200
Subject: [PATCH 093/136] JS: Add change note

---
 .../ql/src/change-notes/2024-04-08-instance-to-subclasses.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 javascript/ql/src/change-notes/2024-04-08-instance-to-subclasses.md

diff --git a/javascript/ql/src/change-notes/2024-04-08-instance-to-subclasses.md b/javascript/ql/src/change-notes/2024-04-08-instance-to-subclasses.md
new file mode 100644
index 00000000000..cae4bea6ab3
--- /dev/null
+++ b/javascript/ql/src/change-notes/2024-04-08-instance-to-subclasses.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* `API::Node#getInstance()` now includes instances of subclasses, include transitive subclasses.
+  The same changes applies to uses of the `Instance` token in data extensions.

From 9aa85f2d132ce8f0f78e5744d6f5430d7e8d9b27 Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Thu, 4 Apr 2024 14:26:13 +0200
Subject: [PATCH 094/136] C#: Validate all nuget feeds to respond in reasonable
 time

---
 .../DependencyManager.Nuget.cs                | 191 +++++++++++++++---
 .../DependencyManager.cs                      |   9 +-
 .../DotNet.cs                                 |  17 +-
 .../EnvironmentVariableNames.cs               |  15 ++
 .../IDotNet.cs                                |   1 +
 .../Semmle.Extraction.Tests/Runtime.cs        |   2 +
 .../Semmle.Util/EnvironmentVariables.cs       |   7 +
 csharp/extractor/Semmle.Util/FileUtils.cs     |   5 +-
 8 files changed, 208 insertions(+), 39 deletions(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
index 8e0be8ab141..cdf4f5dcf4a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -2,7 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Semmle.Util;
 
@@ -14,6 +16,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         {
             try
             {
+                var checkNugetFeedResponsiveness = EnvironmentVariables.GetBoolean(EnvironmentVariableNames.CheckNugetFeedResponsiveness);
+                if (checkNugetFeedResponsiveness && !CheckFeeds(allNonBinaryFiles))
+                {
+                    DownloadMissingPackages(allNonBinaryFiles, dllPaths, withNugetConfig: false);
+                    return;
+                }
+
                 using (var nuget = new NugetPackages(sourceDir.FullName, legacyPackageDirectory, logger))
                 {
                     var count = nuget.InstallPackages();
@@ -139,7 +148,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
         }
 
-        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<string> dllPaths)
+        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<string> dllPaths, bool withNugetConfig = true)
         {
             var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
@@ -172,30 +181,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
 
             logger.LogInfo($"Found {notYetDownloadedPackages.Count} packages that are not yet restored");
-
-            var nugetConfigs = allFiles.SelectFileNamesByName("nuget.config").ToArray();
-            string? nugetConfig = null;
-            if (nugetConfigs.Length > 1)
-            {
-                logger.LogInfo($"Found multiple nuget.config files: {string.Join(", ", nugetConfigs)}.");
-                nugetConfig = allFiles
-                    .SelectRootFiles(sourceDir)
-                    .SelectFileNamesByName("nuget.config")
-                    .FirstOrDefault();
-                if (nugetConfig == null)
-                {
-                    logger.LogInfo("Could not find a top-level nuget.config file.");
-                }
-            }
-            else
-            {
-                nugetConfig = nugetConfigs.FirstOrDefault();
-            }
-
-            if (nugetConfig != null)
-            {
-                logger.LogInfo($"Using nuget.config file {nugetConfig}.");
-            }
+            var nugetConfig = withNugetConfig
+                ? GetNugetConfig(allFiles)
+                : null;
 
             CompilationInfos.Add(("Fallback nuget restore", notYetDownloadedPackages.Count.ToString()));
 
@@ -221,6 +209,37 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             dllPaths.Add(missingPackageDirectory.DirInfo.FullName);
         }
 
+        private string[] GetAllNugetConfigs(List<FileInfo> allFiles) => allFiles.SelectFileNamesByName("nuget.config").ToArray();
+
+        private string? GetNugetConfig(List<FileInfo> allFiles)
+        {
+            var nugetConfigs = GetAllNugetConfigs(allFiles);
+            string? nugetConfig;
+            if (nugetConfigs.Length > 1)
+            {
+                logger.LogInfo($"Found multiple nuget.config files: {string.Join(", ", nugetConfigs)}.");
+                nugetConfig = allFiles
+                    .SelectRootFiles(sourceDir)
+                    .SelectFileNamesByName("nuget.config")
+                    .FirstOrDefault();
+                if (nugetConfig == null)
+                {
+                    logger.LogInfo("Could not find a top-level nuget.config file.");
+                }
+            }
+            else
+            {
+                nugetConfig = nugetConfigs.FirstOrDefault();
+            }
+
+            if (nugetConfig != null)
+            {
+                logger.LogInfo($"Using nuget.config file {nugetConfig}.");
+            }
+
+            return nugetConfig;
+        }
+
         private void LogAllUnusedPackages(DependencyContainer dependencies)
         {
             var allPackageDirectories = GetAllPackageDirectories();
@@ -279,9 +298,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .Select(d => Path.GetFileName(d).ToLowerInvariant());
         }
 
-        [GeneratedRegex(@"<TargetFramework>.*</TargetFramework>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
-        private static partial Regex TargetFramework();
-
         private bool TryRestorePackageManually(string package, string? nugetConfig, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj)
         {
             logger.LogInfo($"Restoring package {package}...");
@@ -358,7 +374,126 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
+        private static async Task ExecuteGetRequest(string address, HttpClient httpClient, CancellationToken cancellationToken)
+        {
+            using var stream = await httpClient.GetStreamAsync(address, cancellationToken);
+            var buffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = stream.Read(buffer, 0, buffer.Length)) > 0)
+            {
+                // do nothing
+            }
+        }
+
+        private bool IsFeedReachable(string feed)
+        {
+            using HttpClient client = new();
+            var timeoutSeconds = 1;
+            var tryCount = 4;
+
+            for (var i = 0; i < tryCount; i++)
+            {
+                using var cts = new CancellationTokenSource();
+                cts.CancelAfter(timeoutSeconds * 1000);
+                try
+                {
+                    ExecuteGetRequest(feed, client, cts.Token).GetAwaiter().GetResult();
+                    return true;
+                }
+                catch (Exception exc)
+                {
+                    if (exc is TaskCanceledException tce &&
+                        tce.CancellationToken == cts.Token &&
+                        cts.Token.IsCancellationRequested)
+                    {
+                        logger.LogWarning($"Didn't receive answer from Nuget feed '{feed}' in {timeoutSeconds} seconds.");
+                        timeoutSeconds *= 2;
+                        continue;
+                    }
+
+                    // We're only interested in timeouts.
+                    logger.LogWarning($"Querying Nuget feed '{feed}' failed: {exc}");
+                    return true;
+                }
+            }
+
+            logger.LogError($"Didn't receive answer from Nuget feed '{feed}'. Tried it {tryCount} times.");
+            return false;
+        }
+
+        private bool CheckFeeds(List<FileInfo> allFiles)
+        {
+            logger.LogInfo("Checking Nuget feeds...");
+            var feeds = GetAllFeeds(allFiles);
+
+            var excludedFeeds = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ExcludedNugetFeedsFromResponsivenessCheck)
+                ?.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries)
+                .ToHashSet() ?? [];
+
+            if (excludedFeeds.Count > 0)
+            {
+                logger.LogInfo($"Excluded feeds from responsiveness check: {string.Join(", ", excludedFeeds)}");
+            }
+
+            var allFeedsReachable = feeds.All(feed => excludedFeeds.Contains(feed) || IsFeedReachable(feed));
+            if (!allFeedsReachable)
+            {
+                diagnosticsWriter.AddEntry(new DiagnosticMessage(
+                    Language.CSharp,
+                    "buildless/unreachable-feed",
+                    "Found unreachable Nuget feed in C# analysis with build-mode 'none'",
+                    visibility: new DiagnosticMessage.TspVisibility(statusPage: true, cliSummaryTable: true, telemetry: true),
+                    markdownMessage: "Found unreachable Nuget feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.",
+                    severity: DiagnosticMessage.TspSeverity.Warning
+                ));
+            }
+            CompilationInfos.Add(("All Nuget feeds reachable", allFeedsReachable ? "1" : "0"));
+            return allFeedsReachable;
+        }
+
+        private IEnumerable<string> GetFeeds(string nugetConfig)
+        {
+            logger.LogInfo($"Getting Nuget feeds from '{nugetConfig}'...");
+            var results = dotnet.GetNugetFeeds(nugetConfig);
+            var regex = EnabledNugetFeed();
+            foreach (var result in results)
+            {
+                var match = regex.Match(result);
+                if (!match.Success)
+                {
+                    logger.LogError($"Failed to parse feed from '{result}'");
+                    continue;
+                }
+
+                var url = match.Groups[1].Value;
+                if (!url.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase) &&
+                    !url.StartsWith("http://", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    logger.LogInfo($"Skipping feed '{url}' as it is not a valid URL.");
+                    continue;
+                }
+
+                yield return url;
+            }
+        }
+
+        private HashSet<string> GetAllFeeds(List<FileInfo> allFiles)
+        {
+            var nugetConfigs = GetAllNugetConfigs(allFiles);
+            var feeds = nugetConfigs
+                .SelectMany(nf => GetFeeds(nf))
+                .Where(str => !string.IsNullOrWhiteSpace(str))
+                .ToHashSet();
+            return feeds;
+        }
+
+        [GeneratedRegex(@"<TargetFramework>.*</TargetFramework>", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
+        private static partial Regex TargetFramework();
+
         [GeneratedRegex(@"^(.+)\.(\d+\.\d+\.\d+(-(.+))?)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
         private static partial Regex LegacyNugetPackage();
+
+        [GeneratedRegex(@"^E (.*)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
+        private static partial Regex EnabledNugetFeed();
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 04716a64db4..2fc77d004f2 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -20,6 +20,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     {
         private readonly AssemblyCache assemblyCache;
         private readonly ILogger logger;
+        private readonly IDiagnosticsWriter diagnosticsWriter;
 
         // Only used as a set, but ConcurrentDictionary is the only concurrent set in .NET.
         private readonly IDictionary<string, bool> usedReferences = new ConcurrentDictionary<string, bool>();
@@ -52,6 +53,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             var startTime = DateTime.Now;
 
             this.logger = logger;
+            this.diagnosticsWriter = new DiagnosticsStream(Path.Combine(
+                Environment.GetEnvironmentVariable(EnvironmentVariableNames.DiagnosticDir) ?? "",
+                $"dependency-manager-{DateTime.UtcNow:yyyyMMddHHmm}-{Environment.ProcessId}.jsonc"));
             this.sourceDir = new DirectoryInfo(srcDir);
 
             packageDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName, "packages"));
@@ -177,8 +181,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             var frameworkLocations = new HashSet<string>();
 
             var frameworkReferences = Environment.GetEnvironmentVariable(EnvironmentVariableNames.DotnetFrameworkReferences);
-            var frameworkReferencesUseSubfolders = Environment.GetEnvironmentVariable(EnvironmentVariableNames.DotnetFrameworkReferencesUseSubfolders);
-            _ = bool.TryParse(frameworkReferencesUseSubfolders, out var useSubfolders);
+            var useSubfolders = EnvironmentVariables.GetBoolean(EnvironmentVariableNames.DotnetFrameworkReferencesUseSubfolders);
             if (!string.IsNullOrWhiteSpace(frameworkReferences))
             {
                 RemoveFrameworkNugetPackages(dllPaths);
@@ -740,6 +743,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             {
                 Dispose(tempWorkingDirectory, "temporary working");
             }
+
+            diagnosticsWriter?.Dispose();
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
index b132d1884f9..c57958845f2 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -16,12 +16,14 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     public partial class DotNet : IDotNet
     {
         private readonly IDotNetCliInvoker dotnetCliInvoker;
+        private readonly ILogger logger;
         private readonly TemporaryDirectory? tempWorkingDirectory;
 
         private DotNet(IDotNetCliInvoker dotnetCliInvoker, ILogger logger, TemporaryDirectory? tempWorkingDirectory = null)
         {
             this.tempWorkingDirectory = tempWorkingDirectory;
             this.dotnetCliInvoker = dotnetCliInvoker;
+            this.logger = logger;
             Info();
         }
 
@@ -89,17 +91,18 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return dotnetCliInvoker.RunCommand(args);
         }
 
-        public IList<string> GetListedRuntimes() => GetListed("--list-runtimes");
+        public IList<string> GetListedRuntimes() => GetResultList("--list-runtimes");
 
-        public IList<string> GetListedSdks() => GetListed("--list-sdks");
+        public IList<string> GetListedSdks() => GetResultList("--list-sdks");
 
-        private IList<string> GetListed(string args)
+        private IList<string> GetResultList(string args)
         {
-            if (dotnetCliInvoker.RunCommand(args, out var artifacts))
+            if (dotnetCliInvoker.RunCommand(args, out var results))
             {
-                return artifacts;
+                return results;
             }
-            return new List<string>();
+            logger.LogWarning($"Running 'dotnet {args}' failed.");
+            return [];
         }
 
         public bool Exec(string execArgs)
@@ -108,6 +111,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return dotnetCliInvoker.RunCommand(args);
         }
 
+        public IList<string> GetNugetFeeds(string nugetConfig) => GetResultList($"nuget list source --format Short --configfile \"{nugetConfig}\"");
+
         // The version number should be kept in sync with the version .NET version used for building the application.
         public const string LatestDotNetSdkVersion = "8.0.101";
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
index 65a4664e83e..2d36319042a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
@@ -16,5 +16,20 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// Controls whether to use framework dependencies from subfolders.
         /// </summary>
         public const string DotnetFrameworkReferencesUseSubfolders = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_DOTNET_FRAMEWORK_REFERENCES_USE_SUBFOLDERS";
+
+        /// <summary>
+        /// Controls whether to check the responsiveness of NuGet feeds.
+        /// </summary>
+        public const string CheckNugetFeedResponsiveness = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK";
+
+        /// <summary>
+        /// Specifies the NuGet feeds to exclude from the responsiveness check.
+        /// </summary>
+        public const string ExcludedNugetFeedsFromResponsivenessCheck = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_EXCLUDED_FROM_CHECK";
+
+        /// <summary>
+        /// Specifies the location of the diagnostic directory.
+        /// </summary>
+        public const string DiagnosticDir = "CODEQL_EXTRACTOR_CSHARP_DIAGNOSTIC_DIR";
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
index d66135c1644..d97fc7d6441 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
@@ -13,6 +13,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         IList<string> GetListedRuntimes();
         IList<string> GetListedSdks();
         bool Exec(string execArgs);
+        IList<string> GetNugetFeeds(string nugetConfig);
     }
 
     public record class RestoreSettings(string File, string PackageDirectory, bool ForceDotnetRefAssemblyFetching, string? PathToNugetConfig = null, bool ForceReevaluation = false);
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
index 17bc477bde8..2daf8244d97 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
+++ b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
@@ -26,6 +26,8 @@ namespace Semmle.Extraction.Tests
         public IList<string> GetListedSdks() => sdks;
 
         public bool Exec(string execArgs) => true;
+
+        public IList<string> GetNugetFeeds(string nugetConfig) => [];
     }
 
     public class RuntimeTests
diff --git a/csharp/extractor/Semmle.Util/EnvironmentVariables.cs b/csharp/extractor/Semmle.Util/EnvironmentVariables.cs
index c96aa16357c..72ba9224669 100644
--- a/csharp/extractor/Semmle.Util/EnvironmentVariables.cs
+++ b/csharp/extractor/Semmle.Util/EnvironmentVariables.cs
@@ -27,5 +27,12 @@ namespace Semmle.Util
             }
             return threads;
         }
+
+        public static bool GetBoolean(string name)
+        {
+            var env = Environment.GetEnvironmentVariable(name);
+            var _ = bool.TryParse(env, out var value);
+            return value;
+        }
     }
 }
diff --git a/csharp/extractor/Semmle.Util/FileUtils.cs b/csharp/extractor/Semmle.Util/FileUtils.cs
index 094c4da3338..4a22877e3c1 100644
--- a/csharp/extractor/Semmle.Util/FileUtils.cs
+++ b/csharp/extractor/Semmle.Util/FileUtils.cs
@@ -102,8 +102,7 @@ namespace Semmle.Util
         private static async Task DownloadFileAsync(string address, string filename)
         {
             using var httpClient = new HttpClient();
-            using var request = new HttpRequestMessage(HttpMethod.Get, address);
-            using var contentStream = await (await httpClient.SendAsync(request)).Content.ReadAsStreamAsync();
+            using var contentStream = await httpClient.GetStreamAsync(address);
             using var stream = new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true);
             await contentStream.CopyToAsync(stream);
         }
@@ -112,7 +111,7 @@ namespace Semmle.Util
         /// Downloads the file at <paramref name="address"/> to <paramref name="fileName"/>.
         /// </summary>
         public static void DownloadFile(string address, string fileName) =>
-           DownloadFileAsync(address, fileName).Wait();
+           DownloadFileAsync(address, fileName).GetAwaiter().GetResult();
 
         public static string NestPaths(ILogger logger, string? outerpath, string innerpath)
         {

From 7051db5e1c5df825f50a18f805680a8231a17fbe Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Fri, 5 Apr 2024 14:20:42 +0200
Subject: [PATCH 095/136] Fix code review findings

---
 .../DependencyManager.Nuget.cs                            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
index cdf4f5dcf4a..8f8e932279c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -387,6 +387,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
         private bool IsFeedReachable(string feed)
         {
+            logger.LogInfo($"Checking if Nuget feed '{feed}' is reachable...");
             using HttpClient client = new();
             var timeoutSeconds = 1;
             var tryCount = 4;
@@ -432,7 +433,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
             if (excludedFeeds.Count > 0)
             {
-                logger.LogInfo($"Excluded feeds from responsiveness check: {string.Join(", ", excludedFeeds)}");
+                logger.LogInfo($"Excluded feeds from responsiveness check: {string.Join(", ", excludedFeeds.OrderBy(f => f))}");
             }
 
             var allFeedsReachable = feeds.All(feed => excludedFeeds.Contains(feed) || IsFeedReachable(feed));
@@ -481,9 +482,10 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         {
             var nugetConfigs = GetAllNugetConfigs(allFiles);
             var feeds = nugetConfigs
-                .SelectMany(nf => GetFeeds(nf))
+                .SelectMany(GetFeeds)
                 .Where(str => !string.IsNullOrWhiteSpace(str))
                 .ToHashSet();
+            logger.LogInfo($"Found Nuget feeds in nuget.config files: {string.Join(", ", feeds.OrderBy(f => f))}");
             return feeds;
         }
 
@@ -493,7 +495,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         [GeneratedRegex(@"^(.+)\.(\d+\.\d+\.\d+(-(.+))?)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
         private static partial Regex LegacyNugetPackage();
 
-        [GeneratedRegex(@"^E (.*)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
+        [GeneratedRegex(@"^E\s(.*)$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline)]
         private static partial Regex EnabledNugetFeed();
     }
 }

From 6a5520c85d78bd07486003e7555b725715f64af3 Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Fri, 5 Apr 2024 15:12:15 +0200
Subject: [PATCH 096/136] Add integration test for unreachable nuget feeds

---
 .../DependencyManager.Nuget.cs                | 21 ++++++----
 .../EnvironmentVariableNames.cs               | 12 +++++-
 .../Assemblies.expected                       |  1 +
 .../Assemblies.ql                             | 11 +++++
 .../CompilationInfo.expected                  | 13 ++++++
 .../CompilationInfo.ql                        | 15 +++++++
 .../diagnostics.expected                      | 42 +++++++++++++++++++
 .../proj/Program.cs                           |  6 +++
 .../proj/nuget.config                         |  8 ++++
 .../proj/proj.csproj                          | 16 +++++++
 .../standalone.sln                            | 19 +++++++++
 .../test.py                                   | 10 +++++
 12 files changed, 165 insertions(+), 9 deletions(-)
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.ql
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/Program.cs
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/nuget.config
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/standalone.sln
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/test.py

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
index 8f8e932279c..c624c8113f6 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -389,13 +389,17 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         {
             logger.LogInfo($"Checking if Nuget feed '{feed}' is reachable...");
             using HttpClient client = new();
-            var timeoutSeconds = 1;
-            var tryCount = 4;
+            int timeoutMilliSeconds = int.TryParse(Environment.GetEnvironmentVariable(EnvironmentVariableNames.NugetFeedResponsivenessInitialTimeout), out timeoutMilliSeconds)
+                ? timeoutMilliSeconds
+                : 1000;
+            int tryCount = int.TryParse(Environment.GetEnvironmentVariable(EnvironmentVariableNames.NugetFeedResponsivenessRequestCount), out tryCount)
+                ? tryCount
+                : 4;
 
             for (var i = 0; i < tryCount; i++)
             {
                 using var cts = new CancellationTokenSource();
-                cts.CancelAfter(timeoutSeconds * 1000);
+                cts.CancelAfter(timeoutMilliSeconds);
                 try
                 {
                     ExecuteGetRequest(feed, client, cts.Token).GetAwaiter().GetResult();
@@ -407,8 +411,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                         tce.CancellationToken == cts.Token &&
                         cts.Token.IsCancellationRequested)
                     {
-                        logger.LogWarning($"Didn't receive answer from Nuget feed '{feed}' in {timeoutSeconds} seconds.");
-                        timeoutSeconds *= 2;
+                        logger.LogWarning($"Didn't receive answer from Nuget feed '{feed}' in {timeoutMilliSeconds}ms.");
+                        timeoutMilliSeconds *= 2;
                         continue;
                     }
 
@@ -418,7 +422,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 }
             }
 
-            logger.LogError($"Didn't receive answer from Nuget feed '{feed}'. Tried it {tryCount} times.");
+            logger.LogWarning($"Didn't receive answer from Nuget feed '{feed}'. Tried it {tryCount} times.");
             return false;
         }
 
@@ -428,17 +432,18 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             var feeds = GetAllFeeds(allFiles);
 
             var excludedFeeds = Environment.GetEnvironmentVariable(EnvironmentVariableNames.ExcludedNugetFeedsFromResponsivenessCheck)
-                ?.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries)
+                ?.Split(" ", StringSplitOptions.RemoveEmptyEntries)
                 .ToHashSet() ?? [];
 
             if (excludedFeeds.Count > 0)
             {
-                logger.LogInfo($"Excluded feeds from responsiveness check: {string.Join(", ", excludedFeeds.OrderBy(f => f))}");
+                logger.LogInfo($"Excluded Nuget feeds from responsiveness check: {string.Join(", ", excludedFeeds.OrderBy(f => f))}");
             }
 
             var allFeedsReachable = feeds.All(feed => excludedFeeds.Contains(feed) || IsFeedReachable(feed));
             if (!allFeedsReachable)
             {
+                logger.LogWarning("Found unreachable Nuget feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.");
                 diagnosticsWriter.AddEntry(new DiagnosticMessage(
                     Language.CSharp,
                     "buildless/unreachable-feed",
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
index 2d36319042a..ddec97d3dde 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
@@ -25,7 +25,17 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// <summary>
         /// Specifies the NuGet feeds to exclude from the responsiveness check.
         /// </summary>
-        public const string ExcludedNugetFeedsFromResponsivenessCheck = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_EXCLUDED_FROM_CHECK";
+        public const string ExcludedNugetFeedsFromResponsivenessCheck = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_EXCLUDED";
+
+        /// <summary>
+        /// Specifies the timeout for the initial check of NuGet feeds responsiveness.
+        /// </summary>
+        public const string NugetFeedResponsivenessInitialTimeout = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_TIMEOUT";
+
+        /// <summary>
+        /// Specifies how many requests to make to the NuGet feed to check its responsiveness.
+        /// </summary>
+        public const string NugetFeedResponsivenessRequestCount = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_LIMIT";
 
         /// <summary>
         /// Specifies the location of the diagnostic directory.
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected
new file mode 100644
index 00000000000..2a530060edb
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected
@@ -0,0 +1 @@
+| [...]/newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.ql
new file mode 100644
index 00000000000..79cf92de791
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/Assemblies.ql
@@ -0,0 +1,11 @@
+import csharp
+
+private string getPath(Assembly a) {
+  not a.getCompilation().getOutputAssembly() = a and
+  exists(string s | s = a.getFile().getAbsolutePath() |
+    result = "[...]/" + s.substring(s.indexOf("newtonsoft.json"), s.length())
+  )
+}
+
+from Assembly a
+select getPath(a)
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected
new file mode 100644
index 00000000000..394fb93a259
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.expected
@@ -0,0 +1,13 @@
+| All Nuget feeds reachable | 0.0 |
+| Fallback nuget restore | 1.0 |
+| Project files on filesystem | 1.0 |
+| Resolved assembly conflicts | 7.0 |
+| Restored .NET framework variants | 0.0 |
+| Solution files on filesystem | 1.0 |
+| Source files generated | 0.0 |
+| Source files on filesystem | 1.0 |
+| Successfully ran fallback nuget restore | 1.0 |
+| Unresolved references | 0.0 |
+| UseWPF set | 0.0 |
+| UseWindowsForms set | 0.0 |
+| WebView extraction enabled | 1.0 |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql
new file mode 100644
index 00000000000..073ffe3b224
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/CompilationInfo.ql
@@ -0,0 +1,15 @@
+import csharp
+import semmle.code.csharp.commons.Diagnostics
+
+query predicate compilationInfo(string key, float value) {
+  key != "Resolved references" and
+  not key.matches("Compiler diagnostic count for%") and
+  exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
+    key = infoKey and
+    value = infoValue.toFloat()
+    or
+    not exists(infoValue.toFloat()) and
+    key = infoKey + ": " + infoValue and
+    value = 1
+  )
+}
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected
new file mode 100644
index 00000000000..5f298cd3a11
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/diagnostics.expected
@@ -0,0 +1,42 @@
+{
+  "markdownMessage": "C# analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "csharp",
+    "id": "csharp/autobuilder/buildless/complete",
+    "name": "C# analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "C# with build-mode set to 'none'. This means that all C# source in the working directory will be scanned, with build tools, such as Nuget and Dotnet CLIs, only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "csharp",
+    "id": "csharp/autobuilder/buildless/mode-active",
+    "name": "C# with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Found unreachable Nuget feed in C# analysis with build-mode 'none'. This may cause missing dependencies in the analysis.",
+  "severity": "warning",
+  "source": {
+    "extractorName": "csharp",
+    "id": "csharp/autobuilder/buildless/unreachable-feed",
+    "name": "Found unreachable Nuget feed in C# analysis with build-mode 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/Program.cs b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/Program.cs
new file mode 100644
index 00000000000..39a9e95bb6e
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/Program.cs
@@ -0,0 +1,6 @@
+class Program
+{
+    static void Main(string[] args)
+    {
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/nuget.config b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/nuget.config
new file mode 100644
index 00000000000..11d134c7289
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="x" value="https://localhost:53/packages/" />
+    <add key="y" value="https://localhost:80/packages/" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
new file mode 100644
index 00000000000..cef71796352
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <Target Name="DeleteBinObjFolders" BeforeTargets="Clean">
+    <RemoveDir Directories=".\bin" />
+    <RemoveDir Directories=".\obj" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+</Project>
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/standalone.sln b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/standalone.sln
new file mode 100644
index 00000000000..493ab54b59a
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/standalone.sln
@@ -0,0 +1,19 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "proj", "proj\proj.csproj", "{6ED00460-7666-4AE9-A405-4B6C8B02279A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4ED55A1C-066C-43DF-B32E-7EAA035985EE}
+	EndGlobalSection
+EndGlobal
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/test.py b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/test.py
new file mode 100644
index 00000000000..b48382a66ce
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error_timeout/test.py
@@ -0,0 +1,10 @@
+from create_database_utils import *
+from diagnostics_test_utils import *
+import os
+
+os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK"] = "true"          # Enable NuGet feed check
+os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_TIMEOUT"] = "1"     # 1ms, the GET request should fail with such short timeout
+os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_LIMIT"] = "1"       # Limit the count of checks to 1
+os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_EXCLUDED"] = "https://abc.de:8000/packages/"   # Exclude this feed from check
+run_codeql_database_create([], lang="csharp", extra_args=["--build-mode=none"])
+check_diagnostics()
\ No newline at end of file

From 95896bc95fe23dfdbad68320f9524c832de118a9 Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Fri, 5 Apr 2024 15:57:07 +0200
Subject: [PATCH 097/136] Make sure diagnostic directory exists

---
 .../DependencyManager.cs                       | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 2fc77d004f2..8d63d7f42b2 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -53,8 +53,24 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             var startTime = DateTime.Now;
 
             this.logger = logger;
+
+            var diagDirEnv = Environment.GetEnvironmentVariable(EnvironmentVariableNames.DiagnosticDir);
+            if (!string.IsNullOrWhiteSpace(diagDirEnv) &&
+                !Directory.Exists(diagDirEnv))
+            {
+                try
+                {
+                    Directory.CreateDirectory(diagDirEnv);
+                }
+                catch (Exception e)
+                {
+                    logger.LogError($"Failed to create diagnostic directory {diagDirEnv}: {e.Message}");
+                    diagDirEnv = null;
+                }
+            }
+
             this.diagnosticsWriter = new DiagnosticsStream(Path.Combine(
-                Environment.GetEnvironmentVariable(EnvironmentVariableNames.DiagnosticDir) ?? "",
+                diagDirEnv ?? "",
                 $"dependency-manager-{DateTime.UtcNow:yyyyMMddHHmm}-{Environment.ProcessId}.jsonc"));
             this.sourceDir = new DirectoryInfo(srcDir);
 

From d7f8b9615857ba68243327e12c9af04a68660efe Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Mon, 8 Apr 2024 13:14:51 +0200
Subject: [PATCH 098/136] Improve logging

---
 .../DependencyManager.Nuget.cs                         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
index c624c8113f6..1f3f44425d5 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -490,7 +490,15 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .SelectMany(GetFeeds)
                 .Where(str => !string.IsNullOrWhiteSpace(str))
                 .ToHashSet();
-            logger.LogInfo($"Found Nuget feeds in nuget.config files: {string.Join(", ", feeds.OrderBy(f => f))}");
+
+            if (feeds.Count > 0)
+            {
+                logger.LogInfo($"Found {feeds.Count} Nuget feeds in nuget.config files: {string.Join(", ", feeds.OrderBy(f => f))}");
+            }
+            else
+            {
+                logger.LogDebug("No Nuget feeds found in nuget.config files.");
+            }
             return feeds;
         }
 

From 2fb9c2db6fc53c8adf1ce46b3d084bc4a6565b0c Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Tue, 12 Mar 2024 15:47:15 +0100
Subject: [PATCH 099/136] C#: Remove deprecated qualifiedName predicates.

---
 csharp/ql/lib/semmle/code/csharp/Element.qll  | 29 --------------
 csharp/ql/lib/semmle/code/csharp/Member.qll   | 38 -------------------
 .../ql/lib/semmle/code/csharp/Namespace.qll   | 10 -----
 3 files changed, 77 deletions(-)

diff --git a/csharp/ql/lib/semmle/code/csharp/Element.qll b/csharp/ql/lib/semmle/code/csharp/Element.qll
index 2c69912c993..ccfd1a27925 100644
--- a/csharp/ql/lib/semmle/code/csharp/Element.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Element.qll
@@ -101,25 +101,6 @@ class NamedElement extends Element, @named_element {
   /** Holds if this element has name 'name'. */
   final predicate hasName(string name) { name = this.getName() }
 
-  /**
-   * Gets the fully qualified name of this element, for example the
-   * fully qualified name of `M` on line 3 is `N.C.M` in
-   *
-   * ```csharp
-   * namespace N {
-   *   class C {
-   *     void M(int i, string s) { }
-   *   }
-   * }
-   * ```
-   */
-  cached
-  deprecated final string getQualifiedName() {
-    exists(string qualifier, string name | this.hasQualifiedName(qualifier, name) |
-      if qualifier = "" then result = name else result = qualifier + "." + name
-    )
-  }
-
   /**
    * Gets the fully qualified name of this element, for example the
    * fully qualified name of `M` on line 3 is `N.C.M` in
@@ -142,16 +123,6 @@ class NamedElement extends Element, @named_element {
     )
   }
 
-  /**
-   * DEPRECATED: Use `hasFullyQualifiedName` instead.
-   *
-   * Holds if this element has the qualified name `qualifier`.`name`.
-   */
-  cached
-  deprecated predicate hasQualifiedName(string qualifier, string name) {
-    qualifier = "" and name = this.getName()
-  }
-
   /** Holds if this element has the fully qualified name `qualifier`.`name`. */
   cached
   predicate hasFullyQualifiedName(string qualifier, string name) {
diff --git a/csharp/ql/lib/semmle/code/csharp/Member.qll b/csharp/ql/lib/semmle/code/csharp/Member.qll
index 1be091170e3..a2758f03942 100644
--- a/csharp/ql/lib/semmle/code/csharp/Member.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Member.qll
@@ -71,37 +71,10 @@ class Declaration extends NamedElement, @declaration {
 
   override string toString() { result = this.getName() }
 
-  deprecated override predicate hasQualifiedName(string qualifier, string name) {
-    QualifiedName<QualifiedNameInput>::hasQualifiedName(this, qualifier, name)
-  }
-
   override predicate hasFullyQualifiedName(string qualifier, string name) {
     QualifiedName<FullyQualifiedNameInput>::hasQualifiedName(this, qualifier, name)
   }
 
-  /**
-   * DEPRECATED: Use `getFullyQualifiedNameWithTypes` instead.
-   *
-   * Gets the fully qualified name of this declaration, including types, for example
-   * the fully qualified name with types of `M` on line 3 is `N.C.M(int, string)` in
-   *
-   * ```csharp
-   * namespace N {
-   *   class C {
-   *     void M(int i, string s) { }
-   *   }
-   * }
-   * ```
-   */
-  deprecated string getQualifiedNameWithTypes() {
-    exists(string qual |
-      qual = this.getDeclaringType().getQualifiedName() and
-      if this instanceof NestedType
-      then result = qual + "+" + this.toStringWithTypes()
-      else result = qual + "." + this.toStringWithTypes()
-    )
-  }
-
   /**
    * Gets the fully qualified name of this declaration, including types, for example
    * the fully qualified name with types of `M` on line 3 is `N.C.M(int, string)` in
@@ -263,17 +236,6 @@ class Member extends Modifiable, @member {
   /** Gets an access to this member. */
   MemberAccess getAnAccess() { result.getTarget() = this }
 
-  /**
-   * DEPRECATED: Use `hasFullyQualifiedName` instead.
-   *
-   * Holds if this member has name `name` and is defined in type `type`
-   * with namespace `namespace`.
-   */
-  cached
-  deprecated final predicate hasQualifiedName(string namespace, string type, string name) {
-    QualifiedName<QualifiedNameInput>::hasQualifiedName(this, namespace, type, name)
-  }
-
   /**
    * Holds if this member has name `name` and is defined in type `type`
    * with namespace `namespace`.
diff --git a/csharp/ql/lib/semmle/code/csharp/Namespace.qll b/csharp/ql/lib/semmle/code/csharp/Namespace.qll
index 002ce444b3f..383fe8ab2a8 100644
--- a/csharp/ql/lib/semmle/code/csharp/Namespace.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Namespace.qll
@@ -38,16 +38,6 @@ class Namespace extends TypeContainer, Declaration, @namespace {
     parent_namespace(result, this)
   }
 
-  /**
-   * Holds if this namespace has the qualified name `qualifier`.`name`.
-   *
-   * For example if the qualified name is `System.Collections.Generic`, then
-   * `qualifier`=`System.Collections` and `name`=`Generic`.
-   */
-  deprecated override predicate hasQualifiedName(string qualifier, string name) {
-    namespaceHasQualifiedName(this, qualifier, name)
-  }
-
   /**
    * Holds if this namespace has the qualified name `qualifier`.`name`.
    *

From 8fa91914349bf21e52fabfde00c68f13b28c8a63 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 13 Mar 2024 10:12:22 +0100
Subject: [PATCH 100/136] C#: Deprecate the getFullyQualifiedName predicate.

---
 .../diag_recursive_generics/Types.ql              |  7 ++++---
 csharp/ql/lib/semmle/code/csharp/Element.qll      |  4 +++-
 csharp/ql/lib/semmle/code/csharp/Member.qll       |  9 +++++----
 csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll |  8 +++++++-
 .../csharp/dataflow/internal/FlowSummaryImpl.qll  | 15 ++++++++++++---
 .../security/dataflow/ExternalAPIsQuery.qll       |  6 +++---
 .../library-tests/constructors/Destructors1.ql    |  2 +-
 7 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql
index d59c60ec802..fff011dcbd5 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql
+++ b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql
@@ -1,5 +1,6 @@
 import csharp
+import semmle.code.csharp.commons.QualifiedName
 
-from Class c
-where c.fromSource()
-select c, c.getBaseClass().getFullyQualifiedName()
+from Class c, string qualifier, string name
+where c.fromSource() and c.getBaseClass().hasFullyQualifiedName(qualifier, name)
+select c, getQualifiedName(qualifier, name)
diff --git a/csharp/ql/lib/semmle/code/csharp/Element.qll b/csharp/ql/lib/semmle/code/csharp/Element.qll
index ccfd1a27925..38176acfd92 100644
--- a/csharp/ql/lib/semmle/code/csharp/Element.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Element.qll
@@ -102,6 +102,8 @@ class NamedElement extends Element, @named_element {
   final predicate hasName(string name) { name = this.getName() }
 
   /**
+   * DEPRECATED: Use `hasFullyQualifiedName` instead.
+   *
    * Gets the fully qualified name of this element, for example the
    * fully qualified name of `M` on line 3 is `N.C.M` in
    *
@@ -117,7 +119,7 @@ class NamedElement extends Element, @named_element {
    * ``System.Collections.Generic.IList`1``.
    */
   cached
-  final string getFullyQualifiedName() {
+  deprecated final string getFullyQualifiedName() {
     exists(string qualifier, string name | this.hasFullyQualifiedName(qualifier, name) |
       if qualifier = "" then result = name else result = qualifier + "." + name
     )
diff --git a/csharp/ql/lib/semmle/code/csharp/Member.qll b/csharp/ql/lib/semmle/code/csharp/Member.qll
index a2758f03942..99bf8eaa4f0 100644
--- a/csharp/ql/lib/semmle/code/csharp/Member.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Member.qll
@@ -88,11 +88,12 @@ class Declaration extends NamedElement, @declaration {
    * ```
    */
   string getFullyQualifiedNameWithTypes() {
-    exists(string qual |
-      qual = this.getDeclaringType().getFullyQualifiedName() and
+    exists(string fullqual, string qual, string name |
+      this.getDeclaringType().hasFullyQualifiedName(qual, name) and
+      fullqual = getQualifiedName(qual, name) and
       if this instanceof NestedType
-      then result = qual + "+" + this.toStringWithTypes()
-      else result = qual + "." + this.toStringWithTypes()
+      then result = fullqual + "+" + this.toStringWithTypes()
+      else result = fullqual + "." + this.toStringWithTypes()
     )
   }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
index 673bd1a5638..9cd33ea260f 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
@@ -3,6 +3,7 @@
  */
 
 import csharp
+private import semmle.code.csharp.commons.QualifiedName
 
 /**
  * Provides classes for working with static single assignment (SSA) form.
@@ -120,7 +121,12 @@ module Ssa {
           result = prefix + "." + this.getAssignable()
         |
           if f.(Modifiable).isStatic()
-          then prefix = f.getDeclaringType().getFullyQualifiedName()
+          then
+            exists(string qualifier, string name |
+              f.getDeclaringType().hasFullyQualifiedName(qualifier, name)
+            |
+              prefix = getQualifiedName(qualifier, name)
+            )
           else prefix = "this"
         )
       }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
index 96f45e77655..82c2a7dcd3d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -3,6 +3,7 @@
  */
 
 private import csharp
+private import semmle.code.csharp.commons.QualifiedName
 private import semmle.code.csharp.frameworks.system.linq.Expressions
 private import codeql.dataflow.internal.FlowSummaryImpl
 private import codeql.dataflow.internal.AccessPathSyntax as AccessPath
@@ -42,10 +43,18 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CsharpDataFlow>
   string encodeContent(ContentSet c, string arg) {
     c = TElementContent() and result = "Element" and arg = ""
     or
-    exists(Field f | c = TFieldContent(f) and result = "Field" and arg = f.getFullyQualifiedName())
+    exists(Field f, string qualifier, string name |
+      c = TFieldContent(f) and
+      f.hasFullyQualifiedName(qualifier, name) and
+      arg = getQualifiedName(qualifier, name) and
+      result = "Field"
+    )
     or
-    exists(Property p |
-      c = TPropertyContent(p) and result = "Property" and arg = p.getFullyQualifiedName()
+    exists(Property p, string qualifier, string name |
+      c = TPropertyContent(p) and
+      p.hasFullyQualifiedName(qualifier, name) and
+      arg = getQualifiedName(qualifier, name) and
+      result = "Property"
     )
     or
     exists(SyntheticField f |
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
index 3075fe53a87..a0d0ada957a 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
@@ -139,13 +139,13 @@ class ExternalApiUsedWithUntrustedData extends TExternalApi {
 
   /** Gets a textual representation of this element. */
   string toString() {
-    exists(Callable m, int index, string indexString |
+    exists(Callable m, int index, string indexString, string qualifier, string name |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
       this = TExternalApiParameter(m, index) and
+      m.getDeclaringType().hasFullyQualifiedName(qualifier, name) and
       result =
-        m.getDeclaringType().getFullyQualifiedName() + "." + m.toStringWithTypes() + " [" +
-          indexString + "]"
+        getQualifiedName(qualifier, name) + "." + m.toStringWithTypes() + " [" + indexString + "]"
     )
   }
 }
diff --git a/csharp/ql/test/library-tests/constructors/Destructors1.ql b/csharp/ql/test/library-tests/constructors/Destructors1.ql
index 368980a290c..673a0e941f0 100644
--- a/csharp/ql/test/library-tests/constructors/Destructors1.ql
+++ b/csharp/ql/test/library-tests/constructors/Destructors1.ql
@@ -10,4 +10,4 @@ where
   c.getDeclaringType().hasFullyQualifiedName(qualifier, name) and
   qualifier = "Constructors" and
   name = "Class"
-select c, c.getDeclaringType().getFullyQualifiedName()
+select c, getQualifiedName(qualifier, name)

From b677e89f35fd0f0ae322f0191e342520ab0bc795 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 13 Mar 2024 10:23:24 +0100
Subject: [PATCH 101/136] C#: Deprecate getFullyQualifiedNameWithTypes.

---
 csharp/ql/lib/semmle/code/csharp/Member.qll   |  2 +-
 .../code/csharp/commons/QualifiedName.qll     | 25 +++++++++++++++++++
 .../dispatch/GetADynamicTarget.ql             |  3 ++-
 .../frameworks/system/Dispose/Dispose.ql      |  3 ++-
 .../frameworks/system/Equals/Equals.ql        |  3 ++-
 .../test/library-tests/generics/Generics.ql   | 12 ++++-----
 .../library-tests/overrides/Overrides22.ql    |  3 ++-
 .../library-tests/unification/Unification.ql  |  5 ++--
 8 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/csharp/ql/lib/semmle/code/csharp/Member.qll b/csharp/ql/lib/semmle/code/csharp/Member.qll
index 99bf8eaa4f0..3427d4ea089 100644
--- a/csharp/ql/lib/semmle/code/csharp/Member.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Member.qll
@@ -87,7 +87,7 @@ class Declaration extends NamedElement, @declaration {
    * }
    * ```
    */
-  string getFullyQualifiedNameWithTypes() {
+  deprecated string getFullyQualifiedNameWithTypes() {
     exists(string fullqual, string qual, string name |
       this.getDeclaringType().hasFullyQualifiedName(qual, name) and
       fullqual = getQualifiedName(qual, name) and
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll b/csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll
index eba0fb10c7c..417dc137027 100644
--- a/csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll
+++ b/csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll
@@ -219,3 +219,28 @@ predicate splitQualifiedName(string qualifiedName, string qualifier, string name
     name = qualifiedName
   )
 }
+
+/**
+ * INTERNAL: Do not use.
+ *
+ * Gets the fully qualified name of this declaration, including types, for example
+ * the fully qualified name with types of `M` on line 3 is `N.C.M(int, string)` in
+ *
+ * ```csharp
+ * namespace N {
+ *   class C {
+ *     void M(int i, string s) { }
+ *   }
+ * }
+ * ```
+ */
+bindingset[d]
+string getFullyQualifiedNameWithTypes(Declaration d) {
+  exists(string fullqual, string qual, string name |
+    d.getDeclaringType().hasFullyQualifiedName(qual, name) and
+    fullqual = getQualifiedName(qual, name) and
+    if d instanceof NestedType
+    then result = fullqual + "+" + d.toStringWithTypes()
+    else result = fullqual + "." + d.toStringWithTypes()
+  )
+}
diff --git a/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.ql b/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.ql
index cbde2d43ab8..b4c94a0b507 100644
--- a/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.ql
+++ b/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.ql
@@ -1,8 +1,9 @@
 import csharp
+import semmle.code.csharp.commons.QualifiedName
 import semmle.code.csharp.dispatch.Dispatch
 
 from DispatchCall call, Callable callable
 where
   callable = call.getADynamicTarget() and
   callable.fromSource()
-select call, callable.getFullyQualifiedNameWithTypes()
+select call, getFullyQualifiedNameWithTypes(callable)
diff --git a/csharp/ql/test/library-tests/frameworks/system/Dispose/Dispose.ql b/csharp/ql/test/library-tests/frameworks/system/Dispose/Dispose.ql
index 943245fa0a2..5fa2f337fcf 100644
--- a/csharp/ql/test/library-tests/frameworks/system/Dispose/Dispose.ql
+++ b/csharp/ql/test/library-tests/frameworks/system/Dispose/Dispose.ql
@@ -1,4 +1,5 @@
 import csharp
+import semmle.code.csharp.commons.QualifiedName
 import semmle.code.csharp.frameworks.System
 
 from ValueOrRefType t, Method m, boolean b
@@ -6,4 +7,4 @@ where
   t.fromSource() and
   m = getInvokedDisposeMethod(t) and
   if implementsDispose(t) then b = true else b = false
-select t, m.getFullyQualifiedNameWithTypes(), b
+select t, getFullyQualifiedNameWithTypes(m), b
diff --git a/csharp/ql/test/library-tests/frameworks/system/Equals/Equals.ql b/csharp/ql/test/library-tests/frameworks/system/Equals/Equals.ql
index 91c04791ef3..e6dc4ae7549 100644
--- a/csharp/ql/test/library-tests/frameworks/system/Equals/Equals.ql
+++ b/csharp/ql/test/library-tests/frameworks/system/Equals/Equals.ql
@@ -1,4 +1,5 @@
 import csharp
+import semmle.code.csharp.commons.QualifiedName
 import semmle.code.csharp.frameworks.System
 
 from ValueOrRefType t, Method m, boolean b
@@ -6,4 +7,4 @@ where
   t.fromSource() and
   m = getInvokedEqualsMethod(t) and
   if implementsEquals(t) then b = true else b = false
-select t, m.getFullyQualifiedNameWithTypes(), b
+select t, getFullyQualifiedNameWithTypes(m), b
diff --git a/csharp/ql/test/library-tests/generics/Generics.ql b/csharp/ql/test/library-tests/generics/Generics.ql
index 2f3aff0fd58..71e21a5815e 100644
--- a/csharp/ql/test/library-tests/generics/Generics.ql
+++ b/csharp/ql/test/library-tests/generics/Generics.ql
@@ -231,18 +231,18 @@ query predicate test27(ConstructedType ct, UnboundGenericType ugt, UnboundGeneri
 
 query predicate test28(UnboundGeneric ug, string s) {
   ug.fromSource() and
-  s = ug.getFullyQualifiedNameWithTypes()
+  s = getFullyQualifiedNameWithTypes(ug)
 }
 
 query predicate test29(ConstructedGeneric cg, string s) {
   cg.fromSource() and
-  s = cg.getFullyQualifiedNameWithTypes()
+  s = getFullyQualifiedNameWithTypes(cg)
 }
 
 query predicate test30(Declaration d, string s) {
   d.fromSource() and
   d instanceof @generic and
-  s = d.getFullyQualifiedNameWithTypes() and
+  s = getFullyQualifiedNameWithTypes(d) and
   d != d.getUnboundDeclaration() and
   not d instanceof Generic
 }
@@ -263,7 +263,7 @@ query predicate test33(ConstructedMethod cm, string s1, string s2) {
   exists(string namespace, string type, string name |
     cm.hasFullyQualifiedName(namespace, type, name) and s1 = getQualifiedName(namespace, type, name)
   ) and
-  cm.getFullyQualifiedNameWithTypes() = s2
+  getFullyQualifiedNameWithTypes(cm) = s2
 }
 
 query predicate test34(UnboundGeneric ug, string s1, string s2) {
@@ -271,7 +271,7 @@ query predicate test34(UnboundGeneric ug, string s1, string s2) {
   exists(string qualifier, string name |
     ug.hasFullyQualifiedName(qualifier, name) and s1 = getQualifiedName(qualifier, name)
   ) and
-  ug.getFullyQualifiedNameWithTypes() = s2
+  getFullyQualifiedNameWithTypes(ug) = s2
 }
 
 query predicate test35(UnboundGenericMethod gm, string s1, string s2) {
@@ -279,5 +279,5 @@ query predicate test35(UnboundGenericMethod gm, string s1, string s2) {
   exists(string namespace, string type, string name |
     gm.hasFullyQualifiedName(namespace, type, name) and s1 = getQualifiedName(namespace, type, name)
   ) and
-  gm.getFullyQualifiedNameWithTypes() = s2
+  getFullyQualifiedNameWithTypes(gm) = s2
 }
diff --git a/csharp/ql/test/library-tests/overrides/Overrides22.ql b/csharp/ql/test/library-tests/overrides/Overrides22.ql
index d2c5a9e4336..d6300d49ecd 100644
--- a/csharp/ql/test/library-tests/overrides/Overrides22.ql
+++ b/csharp/ql/test/library-tests/overrides/Overrides22.ql
@@ -1,4 +1,5 @@
 import csharp
+import semmle.code.csharp.commons.QualifiedName
 
 from Overridable v1, Overridable v2, string kind
 where
@@ -9,4 +10,4 @@ where
   ) and
   v1.fromSource() and
   v2.fromSource()
-select v1.getFullyQualifiedNameWithTypes(), v2.getFullyQualifiedNameWithTypes(), kind
+select getFullyQualifiedNameWithTypes(v1), getFullyQualifiedNameWithTypes(v2), kind
diff --git a/csharp/ql/test/library-tests/unification/Unification.ql b/csharp/ql/test/library-tests/unification/Unification.ql
index 10c5e520921..f8c6c15377d 100644
--- a/csharp/ql/test/library-tests/unification/Unification.ql
+++ b/csharp/ql/test/library-tests/unification/Unification.ql
@@ -1,3 +1,4 @@
+import semmle.code.csharp.commons.QualifiedName
 import semmle.code.csharp.Unification
 
 class InterestingType extends @type {
@@ -7,9 +8,9 @@ class InterestingType extends @type {
   }
 
   string toString() {
-    result = this.(Type).getFullyQualifiedNameWithTypes()
+    result = getFullyQualifiedNameWithTypes(this.(Type))
     or
-    not exists(this.(Type).getFullyQualifiedNameWithTypes()) and
+    not exists(getFullyQualifiedNameWithTypes(this.(Type))) and
     result = this.(Type).toStringWithTypes()
   }
 

From 8fbfafc1d7a18356d4577280b813a5bcfec768d0 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 13 Mar 2024 16:27:01 +0100
Subject: [PATCH 102/136] C#: Dont cache the deprecated getFullyQualifiedName
 predicate.

---
 csharp/ql/lib/semmle/code/csharp/Element.qll | 1 -
 1 file changed, 1 deletion(-)

diff --git a/csharp/ql/lib/semmle/code/csharp/Element.qll b/csharp/ql/lib/semmle/code/csharp/Element.qll
index 38176acfd92..c44a092bb4f 100644
--- a/csharp/ql/lib/semmle/code/csharp/Element.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Element.qll
@@ -118,7 +118,6 @@ class NamedElement extends Element, @named_element {
    * Unbound generic types, such as `IList<T>`, are represented as
    * ``System.Collections.Generic.IList`1``.
    */
-  cached
   deprecated final string getFullyQualifiedName() {
     exists(string qualifier, string name | this.hasFullyQualifiedName(qualifier, name) |
       if qualifier = "" then result = name else result = qualifier + "." + name

From fc689efd1b1459e3da7771e46d364874d2544e97 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Mon, 8 Apr 2024 13:47:59 +0200
Subject: [PATCH 103/136] C#: Add debug version of the getFullyQualifiedName
 predicate.

---
 csharp/ql/lib/semmle/code/csharp/Element.qll | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/csharp/ql/lib/semmle/code/csharp/Element.qll b/csharp/ql/lib/semmle/code/csharp/Element.qll
index c44a092bb4f..f8cb018be68 100644
--- a/csharp/ql/lib/semmle/code/csharp/Element.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Element.qll
@@ -124,6 +124,33 @@ class NamedElement extends Element, @named_element {
     )
   }
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * This is intended for DEBUG ONLY.
+   * Constructing the fully qualified name for all elements in a large codebase
+   * puts severe stress on the string pool.
+   *
+   * Gets the fully qualified name of this element, for example the
+   * fully qualified name of `M` on line 3 is `N.C.M` in
+   *
+   * ```csharp
+   * namespace N {
+   *   class C {
+   *     void M(int i, string s) { }
+   *   }
+   * }
+   * ```
+   *
+   * Unbound generic types, such as `IList<T>`, are represented as
+   * ``System.Collections.Generic.IList`1``.
+   */
+  final string getFullyQualifiedNameDebug() {
+    exists(string qualifier, string name | this.hasFullyQualifiedName(qualifier, name) |
+      if qualifier = "" then result = name else result = qualifier + "." + name
+    )
+  }
+
   /** Holds if this element has the fully qualified name `qualifier`.`name`. */
   cached
   predicate hasFullyQualifiedName(string qualifier, string name) {

From b581a9ba04c76a1a6fbf535e31b10502dbf3b6c7 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 8 Apr 2024 13:49:05 +0100
Subject: [PATCH 104/136] C++: Add example with missing destructor calls on
 parameters passed by value.

---
 .../library-tests/ir/ir/PrintAST.expected     | 24 ++++++++
 .../library-tests/ir/ir/aliased_ir.expected   | 61 +++++++++++++++++++
 cpp/ql/test/library-tests/ir/ir/ir.cpp        | 16 +++++
 .../ir/ir/operand_locations.expected          | 31 ++++++++++
 .../test/library-tests/ir/ir/raw_ir.expected  | 57 +++++++++++++++++
 5 files changed, 189 insertions(+)

diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 5f2aebd390f..7761598e90f 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -20163,6 +20163,30 @@ ir.cpp:
 # 2430|           Type = [ClassTemplateInstantiation,Struct] iterator<random_access_iterator_tag, char, ptrdiff_t, char *, char &>
 # 2430|           ValueCategory = lvalue
 # 2432|     getStmt(6): [ReturnStmt] return ...
+# 2434| [TopLevelFunction] void param_with_destructor_by_value(ClassWithDestructor)
+# 2434|   <params>: 
+# 2434|     getParameter(0): [Parameter] c
+# 2434|         Type = [Class] ClassWithDestructor
+# 2434|   getEntryPoint(): [BlockStmt] { ... }
+# 2436|     getStmt(0): [ReturnStmt] return ...
+# 2438| [TopLevelFunction] void param_with_destructor_by_pointer(ClassWithDestructor*)
+# 2438|   <params>: 
+# 2438|     getParameter(0): [Parameter] c
+# 2438|         Type = [PointerType] ClassWithDestructor *
+# 2438|   getEntryPoint(): [BlockStmt] { ... }
+# 2440|     getStmt(0): [ReturnStmt] return ...
+# 2442| [TopLevelFunction] void param_with_destructor_by_ref(ClassWithDestructor&)
+# 2442|   <params>: 
+# 2442|     getParameter(0): [Parameter] c
+# 2442|         Type = [LValueReferenceType] ClassWithDestructor &
+# 2442|   getEntryPoint(): [BlockStmt] { ... }
+# 2444|     getStmt(0): [ReturnStmt] return ...
+# 2446| [TopLevelFunction] void param_with_destructor_by_rref(ClassWithDestructor&&)
+# 2446|   <params>: 
+# 2446|     getParameter(0): [Parameter] c
+# 2446|         Type = [RValueReferenceType] ClassWithDestructor &&
+# 2446|   getEntryPoint(): [BlockStmt] { ... }
+# 2448|     getStmt(0): [ReturnStmt] return ...
 perf-regression.cpp:
 #    4| [CopyAssignmentOperator] Big& Big::operator=(Big const&)
 #    4|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index cbf32f3aab3..39eccf0139f 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -15583,6 +15583,67 @@ ir.cpp:
 # 2410|   Block 13
 # 2410|     v2410_8(void) = Unreached : 
 
+# 2434| void param_with_destructor_by_value(ClassWithDestructor)
+# 2434|   Block 0
+# 2434|     v2434_1(void)                       = EnterFunction          : 
+# 2434|     m2434_2(unknown)                    = AliasedDefinition      : 
+# 2434|     m2434_3(unknown)                    = InitializeNonLocal     : 
+# 2434|     m2434_4(unknown)                    = Chi                    : total:m2434_2, partial:m2434_3
+# 2434|     r2434_5(glval<ClassWithDestructor>) = VariableAddress[c]     : 
+# 2434|     m2434_6(ClassWithDestructor)        = InitializeParameter[c] : &:r2434_5
+# 2436|     v2436_1(void)                       = NoOp                   : 
+# 2434|     v2434_7(void)                       = ReturnVoid             : 
+# 2434|     v2434_8(void)                       = AliasedUse             : m2434_3
+# 2434|     v2434_9(void)                       = ExitFunction           : 
+
+# 2438| void param_with_destructor_by_pointer(ClassWithDestructor*)
+# 2438|   Block 0
+# 2438|     v2438_1(void)                         = EnterFunction            : 
+# 2438|     m2438_2(unknown)                      = AliasedDefinition        : 
+# 2438|     m2438_3(unknown)                      = InitializeNonLocal       : 
+# 2438|     m2438_4(unknown)                      = Chi                      : total:m2438_2, partial:m2438_3
+# 2438|     r2438_5(glval<ClassWithDestructor *>) = VariableAddress[c]       : 
+# 2438|     m2438_6(ClassWithDestructor *)        = InitializeParameter[c]   : &:r2438_5
+# 2438|     r2438_7(ClassWithDestructor *)        = Load[c]                  : &:r2438_5, m2438_6
+# 2438|     m2438_8(unknown)                      = InitializeIndirection[c] : &:r2438_7
+# 2440|     v2440_1(void)                         = NoOp                     : 
+# 2438|     v2438_9(void)                         = ReturnIndirection[c]     : &:r2438_7, m2438_8
+# 2438|     v2438_10(void)                        = ReturnVoid               : 
+# 2438|     v2438_11(void)                        = AliasedUse               : m2438_3
+# 2438|     v2438_12(void)                        = ExitFunction             : 
+
+# 2442| void param_with_destructor_by_ref(ClassWithDestructor&)
+# 2442|   Block 0
+# 2442|     v2442_1(void)                         = EnterFunction            : 
+# 2442|     m2442_2(unknown)                      = AliasedDefinition        : 
+# 2442|     m2442_3(unknown)                      = InitializeNonLocal       : 
+# 2442|     m2442_4(unknown)                      = Chi                      : total:m2442_2, partial:m2442_3
+# 2442|     r2442_5(glval<ClassWithDestructor &>) = VariableAddress[c]       : 
+# 2442|     m2442_6(ClassWithDestructor &)        = InitializeParameter[c]   : &:r2442_5
+# 2442|     r2442_7(ClassWithDestructor &)        = Load[c]                  : &:r2442_5, m2442_6
+# 2442|     m2442_8(unknown)                      = InitializeIndirection[c] : &:r2442_7
+# 2444|     v2444_1(void)                         = NoOp                     : 
+# 2442|     v2442_9(void)                         = ReturnIndirection[c]     : &:r2442_7, m2442_8
+# 2442|     v2442_10(void)                        = ReturnVoid               : 
+# 2442|     v2442_11(void)                        = AliasedUse               : m2442_3
+# 2442|     v2442_12(void)                        = ExitFunction             : 
+
+# 2446| void param_with_destructor_by_rref(ClassWithDestructor&&)
+# 2446|   Block 0
+# 2446|     v2446_1(void)                          = EnterFunction            : 
+# 2446|     m2446_2(unknown)                       = AliasedDefinition        : 
+# 2446|     m2446_3(unknown)                       = InitializeNonLocal       : 
+# 2446|     m2446_4(unknown)                       = Chi                      : total:m2446_2, partial:m2446_3
+# 2446|     r2446_5(glval<ClassWithDestructor &&>) = VariableAddress[c]       : 
+# 2446|     m2446_6(ClassWithDestructor &&)        = InitializeParameter[c]   : &:r2446_5
+# 2446|     r2446_7(ClassWithDestructor &&)        = Load[c]                  : &:r2446_5, m2446_6
+# 2446|     m2446_8(unknown)                       = InitializeIndirection[c] : &:r2446_7
+# 2448|     v2448_1(void)                          = NoOp                     : 
+# 2446|     v2446_9(void)                          = ReturnIndirection[c]     : &:r2446_7, m2446_8
+# 2446|     v2446_10(void)                         = ReturnVoid               : 
+# 2446|     v2446_11(void)                         = AliasedUse               : m2446_3
+# 2446|     v2446_12(void)                         = ExitFunction             : 
+
 perf-regression.cpp:
 #    6| void Big::Big()
 #    6|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.cpp b/cpp/ql/test/library-tests/ir/ir/ir.cpp
index 2d476b11fd4..7c8d0b1296b 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2431,4 +2431,20 @@ void initialization_with_temp_destructor() {
         y += x;
 }
 
+void param_with_destructor_by_value(ClassWithDestructor c) {
+    // The call to ~ClassWithDestructor::ClassWithDestructor() seems to be missing here.
+}
+
+void param_with_destructor_by_pointer(ClassWithDestructor* c) {
+    // No destructor call should be here
+}
+
+void param_with_destructor_by_ref(ClassWithDestructor& c) {
+    // No destructor call should be here
+}
+
+void param_with_destructor_by_rref(ClassWithDestructor&& c) {
+    // No destructor call should be here
+}
+
 // semmle-extractor-options: -std=c++20 --clang
diff --git a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
index a112a769876..2799fc28e94 100644
--- a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
+++ b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
@@ -12968,6 +12968,37 @@
 | ir.cpp:2431:14:2431:14 | Load | m2430_17 |
 | ir.cpp:2431:14:2431:14 | Right | r2431_3 |
 | ir.cpp:2431:14:2431:14 | Unary | r2431_2 |
+| ir.cpp:2434:6:2434:35 | ChiPartial | partial:m2434_3 |
+| ir.cpp:2434:6:2434:35 | ChiTotal | total:m2434_2 |
+| ir.cpp:2434:6:2434:35 | SideEffect | m2434_3 |
+| ir.cpp:2434:57:2434:57 | Address | &:r2434_5 |
+| ir.cpp:2438:6:2438:37 | ChiPartial | partial:m2438_3 |
+| ir.cpp:2438:6:2438:37 | ChiTotal | total:m2438_2 |
+| ir.cpp:2438:6:2438:37 | SideEffect | m2438_3 |
+| ir.cpp:2438:60:2438:60 | Address | &:r2438_5 |
+| ir.cpp:2438:60:2438:60 | Address | &:r2438_5 |
+| ir.cpp:2438:60:2438:60 | Address | &:r2438_7 |
+| ir.cpp:2438:60:2438:60 | Address | &:r2438_7 |
+| ir.cpp:2438:60:2438:60 | Load | m2438_6 |
+| ir.cpp:2438:60:2438:60 | SideEffect | m2438_8 |
+| ir.cpp:2442:6:2442:33 | ChiPartial | partial:m2442_3 |
+| ir.cpp:2442:6:2442:33 | ChiTotal | total:m2442_2 |
+| ir.cpp:2442:6:2442:33 | SideEffect | m2442_3 |
+| ir.cpp:2442:56:2442:56 | Address | &:r2442_5 |
+| ir.cpp:2442:56:2442:56 | Address | &:r2442_5 |
+| ir.cpp:2442:56:2442:56 | Address | &:r2442_7 |
+| ir.cpp:2442:56:2442:56 | Address | &:r2442_7 |
+| ir.cpp:2442:56:2442:56 | Load | m2442_6 |
+| ir.cpp:2442:56:2442:56 | SideEffect | m2442_8 |
+| ir.cpp:2446:6:2446:34 | ChiPartial | partial:m2446_3 |
+| ir.cpp:2446:6:2446:34 | ChiTotal | total:m2446_2 |
+| ir.cpp:2446:6:2446:34 | SideEffect | m2446_3 |
+| ir.cpp:2446:58:2446:58 | Address | &:r2446_5 |
+| ir.cpp:2446:58:2446:58 | Address | &:r2446_5 |
+| ir.cpp:2446:58:2446:58 | Address | &:r2446_7 |
+| ir.cpp:2446:58:2446:58 | Address | &:r2446_7 |
+| ir.cpp:2446:58:2446:58 | Load | m2446_6 |
+| ir.cpp:2446:58:2446:58 | SideEffect | m2446_8 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_5 |
 | perf-regression.cpp:6:3:6:5 | Address | &:r6_7 |
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index cf8448c9f5d..5cd8ff2cd4a 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -14362,6 +14362,63 @@ ir.cpp:
 # 2410|     v2410_5(void) = AliasedUse   : ~m?
 # 2410|     v2410_6(void) = ExitFunction : 
 
+# 2434| void param_with_destructor_by_value(ClassWithDestructor)
+# 2434|   Block 0
+# 2434|     v2434_1(void)                       = EnterFunction          : 
+# 2434|     mu2434_2(unknown)                   = AliasedDefinition      : 
+# 2434|     mu2434_3(unknown)                   = InitializeNonLocal     : 
+# 2434|     r2434_4(glval<ClassWithDestructor>) = VariableAddress[c]     : 
+# 2434|     mu2434_5(ClassWithDestructor)       = InitializeParameter[c] : &:r2434_4
+# 2436|     v2436_1(void)                       = NoOp                   : 
+# 2434|     v2434_6(void)                       = ReturnVoid             : 
+# 2434|     v2434_7(void)                       = AliasedUse             : ~m?
+# 2434|     v2434_8(void)                       = ExitFunction           : 
+
+# 2438| void param_with_destructor_by_pointer(ClassWithDestructor*)
+# 2438|   Block 0
+# 2438|     v2438_1(void)                         = EnterFunction            : 
+# 2438|     mu2438_2(unknown)                     = AliasedDefinition        : 
+# 2438|     mu2438_3(unknown)                     = InitializeNonLocal       : 
+# 2438|     r2438_4(glval<ClassWithDestructor *>) = VariableAddress[c]       : 
+# 2438|     mu2438_5(ClassWithDestructor *)       = InitializeParameter[c]   : &:r2438_4
+# 2438|     r2438_6(ClassWithDestructor *)        = Load[c]                  : &:r2438_4, ~m?
+# 2438|     mu2438_7(unknown)                     = InitializeIndirection[c] : &:r2438_6
+# 2440|     v2440_1(void)                         = NoOp                     : 
+# 2438|     v2438_8(void)                         = ReturnIndirection[c]     : &:r2438_6, ~m?
+# 2438|     v2438_9(void)                         = ReturnVoid               : 
+# 2438|     v2438_10(void)                        = AliasedUse               : ~m?
+# 2438|     v2438_11(void)                        = ExitFunction             : 
+
+# 2442| void param_with_destructor_by_ref(ClassWithDestructor&)
+# 2442|   Block 0
+# 2442|     v2442_1(void)                         = EnterFunction            : 
+# 2442|     mu2442_2(unknown)                     = AliasedDefinition        : 
+# 2442|     mu2442_3(unknown)                     = InitializeNonLocal       : 
+# 2442|     r2442_4(glval<ClassWithDestructor &>) = VariableAddress[c]       : 
+# 2442|     mu2442_5(ClassWithDestructor &)       = InitializeParameter[c]   : &:r2442_4
+# 2442|     r2442_6(ClassWithDestructor &)        = Load[c]                  : &:r2442_4, ~m?
+# 2442|     mu2442_7(unknown)                     = InitializeIndirection[c] : &:r2442_6
+# 2444|     v2444_1(void)                         = NoOp                     : 
+# 2442|     v2442_8(void)                         = ReturnIndirection[c]     : &:r2442_6, ~m?
+# 2442|     v2442_9(void)                         = ReturnVoid               : 
+# 2442|     v2442_10(void)                        = AliasedUse               : ~m?
+# 2442|     v2442_11(void)                        = ExitFunction             : 
+
+# 2446| void param_with_destructor_by_rref(ClassWithDestructor&&)
+# 2446|   Block 0
+# 2446|     v2446_1(void)                          = EnterFunction            : 
+# 2446|     mu2446_2(unknown)                      = AliasedDefinition        : 
+# 2446|     mu2446_3(unknown)                      = InitializeNonLocal       : 
+# 2446|     r2446_4(glval<ClassWithDestructor &&>) = VariableAddress[c]       : 
+# 2446|     mu2446_5(ClassWithDestructor &&)       = InitializeParameter[c]   : &:r2446_4
+# 2446|     r2446_6(ClassWithDestructor &&)        = Load[c]                  : &:r2446_4, ~m?
+# 2446|     mu2446_7(unknown)                      = InitializeIndirection[c] : &:r2446_6
+# 2448|     v2448_1(void)                          = NoOp                     : 
+# 2446|     v2446_8(void)                          = ReturnIndirection[c]     : &:r2446_6, ~m?
+# 2446|     v2446_9(void)                          = ReturnVoid               : 
+# 2446|     v2446_10(void)                         = AliasedUse               : ~m?
+# 2446|     v2446_11(void)                         = ExitFunction             : 
+
 perf-regression.cpp:
 #    6| void Big::Big()
 #    6|   Block 0

From 8cb6598f508a49848027fa1b8a5f583aef10f566 Mon Sep 17 00:00:00 2001
From: erik-krogh <erik-krogh@github.com>
Date: Mon, 8 Apr 2024 20:51:19 +0200
Subject: [PATCH 105/136] fixing that I put a type on the wrong thing in the
 alert-message

---
 java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql     | 4 ++--
 .../CWE-190/semmle/tests/InformationLoss.expected         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql
index e8893f3bcc7..7d97af12b71 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.ql	
@@ -45,5 +45,5 @@ where
     v = a.getDest()
   )
 select a,
-  "Implicit cast of $@ to narrower destination type " + a.getDest().getType().getName() + ".", v,
-  "source type " + e.getType().getName()
+  "Implicit cast of source type " + e.getType().getName() + " to narrower destination type $@.", v,
+  a.getDest().getType().getName()
diff --git a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
index dbda11bff08..e317375c199 100644
--- a/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
+++ b/java/ql/test/query-tests/security/CWE-190/semmle/tests/InformationLoss.expected
@@ -1,4 +1,4 @@
-| Test.java:68:5:68:25 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:64:4:64:13 | int i | source type long |
-| Test.java:87:4:87:9 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:81:4:81:13 | int i | source type long |
-| Test.java:289:5:289:30 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:285:4:285:27 | int[] arr | source type long |
-| Test.java:293:7:293:44 | ...+=... | Implicit cast of $@ to narrower destination type int. | Test.java:293:7:293:24 | ...[...] | source type long |
+| Test.java:68:5:68:25 | ...+=... | Implicit cast of source type long to narrower destination type $@. | Test.java:64:4:64:13 | int i | int |
+| Test.java:87:4:87:9 | ...+=... | Implicit cast of source type long to narrower destination type $@. | Test.java:81:4:81:13 | int i | int |
+| Test.java:289:5:289:30 | ...+=... | Implicit cast of source type long to narrower destination type $@. | Test.java:285:4:285:27 | int[] arr | int |
+| Test.java:293:7:293:44 | ...+=... | Implicit cast of source type long to narrower destination type $@. | Test.java:293:7:293:24 | ...[...] | int |

From c389611e5c5860637fcce06834c57e4d0c217d53 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 8 Apr 2024 17:07:48 +0100
Subject: [PATCH 106/136] C++: Add spurious dataflow test.

---
 .../dataflow-consistency.expected             |  8 +++++++
 .../dataflow-tests/test-source-sink.expected  |  2 ++
 .../dataflow/dataflow-tests/test.cpp          | 24 ++++++++++++++++++-
 .../dataflow-tests/type-bugs.expected         |  1 +
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
index fa6958d92ea..109f5ffebd1 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
@@ -33,6 +33,7 @@ argHasPostUpdate
 | test.cpp:67:29:67:35 | source1 | ArgumentNode is missing PostUpdateNode. |
 | test.cpp:813:19:813:35 | * ... | ArgumentNode is missing PostUpdateNode. |
 | test.cpp:848:23:848:25 | rpx | ArgumentNode is missing PostUpdateNode. |
+| test.cpp:1057:19:1057:21 | * ... | ArgumentNode is missing PostUpdateNode. |
 postWithInFlow
 | BarrierGuard.cpp:49:6:49:6 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | BarrierGuard.cpp:60:7:60:7 | x [post update] | PostUpdateNode should not be the target of local flow. |
@@ -168,6 +169,13 @@ postWithInFlow
 | test.cpp:1045:9:1045:11 | ref arg buf | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1051:5:1051:11 | content [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1052:9:1052:9 | a [inner post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1056:5:1056:7 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1056:6:1056:7 | pp [inner post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1062:53:1062:53 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1072:3:1072:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1072:4:1072:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1073:3:1073:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
+| test.cpp:1073:4:1073:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 viableImplInCallContextTooLarge
 uniqueParameterNodeAtPosition
 uniqueParameterNodePosition
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
index e03ee68b8a3..ada532793c4 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
@@ -310,6 +310,8 @@ irFlow
 | test.cpp:1021:18:1021:32 | *call to indirect_source | test.cpp:1027:19:1027:28 | *translated |
 | test.cpp:1021:18:1021:32 | *call to indirect_source | test.cpp:1031:19:1031:28 | *translated |
 | test.cpp:1045:14:1045:19 | call to source | test.cpp:1046:7:1046:10 | * ... |
+| test.cpp:1061:15:1061:38 | *call to indirect_source | test.cpp:1057:19:1057:21 | ** ... |
+| test.cpp:1072:8:1072:13 | call to source | test.cpp:1074:8:1074:9 | * ... |
 | true_upon_entry.cpp:9:11:9:16 | call to source | true_upon_entry.cpp:13:8:13:8 | x |
 | true_upon_entry.cpp:17:11:17:16 | call to source | true_upon_entry.cpp:21:8:21:8 | x |
 | true_upon_entry.cpp:27:9:27:14 | call to source | true_upon_entry.cpp:29:8:29:8 | x |
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
index b2bff6327c5..5e3b502468b 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
@@ -1050,4 +1050,26 @@ void flow_out_of_address_with_local_flow() {
   MyStruct a;
   a.content = nullptr;
   sink(&a); // $ SPURIOUS: ast
-}
\ No newline at end of file
+}
+
+static void static_func_that_reassigns_pointer_before_sink(char** pp) { // $ ast-def=pp ir-def=*pp ir-def=**pp
+    *pp = "";
+    indirect_sink(*pp); // $ SPURIOUS: ir
+}
+
+void test_static_func_that_reassigns_pointer_before_sink() {
+    char* p = (char*)indirect_source();
+    static_func_that_reassigns_pointer_before_sink(&p);
+}
+
+void single_object_in_both_cases(bool b, int x, int y) {
+  int* p;
+  if(b) {
+    p = &x;
+  } else {
+    p = &y;
+  }
+  *p = source();
+  *p = 0;
+  sink(*p); // $ SPURIOUS: ir
+}
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
index 6706d79e902..4d87c2da534 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
@@ -15,4 +15,5 @@ incorrectBaseType
 | test.cpp:848:23:848:25 | (reference dereference) | Expected 'Node.getType()' to be int, but it was int * |
 | test.cpp:854:10:854:36 | * ... | Expected 'Node.getType()' to be const int, but it was int |
 | test.cpp:867:10:867:30 | * ... | Expected 'Node.getType()' to be const int, but it was int |
+| test.cpp:1062:52:1062:53 | *& ... | Expected 'Node.getType()' to be char, but it was char * |
 failures

From b2002a981a6f6a9f2d69dfd38bfd9cc8c58f3eb0 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 8 Apr 2024 17:08:05 +0100
Subject: [PATCH 107/136] C++: Use the shared typeflow library to determine
 whether a pointer points to a buffer or an object.

---
 cpp/ql/lib/qlpack.yml                         |   1 +
 .../dataflow/internal/SsaInternalsCommon.qll  |   7 +-
 .../cpp/ir/dataflow/internal/TypeFlow.qll     | 259 ++++++++++++++++++
 3 files changed, 262 insertions(+), 5 deletions(-)
 create mode 100644 cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll

diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 8d15b6d142a..27529f55a29 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -9,6 +9,7 @@ dependencies:
   codeql/dataflow: ${workspace}
   codeql/rangeanalysis: ${workspace}
   codeql/ssa: ${workspace}
+  codeql/typeflow: ${workspace}
   codeql/tutorial: ${workspace}
   codeql/util: ${workspace}
   codeql/xml: ${workspace}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
index 862070820f8..7e5b4de8122 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
@@ -6,6 +6,7 @@ private import DataFlowImplCommon as DataFlowImplCommon
 private import DataFlowUtil
 private import semmle.code.cpp.models.interfaces.PointerWrapper
 private import DataFlowPrivate
+private import TypeFlow
 private import semmle.code.cpp.ir.ValueNumbering
 
 /**
@@ -955,11 +956,7 @@ private module Cached {
    * Holds if the address computed by `operand` is guaranteed to write
    * to a specific address.
    */
-  private predicate isCertainAddress(Operand operand) {
-    valueNumberOfOperand(operand).getAnInstruction() instanceof VariableAddressInstruction
-    or
-    operand.getType() instanceof Cpp::ReferenceType
-  }
+  private predicate isCertainAddress(Operand operand) { isPointerToSingleObject(operand.getDef()) }
 
   /**
    * Holds if `address` is a use of an SSA variable rooted at `base`, and the
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
new file mode 100644
index 00000000000..44f2e60daac
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
@@ -0,0 +1,259 @@
+private import cpp
+private import semmle.code.cpp.ir.IR
+private import codeql.typeflow.TypeFlow
+
+private module Input implements TypeFlowInput<Location> {
+  private predicate hasExactSingleType(Instruction i) {
+    // The address of a variable is always a single object
+    i instanceof VariableAddressInstruction
+    or
+    // A reference always points to a always a single object
+    i.getResultLanguageType().hasUnspecifiedType(any(ReferenceType rt), false)
+    or
+    // `this` is never an array
+    i instanceof InitializeThisInstruction
+    or
+    // An allocation of a non-array object
+    exists(AllocationExpr alloc | alloc = i.getUnconvertedResultExpression() |
+      // i.e., `new int`;
+      alloc instanceof NewExpr
+      or
+      // i.e., `malloc(sizeof(int))`
+      exists(SizeofTypeOperator sizeOf | sizeOf = alloc.getSizeExpr() |
+        not sizeOf.getTypeOperand().getUnspecifiedType() instanceof ArrayType
+      )
+    )
+  }
+
+  private predicate hasExactBufferType(Instruction i) {
+    // Anything with an array type is a buffer
+    i.getResultLanguageType().hasUnspecifiedType(any(ArrayType at), false)
+    or
+    not hasExactSingleType(i) and
+    i.getUnconvertedResultExpression() instanceof AllocationExpr
+  }
+
+  private newtype TTypeFlowNode =
+    TInstructionNode(Instruction i) or
+    TFunctionNode(IRFunction func)
+
+  abstract class TypeFlowNode extends TTypeFlowNode {
+    /** Gets a textual representation of this node. */
+    abstract string toString();
+
+    /**
+     * Gets the type of this node. This type may not be the most precise
+     * possible type, but will be used as a starting point of the analysis.
+     */
+    abstract Type getType();
+
+    /** Gets the location of this node. */
+    abstract Location getLocation();
+
+    /** Gets the underlying `Instruction` of this node, if any. */
+    Instruction asInstruction() { none() }
+
+    /** Gets the underlying `IRFunction` of this node, if any. */
+    IRFunction asFunction() { none() }
+
+    /** Holds if the value of this node is always null. */
+    abstract predicate isNullValue();
+  }
+
+  private class InstructionNode extends TypeFlowNode, TInstructionNode {
+    Instruction instr;
+
+    InstructionNode() { this = TInstructionNode(instr) }
+
+    override string toString() { result = instr.toString() }
+
+    override Type getType() {
+      if hasExactSingleType(instr) then result.isSingle() else result.isBuffer()
+    }
+
+    override Location getLocation() { result = instr.getLocation() }
+
+    override Instruction asInstruction() { result = instr }
+
+    override predicate isNullValue() {
+      instr.(ConstantInstruction).getValue() = "0" and
+      instr.getResultIRType() instanceof IRAddressType
+    }
+  }
+
+  /** Gets the `TypeFlowNode` corresponding to `i`. */
+  additional InstructionNode instructionNode(Instruction i) { result.asInstruction() = i }
+
+  private class FunctionNode extends TypeFlowNode, TFunctionNode {
+    IRFunction func;
+
+    FunctionNode() { this = TFunctionNode(func) }
+
+    override string toString() { result = func.toString() }
+
+    Instruction getReturnValueInstruction() {
+      result = func.getReturnInstruction().(ReturnValueInstruction).getReturnValue()
+    }
+
+    override Type getType() { result = instructionNode(this.getReturnValueInstruction()).getType() }
+
+    override Location getLocation() { result = func.getLocation() }
+
+    override IRFunction asFunction() { result = func }
+
+    override predicate isNullValue() {
+      instructionNode(this.getReturnValueInstruction()).isNullValue()
+    }
+  }
+
+  /**
+   * Gets an ultimiate definition of `phi`. That is, an input to `phi` that is
+   * not itself a `PhiInstruction`.
+   */
+  private Instruction getAnUltimateLocalDefinition(PhiInstruction phi) {
+    result = phi.getAnInput*() and not result instanceof PhiInstruction
+  }
+
+  /**
+   * Holds if this function is private (i.e., cannot be accessed outside its
+   * compilation unit). This means we can use a closed-world assumption about
+   * calls to this function.
+   */
+  private predicate isPrivate(Function func) {
+    func.isStatic()
+    or
+    func.getNamespace().getParentNamespace*().isInline()
+    or
+    func.(MemberFunction).isPrivate()
+  }
+
+  /**
+   * Holds if `arg` is an argument for the parameter `p` in a private callable.
+   */
+  pragma[nomagic]
+  private predicate privateParamArg(InitializeParameterInstruction p, Instruction arg) {
+    exists(CallInstruction call, int i, Function func |
+      call.getArgument(pragma[only_bind_into](i)) = arg and
+      func = call.getStaticCallTarget() and
+      func.getParameter(pragma[only_bind_into](i)) = p.getParameter() and
+      isPrivate(func)
+    )
+  }
+
+  predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
+    // instruction -> phi
+    getAnUltimateLocalDefinition(n2.asInstruction()) = n1.asInstruction()
+    or
+    // return value -> function
+    n2.(FunctionNode).getReturnValueInstruction() = n1.asInstruction()
+    or
+    // function -> call
+    exists(Function func | func = n1.asFunction().getFunction() |
+      not func.isVirtual() and
+      n2.asInstruction().(CallInstruction).getStaticCallTarget() = func
+    )
+    or
+    // Argument -> parameter where the parameter's enclosing function
+    // is "private".
+    exists(Instruction arg, Instruction p |
+      privateParamArg(p, arg) and
+      n1.asInstruction() = arg and
+      n2.asInstruction() = p
+    )
+  }
+
+  /**
+   * Holds if knowing whether `i1` points to a single object or buffer implies
+   * knowing whether `i2` points to a single object or buffer.
+   */
+  private predicate instructionStep(Instruction i1, Instruction i2) {
+    i2.(CopyInstruction).getSourceValue() = i1
+    or
+    i2.(CopyValueInstruction).getSourceValue() = i1
+    or
+    i2.(ConvertInstruction).getUnary() = i1
+    or
+    i2.(CheckedConvertOrNullInstruction).getUnary() = i1
+    or
+    i2.(InheritanceConversionInstruction).getUnary() = i1
+    or
+    i2.(PointerArithmeticInstruction).getLeft() = i1
+  }
+
+  predicate step(TypeFlowNode n1, TypeFlowNode n2) {
+    instructionStep(n1.asInstruction(), n2.asInstruction())
+  }
+
+  predicate isNullValue(TypeFlowNode n) { n.isNullValue() }
+
+  private newtype TType =
+    TSingle() or
+    TBuffer()
+
+  class Type extends TType {
+    string toString() {
+      this.isSingle() and
+      result = "Single"
+      or
+      this.isBuffer() and
+      result = "Buffer"
+    }
+
+    /** Holds if this type is the type that represents a single object. */
+    predicate isSingle() { this = TSingle() }
+
+    /** Holds if this type is the type that represents a buffer. */
+    predicate isBuffer() { this = TBuffer() }
+
+    /**
+     * Gets a super type of this type, if any.
+     *
+     * The type relation is `Single <: Buffer`.
+     */
+    Type getASupertype() {
+      this.isSingle() and
+      result.isBuffer()
+    }
+  }
+
+  predicate exactTypeBase(TypeFlowNode n, Type t) {
+    exists(Instruction instr | instr = n.asInstruction() |
+      hasExactSingleType(instr) and t.isSingle()
+      or
+      hasExactBufferType(instr) and t.isBuffer()
+    )
+  }
+
+  pragma[nomagic]
+  private predicate upcastCand(TypeFlowNode n, Type t1, Type t2) {
+    exists(TypeFlowNode next |
+      step(n, next)
+      or
+      joinStep(n, next)
+    |
+      n.getType() = t1 and
+      next.getType() = t2 and
+      t1 != t2
+    )
+  }
+
+  private predicate upcast(TypeFlowNode n, Type t1) {
+    exists(Type t2 | upcastCand(n, t1, t2) |
+      // No need for transitive closure since the subtyping relation is just `Single <: Buffer`
+      t1.getASupertype() = t2
+    )
+  }
+
+  predicate typeFlowBaseCand(TypeFlowNode n, Type t) { upcast(n, t) }
+}
+
+private module TypeFlow = Make<Location, Input>;
+
+/**
+ * Holds if `i` is an instruction that computes an address that points to a
+ * single object (as opposed to pointing into a buffer).
+ */
+pragma[nomagic]
+predicate isPointerToSingleObject(Instruction i) {
+  TypeFlow::bestTypeFlow(Input::instructionNode(i), any(Input::Type t | t.isSingle()), _)
+}

From 386580fc94750a0036d0b27e21ff05d86dacdb2c Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Mon, 8 Apr 2024 17:10:18 +0100
Subject: [PATCH 108/136] C++: Accept test changes.

---
 .../dataflow/dataflow-tests/test-source-sink.expected         | 2 --
 cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
index ada532793c4..e03ee68b8a3 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
@@ -310,8 +310,6 @@ irFlow
 | test.cpp:1021:18:1021:32 | *call to indirect_source | test.cpp:1027:19:1027:28 | *translated |
 | test.cpp:1021:18:1021:32 | *call to indirect_source | test.cpp:1031:19:1031:28 | *translated |
 | test.cpp:1045:14:1045:19 | call to source | test.cpp:1046:7:1046:10 | * ... |
-| test.cpp:1061:15:1061:38 | *call to indirect_source | test.cpp:1057:19:1057:21 | ** ... |
-| test.cpp:1072:8:1072:13 | call to source | test.cpp:1074:8:1074:9 | * ... |
 | true_upon_entry.cpp:9:11:9:16 | call to source | true_upon_entry.cpp:13:8:13:8 | x |
 | true_upon_entry.cpp:17:11:17:16 | call to source | true_upon_entry.cpp:21:8:21:8 | x |
 | true_upon_entry.cpp:27:9:27:14 | call to source | true_upon_entry.cpp:29:8:29:8 | x |
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
index 5e3b502468b..af9e18034ed 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
@@ -1054,7 +1054,7 @@ void flow_out_of_address_with_local_flow() {
 
 static void static_func_that_reassigns_pointer_before_sink(char** pp) { // $ ast-def=pp ir-def=*pp ir-def=**pp
     *pp = "";
-    indirect_sink(*pp); // $ SPURIOUS: ir
+    indirect_sink(*pp); // clean
 }
 
 void test_static_func_that_reassigns_pointer_before_sink() {
@@ -1071,5 +1071,5 @@ void single_object_in_both_cases(bool b, int x, int y) {
   }
   *p = source();
   *p = 0;
-  sink(*p); // $ SPURIOUS: ir
+  sink(*p); // clean
 }

From e3d676f91bdac5130e5bcfc83c90b85c3715749f Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@github.com>
Date: Tue, 9 Apr 2024 09:37:21 +0200
Subject: [PATCH 109/136] CI: apply tentative `setup-swift` fix

---
 swift/actions/run-integration-tests/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swift/actions/run-integration-tests/action.yml b/swift/actions/run-integration-tests/action.yml
index 2c6df4e2b51..fe5a20b02bd 100644
--- a/swift/actions/run-integration-tests/action.yml
+++ b/swift/actions/run-integration-tests/action.yml
@@ -7,7 +7,7 @@ runs:
     - uses: actions/setup-python@v4
       with:
         python-version-file: 'swift/.python-version'
-    - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
+    - uses: redsun82/setup-swift@b2b6f77ab14f6a9b136b520dc53ec8eca27d2b99
       with:
         swift-version: "5.8"
     - uses: ./.github/actions/fetch-codeql

From 80995ec1d76b645097159a140e5d44148bb77b25 Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Tue, 9 Apr 2024 09:51:45 +0200
Subject: [PATCH 110/136] Improve comments on environment variable names

---
 .../EnvironmentVariableNames.cs                               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
index ddec97d3dde..9141dc0bf74 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/EnvironmentVariableNames.cs
@@ -23,12 +23,12 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         public const string CheckNugetFeedResponsiveness = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK";
 
         /// <summary>
-        /// Specifies the NuGet feeds to exclude from the responsiveness check.
+        /// Specifies the NuGet feeds to exclude from the responsiveness check. The value is a space-separated list of feed URLs.
         /// </summary>
         public const string ExcludedNugetFeedsFromResponsivenessCheck = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_EXCLUDED";
 
         /// <summary>
-        /// Specifies the timeout for the initial check of NuGet feeds responsiveness.
+        /// Specifies the timeout (as an integer) in milliseconds for the initial check of NuGet feeds responsiveness. The value is then doubled for each subsequent check.
         /// </summary>
         public const string NugetFeedResponsivenessInitialTimeout = "CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_TIMEOUT";
 

From e6984aa865e23a48215c7280258af247892db8b6 Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Tue, 9 Apr 2024 10:10:25 +0200
Subject: [PATCH 111/136] Ruby: Remove two redundant `allowImplicitRead`
 predicates

---
 .../codeql/ruby/security/UnsafeCodeConstructionQuery.qll    | 6 ------
 .../ruby/security/UnsafeShellCommandConstructionQuery.qll   | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll
index 4cf57f36071..32cc9a4f821 100644
--- a/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll
@@ -46,12 +46,6 @@ private module UnsafeCodeConstructionConfig implements DataFlow::ConfigSig {
 
   // override to require the path doesn't have unmatched return steps
   DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSourceCallContext }
-
-  predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet set) {
-    // allow implicit reads of array elements
-    isSink(node) and
-    set.isElementOfTypeOrUnknown("int")
-  }
 }
 
 /**
diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll
index 7576702a2d4..b4e0b8b6bb5 100644
--- a/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll
@@ -49,12 +49,6 @@ private module UnsafeShellCommandConstructionConfig implements DataFlow::ConfigS
 
   // override to require the path doesn't have unmatched return steps
   DataFlow::FlowFeature getAFeature() { result instanceof DataFlow::FeatureHasSourceCallContext }
-
-  predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet set) {
-    // allow implicit reads of array elements
-    isSink(node) and
-    set.isElementOfTypeOrUnknown("int")
-  }
 }
 
 /**

From 10d96ee02f6fa0e84693135ffb830acc35d2cb8e Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Tue, 9 Apr 2024 10:31:48 +0200
Subject: [PATCH 112/136] C#: Address review comments.

---
 .../diag_recursive_generics/Types.ql            |  7 +++----
 csharp/ql/lib/semmle/code/csharp/Element.qll    |  2 ++
 .../ql/lib/semmle/code/csharp/dataflow/SSA.qll  |  8 +-------
 .../attributes/AttributeElements.ql             |  8 +++-----
 .../library-tests/constructors/Destructors1.ql  |  3 +--
 .../test/library-tests/csharp11/fileScoped.ql   |  6 +-----
 .../ql/test/library-tests/csharp11/nativeInt.ql |  6 ++----
 .../library-tests/csharp9/covariantReturn.ql    | 13 ++++---------
 csharp/ql/test/library-tests/csharp9/foreach.ql | 17 ++++++-----------
 csharp/ql/test/library-tests/csharp9/record.ql  | 10 +---------
 .../ql/test/library-tests/csharp9/withExpr.ql   | 14 +++-----------
 csharp/ql/test/library-tests/enums/Enums3.ql    |  8 +++-----
 .../ql/test/library-tests/generics/Generics.ql  | 12 ++++--------
 13 files changed, 34 insertions(+), 80 deletions(-)

diff --git a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql
index fff011dcbd5..de95e0fcbe7 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql
+++ b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql
@@ -1,6 +1,5 @@
 import csharp
-import semmle.code.csharp.commons.QualifiedName
 
-from Class c, string qualifier, string name
-where c.fromSource() and c.getBaseClass().hasFullyQualifiedName(qualifier, name)
-select c, getQualifiedName(qualifier, name)
+from Class c
+where c.fromSource()
+select c, c.getBaseClass().getFullyQualifiedNameDebug()
diff --git a/csharp/ql/lib/semmle/code/csharp/Element.qll b/csharp/ql/lib/semmle/code/csharp/Element.qll
index f8cb018be68..a48241a1408 100644
--- a/csharp/ql/lib/semmle/code/csharp/Element.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Element.qll
@@ -145,6 +145,8 @@ class NamedElement extends Element, @named_element {
    * Unbound generic types, such as `IList<T>`, are represented as
    * ``System.Collections.Generic.IList`1``.
    */
+  bindingset[this]
+  pragma[inline_late]
   final string getFullyQualifiedNameDebug() {
     exists(string qualifier, string name | this.hasFullyQualifiedName(qualifier, name) |
       if qualifier = "" then result = name else result = qualifier + "." + name
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
index 9cd33ea260f..0d79eafdf5c 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
@@ -3,7 +3,6 @@
  */
 
 import csharp
-private import semmle.code.csharp.commons.QualifiedName
 
 /**
  * Provides classes for working with static single assignment (SSA) form.
@@ -121,12 +120,7 @@ module Ssa {
           result = prefix + "." + this.getAssignable()
         |
           if f.(Modifiable).isStatic()
-          then
-            exists(string qualifier, string name |
-              f.getDeclaringType().hasFullyQualifiedName(qualifier, name)
-            |
-              prefix = getQualifiedName(qualifier, name)
-            )
+          then prefix = f.getDeclaringType().getName()
           else prefix = "this"
         )
       }
diff --git a/csharp/ql/test/library-tests/attributes/AttributeElements.ql b/csharp/ql/test/library-tests/attributes/AttributeElements.ql
index 17ce2ea3d93..679d7567ea5 100644
--- a/csharp/ql/test/library-tests/attributes/AttributeElements.ql
+++ b/csharp/ql/test/library-tests/attributes/AttributeElements.ql
@@ -1,9 +1,7 @@
 import csharp
-import semmle.code.csharp.commons.QualifiedName
 
-from Attributable element, Attribute attribute, string qualifier, string name
+from Attributable element, Attribute attribute
 where
   attribute = element.getAnAttribute() and
-  (attribute.fromSource() or element.(Assembly).getName() in ["attributes", "Assembly1"]) and
-  attribute.getType().hasFullyQualifiedName(qualifier, name)
-select element, attribute, getQualifiedName(qualifier, name)
+  (attribute.fromSource() or element.(Assembly).getName() in ["attributes", "Assembly1"])
+select element, attribute, attribute.getType().getFullyQualifiedNameDebug()
diff --git a/csharp/ql/test/library-tests/constructors/Destructors1.ql b/csharp/ql/test/library-tests/constructors/Destructors1.ql
index 673a0e941f0..792d50da7bb 100644
--- a/csharp/ql/test/library-tests/constructors/Destructors1.ql
+++ b/csharp/ql/test/library-tests/constructors/Destructors1.ql
@@ -3,11 +3,10 @@
  */
 
 import csharp
-import semmle.code.csharp.commons.QualifiedName
 
 from Destructor c, string qualifier, string name
 where
   c.getDeclaringType().hasFullyQualifiedName(qualifier, name) and
   qualifier = "Constructors" and
   name = "Class"
-select c, getQualifiedName(qualifier, name)
+select c, c.getDeclaringType().getFullyQualifiedNameDebug()
diff --git a/csharp/ql/test/library-tests/csharp11/fileScoped.ql b/csharp/ql/test/library-tests/csharp11/fileScoped.ql
index 3003fc801bf..33697255896 100644
--- a/csharp/ql/test/library-tests/csharp11/fileScoped.ql
+++ b/csharp/ql/test/library-tests/csharp11/fileScoped.ql
@@ -1,5 +1,4 @@
 import csharp
-private import semmle.code.csharp.commons.QualifiedName
 
 private predicate isInteresting(Type t) {
   (
@@ -20,10 +19,7 @@ query predicate typemodifiers(Type t, string modifier) {
 
 query predicate qualifiedtypes(Type t, string qualifiedName) {
   isInteresting(t) and
-  exists(string qualifier, string name |
-    t.hasFullyQualifiedName(qualifier, name) and
-    qualifiedName = getQualifiedName(qualifier, name)
-  )
+  qualifiedName = t.getFullyQualifiedNameDebug()
 }
 
 query predicate filetypes(Type t) {
diff --git a/csharp/ql/test/library-tests/csharp11/nativeInt.ql b/csharp/ql/test/library-tests/csharp11/nativeInt.ql
index 80d7974de56..adbc062baf6 100644
--- a/csharp/ql/test/library-tests/csharp11/nativeInt.ql
+++ b/csharp/ql/test/library-tests/csharp11/nativeInt.ql
@@ -1,12 +1,10 @@
 import csharp
-import semmle.code.csharp.commons.QualifiedName
 
-from LocalVariable v1, LocalVariable v2, Type t, string qualifier, string name
+from LocalVariable v1, LocalVariable v2, Type t
 where
   v1.getFile().getStem() = "NativeInt" and
   v2.getFile().getStem() = "NativeInt" and
   t = v1.getType() and
   t = v2.getType() and
-  t.hasFullyQualifiedName(qualifier, name) and
   v1 != v2
-select v1, v2, getQualifiedName(qualifier, name)
+select v1, v2, t.getFullyQualifiedNameDebug()
diff --git a/csharp/ql/test/library-tests/csharp9/covariantReturn.ql b/csharp/ql/test/library-tests/csharp9/covariantReturn.ql
index 6227ed18d6d..b4bab047322 100644
--- a/csharp/ql/test/library-tests/csharp9/covariantReturn.ql
+++ b/csharp/ql/test/library-tests/csharp9/covariantReturn.ql
@@ -1,13 +1,8 @@
 import csharp
-import semmle.code.csharp.commons.QualifiedName
 
-from
-  Method m, Method overrider, string mnamespace, string mtype, string mname, string onamespace,
-  string otype, string oname
+from Method m, Method overrider
 where
   m.getAnOverrider() = overrider and
-  m.getFile().getStem() = "CovariantReturn" and
-  m.hasFullyQualifiedName(mnamespace, mtype, mname) and
-  overrider.hasFullyQualifiedName(onamespace, otype, oname)
-select getQualifiedName(mnamespace, mtype, mname), m.getReturnType().toString(),
-  getQualifiedName(onamespace, otype, oname), overrider.getReturnType().toString()
+  m.getFile().getStem() = "CovariantReturn"
+select m.getFullyQualifiedNameDebug(), m.getReturnType().toString(),
+  overrider.getFullyQualifiedNameDebug(), overrider.getReturnType().toString()
diff --git a/csharp/ql/test/library-tests/csharp9/foreach.ql b/csharp/ql/test/library-tests/csharp9/foreach.ql
index cf6fcf2514a..343ecc556ab 100644
--- a/csharp/ql/test/library-tests/csharp9/foreach.ql
+++ b/csharp/ql/test/library-tests/csharp9/foreach.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.commons.QualifiedName
 
 private string getLocation(Member m) {
   if m.fromSource() then result = m.getALocation().(SourceLocation).toString() else result = "-"
@@ -9,13 +8,9 @@ private string getIsAsync(ForeachStmt f) {
   if f.isAsync() then result = "async" else result = "sync"
 }
 
-from
-  ForeachStmt f, string qualifier1, string type1, string qualifier2, string type2,
-  string qualifier3, string type3
-where
-  f.getGetEnumerator().getDeclaringType().hasFullyQualifiedName(qualifier1, type1) and
-  f.getCurrent().getDeclaringType().hasFullyQualifiedName(qualifier2, type2) and
-  f.getMoveNext().getDeclaringType().hasFullyQualifiedName(qualifier3, type3)
-select f, f.getElementType().toString(), getIsAsync(f), getQualifiedName(qualifier1, type1),
-  getLocation(f.getGetEnumerator()), getQualifiedName(qualifier2, type2),
-  getLocation(f.getCurrent()), getQualifiedName(qualifier3, type3), getLocation(f.getMoveNext())
+from ForeachStmt f
+select f, f.getElementType().toString(), getIsAsync(f),
+  f.getGetEnumerator().getDeclaringType().getFullyQualifiedNameDebug(),
+  getLocation(f.getGetEnumerator()), f.getCurrent().getDeclaringType().getFullyQualifiedNameDebug(),
+  getLocation(f.getCurrent()), f.getMoveNext().getDeclaringType().getFullyQualifiedNameDebug(),
+  getLocation(f.getMoveNext())
diff --git a/csharp/ql/test/library-tests/csharp9/record.ql b/csharp/ql/test/library-tests/csharp9/record.ql
index a2a9a9c0786..58cf579bac6 100644
--- a/csharp/ql/test/library-tests/csharp9/record.ql
+++ b/csharp/ql/test/library-tests/csharp9/record.ql
@@ -7,18 +7,10 @@ query predicate records(RecordClass t, string i, RecordCloneMethod clone) {
   t.fromSource()
 }
 
-private string getMemberName(Member m) {
-  exists(string qualifier, string name |
-    m.getDeclaringType().hasFullyQualifiedName(qualifier, name)
-  |
-    result = getQualifiedName(qualifier, name) + "." + m.toStringWithTypes()
-  )
-}
-
 query predicate members(RecordClass t, string ms, string l) {
   t.fromSource() and
   exists(Member m | t.hasMember(m) |
-    ms = getMemberName(m) and
+    ms = getFullyQualifiedNameWithTypes(m) and
     if m.fromSource() then l = m.getLocation().toString() else l = "no location"
   )
 }
diff --git a/csharp/ql/test/library-tests/csharp9/withExpr.ql b/csharp/ql/test/library-tests/csharp9/withExpr.ql
index 6683d7c54f6..564cbe529aa 100644
--- a/csharp/ql/test/library-tests/csharp9/withExpr.ql
+++ b/csharp/ql/test/library-tests/csharp9/withExpr.ql
@@ -1,19 +1,11 @@
 import csharp
 import semmle.code.csharp.commons.QualifiedName
 
-private string getSignature(Method m) {
-  exists(string qualifier, string name |
-    m.getDeclaringType().hasFullyQualifiedName(qualifier, name)
-  |
-    result = getQualifiedName(qualifier, name) + "." + m.toStringWithTypes()
-  )
-}
-
 query predicate withExpr(WithExpr with, string type, Expr expr, ObjectInitializer init, string clone) {
   type = with.getType().toStringWithTypes() and
   expr = with.getExpr() and
   init = with.getInitializer() and
-  clone = getSignature(with.getCloneMethod())
+  clone = getFullyQualifiedNameWithTypes(with.getCloneMethod())
 }
 
 query predicate withTarget(WithExpr with, RecordCloneMethod clone, Constructor ctor) {
@@ -25,7 +17,7 @@ query predicate cloneOverrides(string b, string o) {
   exists(RecordCloneMethod base, RecordCloneMethod overrider |
     base.getDeclaringType().fromSource() and
     base.getAnOverrider() = overrider and
-    b = getSignature(base) and
-    o = getSignature(overrider)
+    b = getFullyQualifiedNameWithTypes(base) and
+    o = getFullyQualifiedNameWithTypes(overrider)
   )
 }
diff --git a/csharp/ql/test/library-tests/enums/Enums3.ql b/csharp/ql/test/library-tests/enums/Enums3.ql
index 5cfbdc56193..b01ffb97e18 100644
--- a/csharp/ql/test/library-tests/enums/Enums3.ql
+++ b/csharp/ql/test/library-tests/enums/Enums3.ql
@@ -3,13 +3,11 @@
  */
 
 import csharp
-import semmle.code.csharp.commons.QualifiedName
 
-from EnumConstant c, string namespace, string name
+from EnumConstant c
 where
   c.getName() = "Green" and
   c.getDeclaringType().hasFullyQualifiedName("Enums", "LongColor") and
   c.getType() = c.getDeclaringType() and
-  c.getValue() = "1" and
-  c.getDeclaringType().getBaseClass().hasFullyQualifiedName(namespace, name)
-select c, getQualifiedName(namespace, name)
+  c.getValue() = "1"
+select c, c.getDeclaringType().getBaseClass().getFullyQualifiedNameDebug()
diff --git a/csharp/ql/test/library-tests/generics/Generics.ql b/csharp/ql/test/library-tests/generics/Generics.ql
index 71e21a5815e..e75f1fdc908 100644
--- a/csharp/ql/test/library-tests/generics/Generics.ql
+++ b/csharp/ql/test/library-tests/generics/Generics.ql
@@ -268,16 +268,12 @@ query predicate test33(ConstructedMethod cm, string s1, string s2) {
 
 query predicate test34(UnboundGeneric ug, string s1, string s2) {
   ug.fromSource() and
-  exists(string qualifier, string name |
-    ug.hasFullyQualifiedName(qualifier, name) and s1 = getQualifiedName(qualifier, name)
-  ) and
-  getFullyQualifiedNameWithTypes(ug) = s2
+  s1 = ug.getFullyQualifiedNameDebug() and
+  s2 = getFullyQualifiedNameWithTypes(ug)
 }
 
 query predicate test35(UnboundGenericMethod gm, string s1, string s2) {
   gm.fromSource() and
-  exists(string namespace, string type, string name |
-    gm.hasFullyQualifiedName(namespace, type, name) and s1 = getQualifiedName(namespace, type, name)
-  ) and
-  getFullyQualifiedNameWithTypes(gm) = s2
+  s1 = gm.getFullyQualifiedNameDebug() and
+  s2 = getFullyQualifiedNameWithTypes(gm)
 }

From 8c2455fc113f3d0ee91b5d264c96782e06a6c274 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Tue, 9 Apr 2024 10:49:30 +0000
Subject: [PATCH 113/136] Python: Disable failing integration tests

These failures were likely caused by
https://github.com/github/codeql/pull/16127

My guess is that they can probably be deleted altogether, but as the
failures are blocking other development, I have opted to simply disable
them for the time being.
---
 .../force-enable-library-extraction/{test.sh => disabled-test.sh} | 0
 .../ignore-venv/{test.sh => disabled-test.sh}                     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename python/extractor/cli-integration-test/force-enable-library-extraction/{test.sh => disabled-test.sh} (100%)
 rename python/extractor/cli-integration-test/ignore-venv/{test.sh => disabled-test.sh} (100%)

diff --git a/python/extractor/cli-integration-test/force-enable-library-extraction/test.sh b/python/extractor/cli-integration-test/force-enable-library-extraction/disabled-test.sh
similarity index 100%
rename from python/extractor/cli-integration-test/force-enable-library-extraction/test.sh
rename to python/extractor/cli-integration-test/force-enable-library-extraction/disabled-test.sh
diff --git a/python/extractor/cli-integration-test/ignore-venv/test.sh b/python/extractor/cli-integration-test/ignore-venv/disabled-test.sh
similarity index 100%
rename from python/extractor/cli-integration-test/ignore-venv/test.sh
rename to python/extractor/cli-integration-test/ignore-venv/disabled-test.sh

From bb4952f5575e71c19473982a0287db8773b4fd5a Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 9 Apr 2024 14:00:25 +0200
Subject: [PATCH 114/136] Revert "Python: Disable failing integration tests"

This reverts commit 8c2455fc113f3d0ee91b5d264c96782e06a6c274.
---
 .../force-enable-library-extraction/{disabled-test.sh => test.sh} | 0
 .../ignore-venv/{disabled-test.sh => test.sh}                     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename python/extractor/cli-integration-test/force-enable-library-extraction/{disabled-test.sh => test.sh} (100%)
 rename python/extractor/cli-integration-test/ignore-venv/{disabled-test.sh => test.sh} (100%)

diff --git a/python/extractor/cli-integration-test/force-enable-library-extraction/disabled-test.sh b/python/extractor/cli-integration-test/force-enable-library-extraction/test.sh
similarity index 100%
rename from python/extractor/cli-integration-test/force-enable-library-extraction/disabled-test.sh
rename to python/extractor/cli-integration-test/force-enable-library-extraction/test.sh
diff --git a/python/extractor/cli-integration-test/ignore-venv/disabled-test.sh b/python/extractor/cli-integration-test/ignore-venv/test.sh
similarity index 100%
rename from python/extractor/cli-integration-test/ignore-venv/disabled-test.sh
rename to python/extractor/cli-integration-test/ignore-venv/test.sh

From a0d6324f685ccfbada6d682379101f6822dfef44 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 9 Apr 2024 14:01:10 +0200
Subject: [PATCH 115/136] Python: Fix ignore-venv integration test

Now that we no longer support the fallback option
(https://github.com/github/codeql/pull/16127)
---
 .../cli-integration-test/ignore-venv/test.sh  | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/python/extractor/cli-integration-test/ignore-venv/test.sh b/python/extractor/cli-integration-test/ignore-venv/test.sh
index e1368008891..8735203ec32 100755
--- a/python/extractor/cli-integration-test/ignore-venv/test.sh
+++ b/python/extractor/cli-integration-test/ignore-venv/test.sh
@@ -17,63 +17,33 @@ mkdir dbs
 # set up venvs
 cd repo_dir
 
+# make venv with some package in it (so we show that our ignore logic is correct)
 python3 -m venv venv
 venv/bin/pip install flask
 
-python3 -m venv venv2
-
 cd "$SCRIPTDIR"
 
-# In 2.16.0 we stop extracting libraries by default, so to test this functionality we
-# need to force enable it. Once we release 2.17.0 and turn off library extraction for
-# good, we can remove the part of this test ensuring that dependencies in an active
-# venv are still extracted (since that will no longer be the case).
-export CODEQL_EXTRACTOR_PYTHON_FORCE_ENABLE_LIBRARY_EXTRACTION_UNTIL_2_17_0=1
-
-# Create DBs with venv2 active (that does not have flask installed)
-source repo_dir/venv2/bin/activate
-
 export CODEQL_EXTRACTOR_PYTHON_DISABLE_AUTOMATIC_VENV_EXCLUDE=
 $CODEQL database create dbs/normal --language python --source-root repo_dir/
 
 export CODEQL_EXTRACTOR_PYTHON_DISABLE_AUTOMATIC_VENV_EXCLUDE=1
 $CODEQL database create dbs/no-venv-ignore --language python --source-root repo_dir/
 
-# Create DB with venv active that has flask installed. We want to ensure that we're
-# still able to resolve imports to flask, but don't want to extract EVERYTHING from
-# within the venv. Important note is that the test-file in the repo_dir actually imports
-# flask :D
-source repo_dir/venv/bin/activate
-export CODEQL_EXTRACTOR_PYTHON_DISABLE_AUTOMATIC_VENV_EXCLUDE=
-$CODEQL database create dbs/normal-with-flask-venv --language python --source-root repo_dir/
-
 # ---
 
 set +x
 
 EXTRACTED_NORMAL=$(unzip -l dbs/normal/src.zip | wc -l)
 EXTRACTED_NO_VENV_IGNORE=$(unzip -l dbs/no-venv-ignore/src.zip | wc -l)
-EXTRACTED_ACTIVE_FLASK=$(unzip -l dbs/normal-with-flask-venv/src.zip | wc -l)
 
 exitcode=0
 
 echo "EXTRACTED_NORMAL=$EXTRACTED_NORMAL"
 echo "EXTRACTED_NO_VENV_IGNORE=$EXTRACTED_NO_VENV_IGNORE"
-echo "EXTRACTED_ACTIVE_FLASK=$EXTRACTED_ACTIVE_FLASK"
 
 if [[ ! $EXTRACTED_NORMAL -lt $EXTRACTED_NO_VENV_IGNORE ]]; then
     echo "ERROR: EXTRACTED_NORMAL not smaller EXTRACTED_NO_VENV_IGNORE"
     exitcode=1
 fi
 
-if [[ ! $EXTRACTED_NORMAL -lt $EXTRACTED_ACTIVE_FLASK ]]; then
-    echo "ERROR: EXTRACTED_NORMAL not smaller EXTRACTED_ACTIVE_FLASK"
-    exitcode=1
-fi
-
-if [[ ! $EXTRACTED_ACTIVE_FLASK -lt $EXTRACTED_NO_VENV_IGNORE ]]; then
-    echo "ERROR: EXTRACTED_ACTIVE_FLASK not smaller EXTRACTED_NO_VENV_IGNORE"
-    exitcode=1
-fi
-
 exit $exitcode

From e9e7ccddcea1f00326522457c5a5d816564d55df Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 9 Apr 2024 14:02:34 +0200
Subject: [PATCH 116/136] Python: delete `force-enable-library-extraction`
 integration test

---
 .../repo_dir/foo.py                           |  3 --
 .../force-enable-library-extraction/test.sh   | 41 -------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 python/extractor/cli-integration-test/force-enable-library-extraction/repo_dir/foo.py
 delete mode 100755 python/extractor/cli-integration-test/force-enable-library-extraction/test.sh

diff --git a/python/extractor/cli-integration-test/force-enable-library-extraction/repo_dir/foo.py b/python/extractor/cli-integration-test/force-enable-library-extraction/repo_dir/foo.py
deleted file mode 100644
index cf0cd77a108..00000000000
--- a/python/extractor/cli-integration-test/force-enable-library-extraction/repo_dir/foo.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import pip
-
-print(42)
diff --git a/python/extractor/cli-integration-test/force-enable-library-extraction/test.sh b/python/extractor/cli-integration-test/force-enable-library-extraction/test.sh
deleted file mode 100755
index 9d74cfaca4b..00000000000
--- a/python/extractor/cli-integration-test/force-enable-library-extraction/test.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail # see https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
-
-set -x
-
-CODEQL=${CODEQL:-codeql}
-
-SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-cd "$SCRIPTDIR"
-
-# start on clean slate
-rm -rf dbs
-mkdir dbs
-
-cd "$SCRIPTDIR"
-
-export CODEQL_EXTRACTOR_PYTHON_FORCE_ENABLE_LIBRARY_EXTRACTION_UNTIL_2_17_0=
-$CODEQL database create dbs/normal --language python --source-root repo_dir/
-
-export CODEQL_EXTRACTOR_PYTHON_FORCE_ENABLE_LIBRARY_EXTRACTION_UNTIL_2_17_0=1
-$CODEQL database create dbs/with-lib-extraction --language python --source-root repo_dir/
-
-# ---
-
-set +x
-
-EXTRACTED_NORMAL=$(unzip -l dbs/normal/src.zip | wc -l)
-EXTRACTED_WITH_LIB_EXTRACTION=$(unzip -l dbs/with-lib-extraction/src.zip | wc -l)
-
-exitcode=0
-
-echo "EXTRACTED_NORMAL=$EXTRACTED_NORMAL"
-echo "EXTRACTED_WITH_LIB_EXTRACTION=$EXTRACTED_WITH_LIB_EXTRACTION"
-
-if [[ ! $EXTRACTED_WITH_LIB_EXTRACTION -gt $EXTRACTED_NORMAL ]]; then
-    echo "ERROR: EXTRACTED_WITH_LIB_EXTRACTION not greater than EXTRACTED_NORMAL"
-    exitcode=1
-fi
-
-exit $exitcode

From ae8240a695b532778f8ef8f4864f626744cfc705 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Tue, 9 Apr 2024 13:23:03 +0100
Subject: [PATCH 117/136] Delete models for JDK internal packages

---
 .../jdk.internal.access.foreign.model.yml     |  10 -
 .../generated/jdk.internal.access.model.yml   | 243 ------------------
 .../ext/generated/jdk.internal.misc.model.yml |  11 -
 .../jdk.internal.org.objectweb.asm.model.yml  |  15 --
 4 files changed, 279 deletions(-)
 delete mode 100644 java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml
 delete mode 100644 java/ql/lib/ext/generated/jdk.internal.access.model.yml
 delete mode 100644 java/ql/lib/ext/generated/jdk.internal.misc.model.yml
 delete mode 100644 java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml

diff --git a/java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml b/java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml
deleted file mode 100644
index 5cfddbd9303..00000000000
--- a/java/ql/lib/ext/generated/jdk.internal.access.foreign.model.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["jdk.internal.access.foreign", "UnmapperProxy", "address", "()", "summary", "df-generated"]
-      - ["jdk.internal.access.foreign", "UnmapperProxy", "fileDescriptor", "()", "summary", "df-generated"]
-      - ["jdk.internal.access.foreign", "UnmapperProxy", "isSync", "()", "summary", "df-generated"]
-      - ["jdk.internal.access.foreign", "UnmapperProxy", "unmap", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/jdk.internal.access.model.yml b/java/ql/lib/ext/generated/jdk.internal.access.model.yml
deleted file mode 100644
index 37d80349303..00000000000
--- a/java/ql/lib/ext/generated/jdk.internal.access.model.yml
+++ /dev/null
@@ -1,243 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", True, "registerCleanup", "(FileDescriptor,PhantomCleanable)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFilePermissionAccess", True, "newPermPlusAltPath", "(FilePermission)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFilePermissionAccess", True, "newPermUsingAltPath", "(FilePermission)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaIORandomAccessFileAccess", True, "openAndDelete", "(File,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "addEnableNativeAccess", "(Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "addOpensToAllUnnamed", "(Module,Set,Set)", "", "Argument[1].Element", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "addOpensToAllUnnamed", "(Module,Set,Set)", "", "Argument[2].Element", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "createOrGetClassLoaderValueMap", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "defineModule", "(ClassLoader,ModuleDescriptor,URI)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "defineModule", "(ClassLoader,ModuleDescriptor,URI)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "definePackage", "(ClassLoader,String,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "definePackage", "(ClassLoader,String,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "defineUnnamedModule", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "getBytesNoRepl", "(String,Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "getBytesUTF8NoRepl", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "getServicesCatalog", "(ModuleLayer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "join", "(String,String,String,String[],int)", "", "Argument[3].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "layers", "(ClassLoader)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "layers", "(ModuleLayer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "newStringNoRepl", "(byte[],Charset)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "newStringUTF8NoRepl", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "newThreadWithAcc", "(Runnable,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "newThreadWithAcc", "(Runnable,AccessControlContext)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "setCause", "(Throwable,Throwable)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "stringConcatHelper", "(String,MethodType)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", True, "stringConcatHelper", "(String,MethodType)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "collectCoordinates", "(VarHandle,int,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "dropCoordinates", "(VarHandle,int,Class[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "filterCoordinates", "(VarHandle,int,MethodHandle[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "filterValue", "(VarHandle,MethodHandle,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "getMethodDescriptor", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "getMethodType", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "getName", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "insertCoordinates", "(VarHandle,int,Object[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "nativeMethodHandle", "(NativeEntryPoint,MethodHandle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "nativeMethodHandle", "(NativeEntryPoint,MethodHandle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "permuteCoordinates", "(VarHandle,List,int[])", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", True, "permuteCoordinates", "(VarHandle,List,int[])", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newConfiguration", "(ModuleFinder,Map)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String,Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newExports", "(Set,String,Set)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleBuilder", "(String,boolean,Set)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleBuilder", "(String,boolean,Set)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[3].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[4].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[5].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[6].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[7].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[8].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newModuleDescriptor", "(String,ModuleDescriptor$Version,Set,Set,Set,Set,Set,Set,Set,String,int)", "", "Argument[9]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String,Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String,Set)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newOpens", "(Set,String,Set)", "", "Argument[2].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newProvides", "(String,List)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newProvides", "(String,List)", "", "Argument[1].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newRequires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newRequires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "newRequires", "(Set,String,ModuleDescriptor$Version)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", True, "packages", "(ModuleDescriptor$Builder)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "copyConstructor", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "copyField", "(Field)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "copyMethod", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorAccessor", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorAnnotations", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorParameterAnnotations", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getConstructorSignature", "(Constructor)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getExecutableSharedParameterTypes", "(Executable)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getMethodAccessor", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "getRoot", "(AccessibleObject)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "leafCopyMethod", "(Method)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[2].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[5]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[6]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "newConstructor", "(Class,Class[],Class[],int,int,String,byte[],byte[])", "", "Argument[7]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "setConstructorAccessor", "(Constructor,ConstructorAccessor)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", True, "setMethodAccessor", "(Method,MethodAccessor)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetHttpCookieAccess", True, "header", "(HttpCookie)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetHttpCookieAccess", True, "parse", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetInetAddressAccess", True, "addressBytes", "(Inet6Address)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetInetAddressAccess", True, "getByName", "(String,InetAddress)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetInetAddressAccess", True, "getOriginalHostName", "(InetAddress)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetURLAccess", True, "getHandler", "(URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetUriAccess", True, "create", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNetUriAccess", True, "create", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "acquireScope", "(Buffer,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "bufferSegment", "(Buffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "getBufferBase", "(ByteBuffer)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "newDirectByteBuffer", "(long,int,Object,MemorySegmentProxy)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "newDirectByteBuffer", "(long,int,Object,MemorySegmentProxy)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "newHeapByteBuffer", "(byte[],int,int,MemorySegmentProxy)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "newHeapByteBuffer", "(byte[],int,int,MemorySegmentProxy)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "newMappedByteBuffer", "(UnmapperProxy,long,int,Object,MemorySegmentProxy)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "newMappedByteBuffer", "(UnmapperProxy,long,int,Object,MemorySegmentProxy)", "", "Argument[3]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", True, "newMappedByteBuffer", "(UnmapperProxy,long,int,Object,MemorySegmentProxy)", "", "Argument[4]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecurityAccess$ProtectionDomainCache", True, "get", "(ProtectionDomain)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecurityAccess$ProtectionDomainCache", True, "put", "(ProtectionDomain,PermissionCollection)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecurityAccess$ProtectionDomainCache", True, "put", "(ProtectionDomain,PermissionCollection)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecurityAccess", True, "doIntersectionPrivilege", "(PrivilegedAction,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecurityAccess", True, "doIntersectionPrivilege", "(PrivilegedAction,AccessControlContext,AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecurityAccess", True, "getProtectDomains", "(AccessControlContext)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initSign", "(Signature,PrivateKey,AlgorithmParameterSpec,SecureRandom)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initSign", "(Signature,PrivateKey,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initSign", "(Signature,PrivateKey,AlgorithmParameterSpec,SecureRandom)", "", "Argument[3]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initVerify", "(Signature,PublicKey,AlgorithmParameterSpec)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaSecuritySignatureAccess", True, "initVerify", "(Signature,PublicKey,AlgorithmParameterSpec)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilCollectionAccess", True, "listFromTrustedArray", "(Object[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilCollectionAccess", True, "listFromTrustedArrayNullsAllowed", "(Object[])", "", "Argument[0].ArrayElement", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "entryFor", "(JarFile,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "entryNames", "(JarFile,CodeSource[])", "", "Argument[1].ArrayElement", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSource", "(JarFile,URL,String)", "", "Argument[2]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSources", "(JarFile,URL)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSources", "(JarFile,URL)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getCodeSources", "(JarFile,URL)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getManifestDigests", "(JarFile)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", True, "getTrustedAttributes", "(Manifest,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "getBundle", "(String,Locale,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "getBundle", "(String,Locale,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "getParent", "(ResourceBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "setLocale", "(ResourceBundle,Locale)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "setName", "(ResourceBundle,String)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", True, "setParent", "(ResourceBundle,ResourceBundle)", "", "Argument[1]", "Argument[0]", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["jdk.internal.access", "JavaBeansAccess", "getConstructorPropertiesValue", "(Constructor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaBeansAccess", "getReadMethod", "(Class,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOAccess", "charset", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOAccess", "console", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "close", "(FileDescriptor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "get", "(FileDescriptor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "getAppend", "(FileDescriptor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "getHandle", "(FileDescriptor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "registerCleanup", "(FileDescriptor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "set", "(FileDescriptor,int)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "setAppend", "(FileDescriptor,boolean)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "setHandle", "(FileDescriptor,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaIOFileDescriptorAccess", "unregisterCleanup", "(FileDescriptor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addEnableNativeAccessAllUnnamed", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addExports", "(Module,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addExports", "(Module,String,Module)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addExportsToAllUnnamed", "(Module,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addNonExportedPackages", "(ModuleLayer)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addOpens", "(Module,String,Module)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addOpensToAllUnnamed", "(Module,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addReads", "(Module,Module)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addReadsAllUnnamed", "(Module)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "addUses", "(Module,Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "bindToLoader", "(ModuleLayer,ClassLoader)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "blockedOn", "(Interruptible)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "casAnnotationType", "(Class,AnnotationType,AnnotationType)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "classData", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "decodeASCII", "(byte[],int,char[],int,int)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "defineClass", "(ClassLoader,Class,String,byte[],ProtectionDomain,boolean,int,Object)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "defineClass", "(ClassLoader,String,byte[],ProtectionDomain,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "exit", "(int)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "fastUUID", "(long,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "findBootstrapClassOrNull", "(String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "findNative", "(ClassLoader,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getAnnotationType", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getConstantPool", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getDeclaredAnnotationMap", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getDeclaredPublicMethods", "(Class,String,Class[])", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getEnumConstantsShared", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getRawClassAnnotations", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getRawClassTypeAnnotations", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "getRawExecutableTypeAnnotations", "(Executable)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "inflateBytesToChars", "(byte[],int,char[],int,int)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "invalidatePackageAccessCache", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "invokeFinalize", "(Object)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "isEnableNativeAccess", "(Module)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "isReflectivelyExported", "(Module,String,Module)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "isReflectivelyOpened", "(Module,String,Module)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "protectionDomain", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "registerShutdownHook", "(int,boolean,Runnable)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "stringConcatInitialCoder", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangAccess", "stringConcatMix", "(long,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", "ensureCustomized", "(MethodHandle)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", "generateHolderClasses", "(Stream)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", "getDeclaringClass", "(Object)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", "isNative", "(Object)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", "memoryAccessVarHandle", "(Class,boolean,long,ByteOrder)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangInvokeAccess", "newMemberName", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", "requires", "(ModuleDescriptor$Builder,Set,String,String)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangModuleAccess", "resolveAndBind", "(ModuleFinder,Collection,PrintStream)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangRefAccess", "runFinalization", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangRefAccess", "waitForReferenceProcessing", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", "getConstructorSlot", "(Constructor)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", "getExecutableTypeAnnotationBytes", "(Executable)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", "isTrustedFinalField", "(Field)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaLangReflectAccess", "newInstance", "(Constructor,Object[],Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNetInetAddressAccess", "addressValue", "(Inet4Address)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "force", "(FileDescriptor,long,boolean,long,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "getBufferAddress", "(ByteBuffer)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "getDirectBufferPool", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "isLoaded", "(long,boolean,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "load", "(long,boolean,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "pageSize", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "reserveMemory", "(long,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "unload", "(long,boolean,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "unmapper", "(ByteBuffer)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaNioAccess", "unreserveMemory", "(long,long)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaSecurityAccess", "getProtectionDomainCache", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaSecuritySignatureAccess", "initVerify", "(Signature,Certificate,AlgorithmParameterSpec)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaSecuritySpecAccess", "clearEncodedKeySpec", "(EncodedKeySpec)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", "ensureInitialization", "(JarFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", "entries2", "(JarFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", "isInitializing", "()", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", "jarFileHasClassPathAttribute", "(JarFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilJarAccess", "setEagerValidation", "(JarFile,boolean)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilResourceBundleAccess", "newResourceBundle", "(Class)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "entries", "(ZipFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "entryNameStream", "(ZipFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getExtraAttributes", "(ZipEntry)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getManifestAndSignatureRelatedFiles", "(JarFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getManifestName", "(JarFile,boolean)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getManifestNum", "(JarFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "getMetaInfVersions", "(JarFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "setExtraAttributes", "(ZipEntry,int)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "startsWithLocHeader", "(ZipFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaUtilZipFileAccess", "stream", "(ZipFile)", "summary", "df-generated"]
-      - ["jdk.internal.access", "JavaxCryptoSpecAccess", "clearSecretKeySpec", "(SecretKeySpec)", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/jdk.internal.misc.model.yml b/java/ql/lib/ext/generated/jdk.internal.misc.model.yml
deleted file mode 100644
index 3ab4816a586..00000000000
--- a/java/ql/lib/ext/generated/jdk.internal.misc.model.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["jdk.internal.misc", "Signal$Handler", "handle", "(Signal)", "summary", "df-generated"]
-      - ["jdk.internal.misc", "VM$BufferPool", "getCount", "()", "summary", "df-generated"]
-      - ["jdk.internal.misc", "VM$BufferPool", "getMemoryUsed", "()", "summary", "df-generated"]
-      - ["jdk.internal.misc", "VM$BufferPool", "getName", "()", "summary", "df-generated"]
-      - ["jdk.internal.misc", "VM$BufferPool", "getTotalCapacity", "()", "summary", "df-generated"]
diff --git a/java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml b/java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml
deleted file mode 100644
index 1121dda6781..00000000000
--- a/java/ql/lib/ext/generated/jdk.internal.org.objectweb.asm.model.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
-extensions:
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", True, "visitAnnotation", "(String,boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", True, "visitAnnotation", "(String,boolean)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: neutralModel
-    data:
-      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", "visit", "(int,int,String,String,String,String[])", "summary", "df-generated"]
-      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", "visitAttribute", "(Attribute)", "summary", "df-generated"]
-      - ["jdk.internal.org.objectweb.asm", "ClassVisitor", "visitModule", "(String,int,String)", "summary", "df-generated"]

From e6d63b980d044c167d8cfa5f60117c3cbc82c633 Mon Sep 17 00:00:00 2001
From: Felicity Chapman <felicitymay@github.com>
Date: Tue, 9 Apr 2024 14:05:42 +0100
Subject: [PATCH 118/136] Make duplicated content clear

---
 .../customizing-library-models-for-csharp.rst     | 15 +++------------
 ...omizing-library-models-for-java-and-kotlin.rst | 11 +----------
 .../codeql/reusables/threat-model-description.rst | 10 ++++++++++
 3 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 docs/codeql/reusables/threat-model-description.rst

diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst
index 09dcf36fc07..39b5ee30ee4 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-csharp.rst
@@ -282,7 +282,7 @@ These are the same for both of the rows above as we are adding two summaries for
 - The second value ``Enumerable`` is the class (type) name.
 - The third value ``False`` is a flag that indicates whether or not the summary also applies to all overrides of the method.
 - The fourth value ``Select<TSource,TResult>`` is the method name, along with the type parameters for the method. The names of the generic type parameters provided in the model must match the names of the generic type parameters in the method signature in the source code.
-- The fifth value ``(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>)`` is the method input type signature. The generics in the signature must match the generics in the method signature in the source code. 
+- The fifth value ``(System.Collections.Generic.IEnumerable<TSource>,System.Func<TSource,TResult>)`` is the method input type signature. The generics in the signature must match the generics in the method signature in the source code.
 
 The sixth value should be left empty and is out of scope for this documentation.
 The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the summary definition.
@@ -309,7 +309,7 @@ That is, the first row specifies that values can flow from the elements of the q
 
 Example: Add a ``neutral`` method
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This example shows how we can model a method as being neutral with respect to flow. We will also cover how to model a property by modeling the getter of the ``Now`` property of the ``DateTime`` class as neutral. 
+This example shows how we can model a method as being neutral with respect to flow. We will also cover how to model a property by modeling the getter of the ``Now`` property of the ``DateTime`` class as neutral.
 A neutral model is used to define that there is no flow through a method.
 
 .. code-block:: csharp
@@ -346,13 +346,4 @@ The first four values identify the callable (in this case the getter of the ``No
 Threat models
 -------------
 
-.. include:: ../reusables/beta-note-threat-models.rst
-
-A threat model is a named class of dataflow sources that can be enabled or disabled independently. Threat models allow you to control the set of dataflow sources that you want to consider unsafe. For example, one codebase may only consider remote HTTP requests to be tainted, whereas another may also consider data from local files to be unsafe. You can use threat models to ensure that the relevant taint sources are used in a CodeQL analysis.
-
-The ``kind`` property of ``sourceModel`` determines which threat model a source is associated with. There are two main categories:
-
-- ``remote`` which represents requests and responses from the network. 
-- ``local`` which represents data from local files (``file``), command-line arguments (``commandargs``), database reads (``database``), and environment variables(``environment``).
- 
-When running a CodeQL analysis, the ``remote`` threat model is included by default. You can optionally include other threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see `Analyzing your code with CodeQL queries <https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>`__ and `Customizing your advanced setup for code scanning <https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models>`__.
+.. include:: ../reusables/threat-model-description.rst
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
index e8b69e20d81..dd7f352f6d0 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-java-and-kotlin.rst
@@ -297,13 +297,4 @@ The first four values identify the callable (in this case a method) to be modele
 Threat models
 -------------
 
-.. include:: ../reusables/beta-note-threat-models.rst
-
-A threat model is a named class of dataflow sources that can be enabled or disabled independently. Threat models allow you to control the set of dataflow sources that you want to consider unsafe. For example, one codebase may only consider remote HTTP requests to be tainted, whereas another may also consider data from local files to be unsafe. You can use threat models to ensure that the relevant taint sources are used in a CodeQL analysis.
-
-The ``kind`` property of the ``sourceModel`` determines which threat model a source is associated with. There are two main categories:
-
-- ``remote`` which represents requests and responses from the network. 
-- ``local`` which represents data from local files (``file``), command-line arguments (``commandargs``), database reads (``database``), and environment variables(``environment``).
- 
-When running a CodeQL analysis, the ``remote`` threat model is included by default. You can optionally include other threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see `Analyzing your code with CodeQL queries <https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>`__ and `Customizing your advanced setup for code scanning <https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models>`__.
+.. include:: ../reusables/threat-model-description.rst
diff --git a/docs/codeql/reusables/threat-model-description.rst b/docs/codeql/reusables/threat-model-description.rst
new file mode 100644
index 00000000000..53a872487bf
--- /dev/null
+++ b/docs/codeql/reusables/threat-model-description.rst
@@ -0,0 +1,10 @@
+.. include:: ../reusables/beta-note-threat-models.rst
+
+A threat model is a named class of dataflow sources that can be enabled or disabled independently. Threat models allow you to control the set of dataflow sources that you want to consider unsafe. For example, one codebase may only consider remote HTTP requests to be tainted, whereas another may also consider data from local files to be unsafe. You can use threat models to ensure that the relevant taint sources are used in a CodeQL analysis.
+
+The ``kind`` property of the ``sourceModel`` determines which threat model a source is associated with. There are two main categories:
+
+- ``remote`` which represents requests and responses from the network.
+- ``local`` which represents data from local files (``file``), command-line arguments (``commandargs``), database reads (``database``), and environment variables(``environment``).
+
+When running a CodeQL analysis, the ``remote`` threat model is included by default. You can optionally include other threat models as appropriate when using the CodeQL CLI and in GitHub code scanning. For more information, see `Analyzing your code with CodeQL queries <https://docs.github.com/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries#including-model-packs-to-add-potential-sources-of-tainted-data>`__ and `Customizing your advanced setup for code scanning <https://docs.github.com/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning#extending-codeql-coverage-with-threat-models>`__.

From deb78b248b8d04aab1702c721d64db89de748a44 Mon Sep 17 00:00:00 2001
From: Max Schaefer <54907921+max-schaefer@users.noreply.github.com>
Date: Tue, 9 Apr 2024 14:38:17 +0100
Subject: [PATCH 119/136] Apply suggestions from code review

Co-authored-by: Taus <tausbn@github.com>
---
 .../test/AutomodelApplicationModeExtraction/Test.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java b/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
index a8280bcaf27..9691cf86c15 100644
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
@@ -103,10 +103,10 @@ class MoreTests {
 
 		Files.delete(
 			p // $ sinkModelCandidate=delete(Path):Argument[0] positiveSinkExample=delete(Path):Argument[0](path-injection)
-		); // $ not a source candidate (return type is void)
+		); // not a source candidate (return type is void)
 
 		Files.deleteIfExists(
 			p // $ sinkModelCandidate=deleteIfExists(Path):Argument[0] positiveSinkExample=deleteIfExists(Path):Argument[0](path-injection)
-		); // $ not a source candidate (return type is boolean)
+		); // not a source candidate (return type is boolean)
 	}
 }
\ No newline at end of file

From 2a7420ce11ef59eca1d0228d972e534c3d3df8ec Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Tue, 9 Apr 2024 15:00:23 +0100
Subject: [PATCH 120/136] Update
 cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll

Co-authored-by: Jeroen Ketema <93738568+jketema@users.noreply.github.com>
---
 cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
index 44f2e60daac..d8ce666a8cb 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
@@ -7,7 +7,7 @@ private module Input implements TypeFlowInput<Location> {
     // The address of a variable is always a single object
     i instanceof VariableAddressInstruction
     or
-    // A reference always points to a always a single object
+    // A reference always points to a single object
     i.getResultLanguageType().hasUnspecifiedType(any(ReferenceType rt), false)
     or
     // `this` is never an array

From 291cc0a671a4bcb9d411f6b8016e61cb0209ad02 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Tue, 9 Apr 2024 15:25:13 +0100
Subject: [PATCH 121/136] C++: Anonymous namespaces provide internal linkage.

---
 cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
index d8ce666a8cb..ee493f00ce4 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
@@ -120,10 +120,13 @@ private module Input implements TypeFlowInput<Location> {
    * calls to this function.
    */
   private predicate isPrivate(Function func) {
+    // static functions have internal linkage
     func.isStatic()
     or
-    func.getNamespace().getParentNamespace*().isInline()
+    // anonymous namespaces have internal linkage
+    func.getNamespace().getParentNamespace*().isAnonymous()
     or
+    // private member functions are only called internally from inside the class
     func.(MemberFunction).isPrivate()
   }
 

From a53ef495ee937e58bfd401f47732a59887f1e06c Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Tue, 9 Apr 2024 16:04:20 +0100
Subject: [PATCH 122/136] C++: Simplify 'hasExactBufferType' and add comments.

---
 .../cpp/ir/dataflow/internal/TypeFlow.qll     | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
index ee493f00ce4..69f94dad91b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TypeFlow.qll
@@ -3,6 +3,29 @@ private import semmle.code.cpp.ir.IR
 private import codeql.typeflow.TypeFlow
 
 private module Input implements TypeFlowInput<Location> {
+  /** Holds if `alloc` dynamically allocates a single object. */
+  private predicate isSingleObjectAllocation(AllocationExpr alloc) {
+    // i.e., `new int`;
+    alloc instanceof NewExpr
+    or
+    // i.e., `malloc(sizeof(int))`
+    exists(SizeofTypeOperator sizeOf | sizeOf = alloc.getSizeExpr() |
+      not sizeOf.getTypeOperand().getUnspecifiedType() instanceof ArrayType
+    )
+  }
+
+  /**
+   * Holds if `i` is the result of a dynamic allocation.
+   *
+   * `isObject` is `true` if the allocation allocated a single object,
+   * and `false` otherwise.
+   */
+  private predicate isAllocation(Instruction i, boolean isObject) {
+    exists(AllocationExpr alloc | alloc = i.getUnconvertedResultExpression() |
+      if isSingleObjectAllocation(alloc) then isObject = true else isObject = false
+    )
+  }
+
   private predicate hasExactSingleType(Instruction i) {
     // The address of a variable is always a single object
     i instanceof VariableAddressInstruction
@@ -14,23 +37,16 @@ private module Input implements TypeFlowInput<Location> {
     i instanceof InitializeThisInstruction
     or
     // An allocation of a non-array object
-    exists(AllocationExpr alloc | alloc = i.getUnconvertedResultExpression() |
-      // i.e., `new int`;
-      alloc instanceof NewExpr
-      or
-      // i.e., `malloc(sizeof(int))`
-      exists(SizeofTypeOperator sizeOf | sizeOf = alloc.getSizeExpr() |
-        not sizeOf.getTypeOperand().getUnspecifiedType() instanceof ArrayType
-      )
-    )
+    isAllocation(i, true)
   }
 
   private predicate hasExactBufferType(Instruction i) {
     // Anything with an array type is a buffer
     i.getResultLanguageType().hasUnspecifiedType(any(ArrayType at), false)
     or
-    not hasExactSingleType(i) and
-    i.getUnconvertedResultExpression() instanceof AllocationExpr
+    // An allocation expression that we couldn't conclude allocated a single
+    // expression is assigned a buffer type.
+    isAllocation(i, false)
   }
 
   private newtype TTypeFlowNode =

From b9cfeaf6140617109572152b84ab84fbf4be067e Mon Sep 17 00:00:00 2001
From: Dave Bartolomeo <dbartol@github.com>
Date: Tue, 9 Apr 2024 12:41:32 -0400
Subject: [PATCH 123/136] Add test case

---
 java/ql/test/query-tests/SpuriousJavadocParam/Test.java     | 1 +
 java/ql/test/query-tests/SpuriousJavadocParam/test.expected | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/ql/test/query-tests/SpuriousJavadocParam/Test.java b/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
index 434353f4c67..d8891afb756 100644
--- a/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
+++ b/java/ql/test/query-tests/SpuriousJavadocParam/Test.java
@@ -128,6 +128,7 @@ public class Test<V> {
 
   /**
    * @param <T> exists
+   * @param <U> does not
    * @param i exists
    * @param k does not
    */
diff --git a/java/ql/test/query-tests/SpuriousJavadocParam/test.expected b/java/ql/test/query-tests/SpuriousJavadocParam/test.expected
index 0ade1a7d519..f184473ea4a 100644
--- a/java/ql/test/query-tests/SpuriousJavadocParam/test.expected
+++ b/java/ql/test/query-tests/SpuriousJavadocParam/test.expected
@@ -13,4 +13,5 @@
 | Test.java:118:6:118:12 | @param | @param tag "T" does not match any actual type parameter of type "GenericInterface". |
 | Test.java:119:6:119:12 | @param | @param tag "<X>" does not match any actual type parameter of type "GenericInterface". |
 | Test.java:125:6:125:12 | @param | @param tag "k" does not match any actual type parameter or record parameter of record "SomeRecord". |
-| Test.java:132:6:132:12 | @param | @param tag "k" does not match any actual type parameter or record parameter of record "GenericRecord". |
+| Test.java:131:6:131:12 | @param | @param tag "<U>" does not match any actual type parameter or record parameter of record "GenericRecord". |
+| Test.java:133:6:133:12 | @param | @param tag "k" does not match any actual type parameter or record parameter of record "GenericRecord". |

From 4fed3cf12d9145b2d891009ff409853da9a61ebb Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Wed, 10 Apr 2024 11:31:34 +0200
Subject: [PATCH 124/136] Python: Fix `RemoteFlowSourceFromCsv`

---
 python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll b/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
index 34e48439271..2f4c74ea9e4 100644
--- a/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
+++ b/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
@@ -22,7 +22,7 @@ private import semmle.python.dataflow.new.FlowSummary
 /**
  * A remote flow source originating from a CSV source row.
  */
-private class RemoteFlowSourceFromCsv extends RemoteFlowSource {
+private class RemoteFlowSourceFromCsv extends RemoteFlowSource::Range {
   RemoteFlowSourceFromCsv() { this = ModelOutput::getASourceNode("remote").asSource() }
 
   override string getSourceType() { result = "Remote flow (from model)" }

From b4829addf7b3c2ac0121e6dc0222d87381a166cc Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 10 Apr 2024 10:48:23 +0100
Subject: [PATCH 125/136] Add comments with link to online doc

---
 go/extractor/extractor.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 1a60c2bf982..acfccf33e3c 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -388,6 +388,8 @@ func extractUniverseScope() {
 }
 
 // extractObjects extracts all objects declared in the given scope
+// For more information on objects, see:
+// https://github.com/golang/example/blob/master/gotypes/README.md#objects
 func extractObjects(tw *trap.Writer, scope *types.Scope, scopeLabel trap.Label) {
 	for _, name := range scope.Names() {
 		obj := scope.Lookup(name)
@@ -440,6 +442,8 @@ func extractMethod(tw *trap.Writer, meth *types.Func) trap.Label {
 }
 
 // extractObject extracts a single object and emits it to the objects table.
+// For more information on objects, see:
+// https://github.com/golang/example/blob/master/gotypes/README.md#objects
 func extractObject(tw *trap.Writer, obj types.Object, lbl trap.Label) {
 	name := obj.Name()
 	isBuiltin := obj.Parent() == types.Universe
@@ -487,6 +491,8 @@ func extractObject(tw *trap.Writer, obj types.Object, lbl trap.Label) {
 }
 
 // extractObjectTypes extracts type and receiver information for all objects
+// For more information on objects, see:
+// https://github.com/golang/example/blob/master/gotypes/README.md#objects
 func extractObjectTypes(tw *trap.Writer) {
 	// calling `extractType` on a named type will extract all methods defined
 	// on it, which will add new objects. Therefore we need to do this first
@@ -497,11 +503,13 @@ func extractObjectTypes(tw *trap.Writer) {
 	}
 	changed = tw.ForEachObject(emitObjectType)
 	if changed {
-		log.Printf("Warning: more objects were labeled while emitted object types")
+		log.Printf("Warning: more objects were labeled while emitting object types")
 	}
 }
 
 // extractObjectType extracts type and receiver information for a given object
+// For more information on objects, see:
+// https://github.com/golang/example/blob/master/gotypes/README.md#objects
 func extractObjectType(tw *trap.Writer, obj types.Object, lbl trap.Label) {
 	if tp := obj.Type(); tp != nil {
 		extractType(tw, tp)

From bee54e42479867a901e546d4782f3f80f73a1db8 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Fri, 5 Apr 2024 14:41:10 +0200
Subject: [PATCH 126/136] C#: Add desktop runtime dependencies integration
 test.

---
 .../Assemblies.expected                       | 210 ++++++++++++++++++
 .../Assemblies.ql                             |  21 ++
 .../Program.cs                                |   6 +
 .../global.json                               |   5 +
 .../test.py                                   |   3 +
 5 files changed, 245 insertions(+)
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.ql
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Program.cs
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json
 create mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/test.py

diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected
new file mode 100644
index 00000000000..f4f8290eb75
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected
@@ -0,0 +1,210 @@
+| [...]/Humanizer.dll |
+| [...]/Microsoft.Bcl.AsyncInterfaces.dll |
+| [...]/Microsoft.Build.Framework.dll |
+| [...]/Microsoft.Build.dll |
+| [...]/Microsoft.CSharp.dll |
+| [...]/Microsoft.CodeAnalysis.CSharp.Workspaces.dll |
+| [...]/Microsoft.CodeAnalysis.CSharp.dll |
+| [...]/Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll |
+| [...]/Microsoft.CodeAnalysis.VisualBasic.dll |
+| [...]/Microsoft.CodeAnalysis.Workspaces.dll |
+| [...]/Microsoft.CodeAnalysis.dll |
+| [...]/Microsoft.NET.StringTools.dll |
+| [...]/Microsoft.VisualBasic.Core.dll |
+| [...]/Microsoft.VisualBasic.dll |
+| [...]/Microsoft.Win32.Primitives.dll |
+| [...]/Microsoft.Win32.Registry.dll |
+| [...]/Microsoft.Win32.SystemEvents.dll |
+| [...]/Mono.Posix.NETStandard.dll |
+| [...]/Newtonsoft.Json.dll |
+| [...]/Semmle.Autobuild.CSharp.dll |
+| [...]/Semmle.Autobuild.Shared.dll |
+| [...]/Semmle.Extraction.CSharp.DependencyFetching.dll |
+| [...]/Semmle.Extraction.CSharp.Driver.dll |
+| [...]/Semmle.Extraction.CSharp.Standalone.dll |
+| [...]/Semmle.Extraction.CSharp.Util.dll |
+| [...]/Semmle.Extraction.CSharp.dll |
+| [...]/Semmle.Extraction.dll |
+| [...]/Semmle.Util.dll |
+| [...]/System.AppContext.dll |
+| [...]/System.Buffers.dll |
+| [...]/System.Collections.Concurrent.dll |
+| [...]/System.Collections.Immutable.dll |
+| [...]/System.Collections.NonGeneric.dll |
+| [...]/System.Collections.Specialized.dll |
+| [...]/System.Collections.dll |
+| [...]/System.ComponentModel.Annotations.dll |
+| [...]/System.ComponentModel.DataAnnotations.dll |
+| [...]/System.ComponentModel.EventBasedAsync.dll |
+| [...]/System.ComponentModel.Primitives.dll |
+| [...]/System.ComponentModel.TypeConverter.dll |
+| [...]/System.ComponentModel.dll |
+| [...]/System.Composition.AttributedModel.dll |
+| [...]/System.Composition.Convention.dll |
+| [...]/System.Composition.Hosting.dll |
+| [...]/System.Composition.Runtime.dll |
+| [...]/System.Composition.TypedParts.dll |
+| [...]/System.Configuration.ConfigurationManager.dll |
+| [...]/System.Configuration.dll |
+| [...]/System.Console.dll |
+| [...]/System.Core.dll |
+| [...]/System.Data.Common.dll |
+| [...]/System.Data.DataSetExtensions.dll |
+| [...]/System.Data.dll |
+| [...]/System.Diagnostics.Contracts.dll |
+| [...]/System.Diagnostics.Debug.dll |
+| [...]/System.Diagnostics.DiagnosticSource.dll |
+| [...]/System.Diagnostics.EventLog.dll |
+| [...]/System.Diagnostics.FileVersionInfo.dll |
+| [...]/System.Diagnostics.Process.dll |
+| [...]/System.Diagnostics.StackTrace.dll |
+| [...]/System.Diagnostics.TextWriterTraceListener.dll |
+| [...]/System.Diagnostics.Tools.dll |
+| [...]/System.Diagnostics.TraceSource.dll |
+| [...]/System.Diagnostics.Tracing.dll |
+| [...]/System.Drawing.Common.dll |
+| [...]/System.Drawing.Primitives.dll |
+| [...]/System.Drawing.dll |
+| [...]/System.Dynamic.Runtime.dll |
+| [...]/System.Formats.Asn1.dll |
+| [...]/System.Formats.Tar.dll |
+| [...]/System.Globalization.Calendars.dll |
+| [...]/System.Globalization.Extensions.dll |
+| [...]/System.Globalization.dll |
+| [...]/System.IO.Compression.Brotli.dll |
+| [...]/System.IO.Compression.FileSystem.dll |
+| [...]/System.IO.Compression.ZipFile.dll |
+| [...]/System.IO.Compression.dll |
+| [...]/System.IO.FileSystem.AccessControl.dll |
+| [...]/System.IO.FileSystem.DriveInfo.dll |
+| [...]/System.IO.FileSystem.Primitives.dll |
+| [...]/System.IO.FileSystem.Watcher.dll |
+| [...]/System.IO.FileSystem.dll |
+| [...]/System.IO.IsolatedStorage.dll |
+| [...]/System.IO.MemoryMappedFiles.dll |
+| [...]/System.IO.Pipelines.dll |
+| [...]/System.IO.Pipes.AccessControl.dll |
+| [...]/System.IO.Pipes.dll |
+| [...]/System.IO.UnmanagedMemoryStream.dll |
+| [...]/System.IO.dll |
+| [...]/System.Linq.Expressions.dll |
+| [...]/System.Linq.Parallel.dll |
+| [...]/System.Linq.Queryable.dll |
+| [...]/System.Linq.dll |
+| [...]/System.Memory.dll |
+| [...]/System.Net.Http.Json.dll |
+| [...]/System.Net.Http.dll |
+| [...]/System.Net.HttpListener.dll |
+| [...]/System.Net.Mail.dll |
+| [...]/System.Net.NameResolution.dll |
+| [...]/System.Net.NetworkInformation.dll |
+| [...]/System.Net.Ping.dll |
+| [...]/System.Net.Primitives.dll |
+| [...]/System.Net.Quic.dll |
+| [...]/System.Net.Requests.dll |
+| [...]/System.Net.Security.dll |
+| [...]/System.Net.ServicePoint.dll |
+| [...]/System.Net.Sockets.dll |
+| [...]/System.Net.WebClient.dll |
+| [...]/System.Net.WebHeaderCollection.dll |
+| [...]/System.Net.WebProxy.dll |
+| [...]/System.Net.WebSockets.Client.dll |
+| [...]/System.Net.WebSockets.dll |
+| [...]/System.Net.dll |
+| [...]/System.Numerics.Vectors.dll |
+| [...]/System.Numerics.dll |
+| [...]/System.ObjectModel.dll |
+| [...]/System.Private.CoreLib.dll |
+| [...]/System.Private.DataContractSerialization.dll |
+| [...]/System.Private.Uri.dll |
+| [...]/System.Private.Xml.Linq.dll |
+| [...]/System.Private.Xml.dll |
+| [...]/System.Reflection.DispatchProxy.dll |
+| [...]/System.Reflection.Emit.ILGeneration.dll |
+| [...]/System.Reflection.Emit.Lightweight.dll |
+| [...]/System.Reflection.Emit.dll |
+| [...]/System.Reflection.Extensions.dll |
+| [...]/System.Reflection.Metadata.dll |
+| [...]/System.Reflection.MetadataLoadContext.dll |
+| [...]/System.Reflection.Primitives.dll |
+| [...]/System.Reflection.TypeExtensions.dll |
+| [...]/System.Reflection.dll |
+| [...]/System.Resources.Reader.dll |
+| [...]/System.Resources.ResourceManager.dll |
+| [...]/System.Resources.Writer.dll |
+| [...]/System.Runtime.CompilerServices.Unsafe.dll |
+| [...]/System.Runtime.CompilerServices.VisualC.dll |
+| [...]/System.Runtime.Extensions.dll |
+| [...]/System.Runtime.Handles.dll |
+| [...]/System.Runtime.InteropServices.JavaScript.dll |
+| [...]/System.Runtime.InteropServices.RuntimeInformation.dll |
+| [...]/System.Runtime.InteropServices.dll |
+| [...]/System.Runtime.Intrinsics.dll |
+| [...]/System.Runtime.Loader.dll |
+| [...]/System.Runtime.Numerics.dll |
+| [...]/System.Runtime.Serialization.Formatters.dll |
+| [...]/System.Runtime.Serialization.Json.dll |
+| [...]/System.Runtime.Serialization.Primitives.dll |
+| [...]/System.Runtime.Serialization.Xml.dll |
+| [...]/System.Runtime.Serialization.dll |
+| [...]/System.Runtime.dll |
+| [...]/System.Security.AccessControl.dll |
+| [...]/System.Security.Claims.dll |
+| [...]/System.Security.Cryptography.Algorithms.dll |
+| [...]/System.Security.Cryptography.Cng.dll |
+| [...]/System.Security.Cryptography.Csp.dll |
+| [...]/System.Security.Cryptography.Encoding.dll |
+| [...]/System.Security.Cryptography.OpenSsl.dll |
+| [...]/System.Security.Cryptography.Primitives.dll |
+| [...]/System.Security.Cryptography.ProtectedData.dll |
+| [...]/System.Security.Cryptography.X509Certificates.dll |
+| [...]/System.Security.Cryptography.dll |
+| [...]/System.Security.Permissions.dll |
+| [...]/System.Security.Principal.Windows.dll |
+| [...]/System.Security.Principal.dll |
+| [...]/System.Security.SecureString.dll |
+| [...]/System.Security.dll |
+| [...]/System.ServiceModel.Web.dll |
+| [...]/System.ServiceProcess.dll |
+| [...]/System.Text.Encoding.CodePages.dll |
+| [...]/System.Text.Encoding.Extensions.dll |
+| [...]/System.Text.Encoding.dll |
+| [...]/System.Text.Encodings.Web.dll |
+| [...]/System.Text.Json.dll |
+| [...]/System.Text.RegularExpressions.dll |
+| [...]/System.Threading.Channels.dll |
+| [...]/System.Threading.Overlapped.dll |
+| [...]/System.Threading.Tasks.Dataflow.dll |
+| [...]/System.Threading.Tasks.Extensions.dll |
+| [...]/System.Threading.Tasks.Parallel.dll |
+| [...]/System.Threading.Tasks.dll |
+| [...]/System.Threading.Thread.dll |
+| [...]/System.Threading.ThreadPool.dll |
+| [...]/System.Threading.Timer.dll |
+| [...]/System.Threading.dll |
+| [...]/System.Transactions.Local.dll |
+| [...]/System.Transactions.dll |
+| [...]/System.ValueTuple.dll |
+| [...]/System.Web.HttpUtility.dll |
+| [...]/System.Web.dll |
+| [...]/System.Windows.Extensions.dll |
+| [...]/System.Windows.dll |
+| [...]/System.Xml.Linq.dll |
+| [...]/System.Xml.ReaderWriter.dll |
+| [...]/System.Xml.Serialization.dll |
+| [...]/System.Xml.XDocument.dll |
+| [...]/System.Xml.XPath.XDocument.dll |
+| [...]/System.Xml.XPath.dll |
+| [...]/System.Xml.XmlDocument.dll |
+| [...]/System.Xml.XmlSerializer.dll |
+| [...]/System.Xml.dll |
+| [...]/System.dll |
+| [...]/WindowsBase.dll |
+| [...]/mscorlib.dll |
+| [...]/netstandard.dll |
+| [...]/zh-Hant/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll |
+| [...]/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll |
+| [...]/zh-Hant/Microsoft.CodeAnalysis.VisualBasic.Workspaces.resources.dll |
+| [...]/zh-Hant/Microsoft.CodeAnalysis.VisualBasic.resources.dll |
+| [...]/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll |
+| [...]/zh-Hant/Microsoft.CodeAnalysis.resources.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.ql
new file mode 100644
index 00000000000..3bb648c579a
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.ql
@@ -0,0 +1,21 @@
+import csharp
+
+private string getPath(Assembly a) {
+  not a.getCompilation().getOutputAssembly() = a and
+  exists(string s | s = a.getFile().getAbsolutePath() |
+    result =
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/packages".length(), s.length())
+    or
+    exists(string sub | sub = "csharp/tools/" + ["osx64", "linux64"] |
+      result = "[...]" + s.substring(s.indexOf(sub) + sub.length(), s.length())
+    )
+    or
+    result = s and
+    not exists(s.indexOf(["test-db/working/", "csharp/tools/"]))
+  )
+}
+
+from Assembly a
+select getPath(a)
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Program.cs b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Program.cs
new file mode 100644
index 00000000000..39a9e95bb6e
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Program.cs
@@ -0,0 +1,6 @@
+class Program
+{
+    static void Main(string[] args)
+    {
+    }
+}
\ No newline at end of file
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json
new file mode 100644
index 00000000000..d54915e8d4d
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "8.0.101"
+  }
+}
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/test.py b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/test.py
new file mode 100644
index 00000000000..a17966e148a
--- /dev/null
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create([], lang="csharp", extra_args=["--build-mode=none"])

From 6299d9cecd1e562c9859a2ee8b0f3580ed391ff1 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 20 Mar 2024 15:19:13 +0100
Subject: [PATCH 127/136] C#: Introduce AssemblyPath and re-factor
 AssemblyCache to use this instead of strings.

---
 .../AssemblyCache.cs                          | 108 +++++++++++++-----
 .../DependencyManager.Nuget.cs                |   8 +-
 .../DependencyManager.cs                      |  22 ++--
 3 files changed, 92 insertions(+), 46 deletions(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
index 3d6672560b6..0d2393faa0a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
@@ -1,10 +1,84 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Semmle.Util.Logging;
 
 namespace Semmle.Extraction.CSharp.DependencyFetching
 {
+    /// <summary>
+    /// Used to represent a path to an assembly or a directory containing assemblies
+    /// and a selector function to determine which files to include, when indexing the assemblies.
+    /// </summary>
+    internal sealed class AssemblyPath(string p, Func<string, bool> includeFileName)
+    {
+        public string Path => p;
+
+        public AssemblyPath(string p) : this(p, _ => true) { }
+
+        public static implicit operator AssemblyPath(string path) => new(path);
+
+        /// <summary>
+        /// Finds all assemblies nested within the directory `path`
+        /// and adds them to the a list of assembly names to index.
+        /// Indexing is performed at a later stage. This only collects the names.
+        /// </summary>
+        /// <param name="dir">The directory to index.</param>
+        private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)
+        {
+            foreach (var dll in new DirectoryInfo(p).EnumerateFiles("*.dll", SearchOption.AllDirectories))
+            {
+                if (includeFileName(dll.Name))
+                {
+                    dllsToIndex.Add(dll.FullName);
+                }
+                else
+                {
+                    logger.LogInfo($"AssemblyPath: Skipping {dll.FullName}.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Finds all assemblies in `p` that should be indexed and adds them to
+        /// the list of assembly names to index.
+        /// </summary>
+        /// <param name="dllsToIndex">List of assembly names to index.</param>
+        /// <param name="logger">Logger</param>
+        public void Process(List<string> dllsToIndex, ILogger logger)
+        {
+            if (File.Exists(p))
+            {
+                if (includeFileName(System.IO.Path.GetFileName(p)))
+                {
+                    dllsToIndex.Add(p);
+                }
+                else
+                {
+                    logger.LogInfo($"AssemblyPath: Skipping {p}.");
+                }
+                return;
+            }
+
+            if (Directory.Exists(p))
+            {
+                logger.LogInfo($"AssemblyPath: Finding reference DLLs in {p}...");
+                AddReferenceDirectory(dllsToIndex, logger);
+            }
+            else
+            {
+                logger.LogInfo("AssemblyCache: Path not found: " + p);
+            }
+        }
+
+        public override bool Equals(object? obj) =>
+            obj is AssemblyPath ap && p.Equals(ap.Path);
+
+        public override int GetHashCode() => p.GetHashCode();
+
+        public override string ToString() => p;
+    }
+
     /// <summary>
     /// Manages the set of assemblies.
     /// Searches for assembly DLLs, indexes them and provides
@@ -20,44 +94,16 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// assembly cache.
         /// </param>
         /// <param name="logger">Callback for progress.</param>
-        public AssemblyCache(IEnumerable<string> paths, IEnumerable<string> frameworkPaths, ILogger logger)
+        public AssemblyCache(IEnumerable<AssemblyPath> paths, IEnumerable<string> frameworkPaths, ILogger logger)
         {
             this.logger = logger;
             foreach (var path in paths)
             {
-                if (File.Exists(path))
-                {
-                    dllsToIndex.Add(path);
-                    continue;
-                }
-
-                if (Directory.Exists(path))
-                {
-                    logger.LogInfo($"Finding reference DLLs in {path}...");
-                    AddReferenceDirectory(path);
-                }
-                else
-                {
-                    logger.LogInfo("AssemblyCache: Path not found: " + path);
-                }
+                path.Process(dllsToIndex, logger);
             }
             IndexReferences(frameworkPaths);
         }
 
-        /// <summary>
-        /// Finds all assemblies nested within a directory
-        /// and adds them to its index.
-        /// (Indexing is performed at a later stage by IndexReferences()).
-        /// </summary>
-        /// <param name="dir">The directory to index.</param>
-        private void AddReferenceDirectory(string dir)
-        {
-            foreach (var dll in new DirectoryInfo(dir).EnumerateFiles("*.dll", SearchOption.AllDirectories))
-            {
-                dllsToIndex.Add(dll.FullName);
-            }
-        }
-
         /// <summary>
         /// Indexes all DLLs we have located.
         /// Because this is a potentially time-consuming operation, it is put into a separate stage.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
index 1f3f44425d5..e808235e54d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     public sealed partial class DependencyManager
     {
-        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<string> dllPaths)
+        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyPath> dllPaths)
         {
             try
             {
@@ -55,7 +55,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 }
 
                 nugetPackageDllPaths.ExceptWith(excludedPaths);
-                dllPaths.UnionWith(nugetPackageDllPaths);
+                dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyPath(p)));
             }
             catch (Exception exc)
             {
@@ -72,7 +72,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .Paths
                 .Select(d => Path.Combine(packageDirectory.DirInfo.FullName, d))
                 .ToList();
-            dllPaths.UnionWith(paths);
+            dllPaths.UnionWith(paths.Select(p => new AssemblyPath(p)));
 
             LogAllUnusedPackages(dependencies);
             DownloadMissingPackages(allNonBinaryFiles, dllPaths);
@@ -148,7 +148,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
         }
 
-        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<string> dllPaths, bool withNugetConfig = true)
+        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyPath> dllPaths, bool withNugetConfig = true)
         {
             var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 8d63d7f42b2..55c41f31601 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -46,7 +46,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// <summary>
         /// Performs C# dependency fetching.
         /// </summary>
-        /// <param name="options">Dependency fetching options</param>
+        /// <param name="srcDir">Path to directory containing source code.</param>
         /// <param name="logger">Logger for dependency fetching progress.</param>
         public DependencyManager(string srcDir, ILogger logger)
         {
@@ -91,7 +91,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             this.generatedSources = new();
             var allProjects = allNonBinaryFiles.SelectFileNamesByExtension(".csproj").ToList();
             var allSolutions = allNonBinaryFiles.SelectFileNamesByExtension(".sln").ToList();
-            var dllPaths = allFiles.SelectFileNamesByExtension(".dll").ToHashSet();
+            var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select<string, AssemblyPath>(x => x).ToHashSet();
 
             logger.LogInfo($"Found {allFiles.Count} files, {nonGeneratedSources.Count} source files, {allProjects.Count} project files, {allSolutions.Count} solution files, {dllPaths.Count} DLLs.");
 
@@ -192,7 +192,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             ]);
         }
 
-        private HashSet<string> AddFrameworkDlls(HashSet<string> dllPaths)
+        private HashSet<string> AddFrameworkDlls(HashSet<AssemblyPath> dllPaths)
         {
             var frameworkLocations = new HashSet<string>();
 
@@ -230,7 +230,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                             continue;
                         }
 
-                        dllPaths.UnionWith(dlls);
+                        dllPaths.UnionWith(dlls.Select<string, AssemblyPath>(x => x));
                         frameworkLocations.UnionWith(dlls);
                     }
                     catch (Exception e)
@@ -284,7 +284,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<string> dllPaths, ISet<string> frameworkLocations)
+        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
         {
             var versionFolders = GetPackageVersionSubDirectories(frameworkPath);
             if (versionFolders.Length > 1)
@@ -313,7 +313,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .ToArray();
         }
 
-        private void RemoveFrameworkNugetPackages(ISet<string> dllPaths, int fromIndex = 0)
+        private void RemoveFrameworkNugetPackages(ISet<AssemblyPath> dllPaths, int fromIndex = 0)
         {
             var packagesInPrioOrder = FrameworkPackageNames.NetFrameworks;
             for (var i = fromIndex; i < packagesInPrioOrder.Length; i++)
@@ -322,7 +322,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private void AddNetFrameworkDlls(ISet<string> dllPaths, ISet<string> frameworkLocations)
+        private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
         {
             // Multiple dotnet framework packages could be present.
             // The order of the packages is important, we're adding the first one that is present in the nuget cache.
@@ -375,7 +375,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             frameworkLocations.Add(runtimeLocation);
         }
 
-        private void RemoveNugetPackageReference(string packagePrefix, ISet<string> dllPaths)
+        private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyPath> dllPaths)
         {
             var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();
             if (packageFolder == null)
@@ -384,7 +384,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
 
             var packagePathPrefix = Path.Combine(packageFolder, packagePrefix.ToLowerInvariant());
-            var toRemove = dllPaths.Where(s => s.StartsWith(packagePathPrefix, StringComparison.InvariantCultureIgnoreCase));
+            var toRemove = dllPaths.Where(s => s.Path.StartsWith(packagePathPrefix, StringComparison.InvariantCultureIgnoreCase));
             foreach (var path in toRemove)
             {
                 dllPaths.Remove(path);
@@ -397,7 +397,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return fileContent.IsNewProjectStructureUsed && fileContent.UseAspNetCoreDlls;
         }
 
-        private void AddAspNetCoreFrameworkDlls(ISet<string> dllPaths, ISet<string> frameworkLocations)
+        private void AddAspNetCoreFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
         {
             if (!IsAspNetCoreDetected())
             {
@@ -419,7 +419,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private void AddMicrosoftWindowsDesktopDlls(ISet<string> dllPaths, ISet<string> frameworkLocations)
+        private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
         {
             if (GetPackageDirectory(FrameworkPackageNames.WindowsDesktopFramework, packageDirectory) is string windowsDesktopApp)
             {

From 646b272b4e0befe19902a10c3dee5af2e6870836 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Fri, 5 Apr 2024 10:01:20 +0200
Subject: [PATCH 128/136] C#: Move the AssemblyPath class to its own file.

---
 .../AssemblyCache.cs                          | 77 +-----------------
 .../AssemblyPath.cs                           | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+), 76 deletions(-)
 create mode 100644 csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyPath.cs

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
index 0d2393faa0a..f1ee65319ab 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
@@ -1,84 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Linq;
 using Semmle.Util.Logging;
 
 namespace Semmle.Extraction.CSharp.DependencyFetching
 {
-    /// <summary>
-    /// Used to represent a path to an assembly or a directory containing assemblies
-    /// and a selector function to determine which files to include, when indexing the assemblies.
-    /// </summary>
-    internal sealed class AssemblyPath(string p, Func<string, bool> includeFileName)
-    {
-        public string Path => p;
-
-        public AssemblyPath(string p) : this(p, _ => true) { }
-
-        public static implicit operator AssemblyPath(string path) => new(path);
-
-        /// <summary>
-        /// Finds all assemblies nested within the directory `path`
-        /// and adds them to the a list of assembly names to index.
-        /// Indexing is performed at a later stage. This only collects the names.
-        /// </summary>
-        /// <param name="dir">The directory to index.</param>
-        private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)
-        {
-            foreach (var dll in new DirectoryInfo(p).EnumerateFiles("*.dll", SearchOption.AllDirectories))
-            {
-                if (includeFileName(dll.Name))
-                {
-                    dllsToIndex.Add(dll.FullName);
-                }
-                else
-                {
-                    logger.LogInfo($"AssemblyPath: Skipping {dll.FullName}.");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Finds all assemblies in `p` that should be indexed and adds them to
-        /// the list of assembly names to index.
-        /// </summary>
-        /// <param name="dllsToIndex">List of assembly names to index.</param>
-        /// <param name="logger">Logger</param>
-        public void Process(List<string> dllsToIndex, ILogger logger)
-        {
-            if (File.Exists(p))
-            {
-                if (includeFileName(System.IO.Path.GetFileName(p)))
-                {
-                    dllsToIndex.Add(p);
-                }
-                else
-                {
-                    logger.LogInfo($"AssemblyPath: Skipping {p}.");
-                }
-                return;
-            }
-
-            if (Directory.Exists(p))
-            {
-                logger.LogInfo($"AssemblyPath: Finding reference DLLs in {p}...");
-                AddReferenceDirectory(dllsToIndex, logger);
-            }
-            else
-            {
-                logger.LogInfo("AssemblyCache: Path not found: " + p);
-            }
-        }
-
-        public override bool Equals(object? obj) =>
-            obj is AssemblyPath ap && p.Equals(ap.Path);
-
-        public override int GetHashCode() => p.GetHashCode();
-
-        public override string ToString() => p;
-    }
-
     /// <summary>
     /// Manages the set of assemblies.
     /// Searches for assembly DLLs, indexes them and provides
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyPath.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyPath.cs
new file mode 100644
index 00000000000..816e0fef6a7
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyPath.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Semmle.Util.Logging;
+
+namespace Semmle.Extraction.CSharp.DependencyFetching
+{
+    /// <summary>
+    /// Used to represent a path to an assembly or a directory containing assemblies
+    /// and a selector function to determine which files to include, when indexing the assemblies.
+    /// </summary>
+    internal sealed class AssemblyPath(string p, Func<string, bool> includeFileName)
+    {
+        public string Path => p;
+
+        public AssemblyPath(string p) : this(p, _ => true) { }
+
+        public static implicit operator AssemblyPath(string path) => new(path);
+
+        /// <summary>
+        /// Finds all assemblies nested within the directory `path`
+        /// and adds them to the a list of assembly names to index.
+        /// Indexing is performed at a later stage. This only collects the names.
+        /// </summary>
+        /// <param name="dir">The directory to index.</param>
+        private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)
+        {
+            foreach (var dll in new DirectoryInfo(p).EnumerateFiles("*.dll", SearchOption.AllDirectories))
+            {
+                if (includeFileName(dll.Name))
+                {
+                    dllsToIndex.Add(dll.FullName);
+                }
+                else
+                {
+                    logger.LogInfo($"AssemblyPath: Skipping {dll.FullName}.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Finds all assemblies in `p` that should be indexed and adds them to
+        /// the list of assembly names to index.
+        /// </summary>
+        /// <param name="dllsToIndex">List of assembly names to index.</param>
+        /// <param name="logger">Logger</param>
+        public void Process(List<string> dllsToIndex, ILogger logger)
+        {
+            if (File.Exists(p))
+            {
+                if (includeFileName(System.IO.Path.GetFileName(p)))
+                {
+                    dllsToIndex.Add(p);
+                }
+                else
+                {
+                    logger.LogInfo($"AssemblyPath: Skipping {p}.");
+                }
+                return;
+            }
+
+            if (Directory.Exists(p))
+            {
+                logger.LogInfo($"AssemblyPath: Finding reference DLLs in {p}...");
+                AddReferenceDirectory(dllsToIndex, logger);
+            }
+            else
+            {
+                logger.LogInfo("AssemblyCache: Path not found: " + p);
+            }
+        }
+
+        public override bool Equals(object? obj) =>
+            obj is AssemblyPath ap && p.Equals(ap.Path);
+
+        public override int GetHashCode() => p.GetHashCode();
+
+        public override string ToString() => p;
+    }
+}

From d04bf6b6d637055103b795c00bbd9872c7276c96 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Fri, 5 Apr 2024 14:55:55 +0200
Subject: [PATCH 129/136] C#: Don't include Semmle.* dlls, if the executing
 runtime is used as framework.

---
 .../DependencyManager.cs                              | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 55c41f31601..228f26850f8 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -368,10 +368,17 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 }
             }
 
-            runtimeLocation ??= Runtime.ExecutingRuntime;
+            if (runtimeLocation is null)
+            {
+                runtimeLocation ??= Runtime.ExecutingRuntime;
+                dllPaths.Add(new AssemblyPath(runtimeLocation, name => !name.StartsWith("Semmle.")));
+            }
+            else
+            {
+                dllPaths.Add(runtimeLocation);
+            }
 
             logger.LogInfo($".NET runtime location selected: {runtimeLocation}");
-            dllPaths.Add(runtimeLocation);
             frameworkLocations.Add(runtimeLocation);
         }
 

From 2bea927d43d2afbc5d5945abd1161e272992774d Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Fri, 5 Apr 2024 14:56:20 +0200
Subject: [PATCH 130/136] C#: Update expected test output.

---
 .../Assemblies.expected                                  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected
index f4f8290eb75..772f640789e 100644
--- a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/Assemblies.expected
@@ -17,15 +17,6 @@
 | [...]/Microsoft.Win32.SystemEvents.dll |
 | [...]/Mono.Posix.NETStandard.dll |
 | [...]/Newtonsoft.Json.dll |
-| [...]/Semmle.Autobuild.CSharp.dll |
-| [...]/Semmle.Autobuild.Shared.dll |
-| [...]/Semmle.Extraction.CSharp.DependencyFetching.dll |
-| [...]/Semmle.Extraction.CSharp.Driver.dll |
-| [...]/Semmle.Extraction.CSharp.Standalone.dll |
-| [...]/Semmle.Extraction.CSharp.Util.dll |
-| [...]/Semmle.Extraction.CSharp.dll |
-| [...]/Semmle.Extraction.dll |
-| [...]/Semmle.Util.dll |
 | [...]/System.AppContext.dll |
 | [...]/System.Buffers.dll |
 | [...]/System.Collections.Concurrent.dll |

From 9eb13833faeac9c2bfdb2eaf247f1ee61907d7ff Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Tue, 9 Apr 2024 11:57:25 +0200
Subject: [PATCH 131/136] C#: Code quality improvements.

---
 .../AssemblyCache.cs                          |  4 +--
 ...emblyPath.cs => AssemblyLookupLocation.cs} | 26 +++++++++----------
 .../DependencyManager.Nuget.cs                |  8 +++---
 .../DependencyManager.cs                      | 20 +++++++-------
 4 files changed, 29 insertions(+), 29 deletions(-)
 rename csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/{AssemblyPath.cs => AssemblyLookupLocation.cs} (67%)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
index f1ee65319ab..62a053870e9 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
@@ -19,12 +19,12 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// assembly cache.
         /// </param>
         /// <param name="logger">Callback for progress.</param>
-        public AssemblyCache(IEnumerable<AssemblyPath> paths, IEnumerable<string> frameworkPaths, ILogger logger)
+        public AssemblyCache(IEnumerable<AssemblyLookupLocation> paths, IEnumerable<string> frameworkPaths, ILogger logger)
         {
             this.logger = logger;
             foreach (var path in paths)
             {
-                path.Process(dllsToIndex, logger);
+                dllsToIndex.AddRange(path.GetDlls(logger));
             }
             IndexReferences(frameworkPaths);
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyPath.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
similarity index 67%
rename from csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyPath.cs
rename to csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
index 816e0fef6a7..380c60cab56 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyPath.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
@@ -9,13 +9,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     /// Used to represent a path to an assembly or a directory containing assemblies
     /// and a selector function to determine which files to include, when indexing the assemblies.
     /// </summary>
-    internal sealed class AssemblyPath(string p, Func<string, bool> includeFileName)
+    internal sealed class AssemblyLookupLocation(string p, Func<string, bool> includeFileName)
     {
         public string Path => p;
 
-        public AssemblyPath(string p) : this(p, _ => true) { }
+        public AssemblyLookupLocation(string p) : this(p, _ => true) { }
 
-        public static implicit operator AssemblyPath(string path) => new(path);
+        public static implicit operator AssemblyLookupLocation(string path) => new(path);
 
         /// <summary>
         /// Finds all assemblies nested within the directory `path`
@@ -33,19 +33,18 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 }
                 else
                 {
-                    logger.LogInfo($"AssemblyPath: Skipping {dll.FullName}.");
+                    logger.LogInfo($"AssemblyLookupLocation: Skipping {dll.FullName}.");
                 }
             }
         }
 
         /// <summary>
-        /// Finds all assemblies in `p` that should be indexed and adds them to
-        /// the list of assembly names to index.
+        /// Returns a list of paths to all assemblies in `p` that should be indexed.
         /// </summary>
-        /// <param name="dllsToIndex">List of assembly names to index.</param>
         /// <param name="logger">Logger</param>
-        public void Process(List<string> dllsToIndex, ILogger logger)
+        public List<string> GetDlls(ILogger logger)
         {
+            var dllsToIndex = new List<string>();
             if (File.Exists(p))
             {
                 if (includeFileName(System.IO.Path.GetFileName(p)))
@@ -54,24 +53,25 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 }
                 else
                 {
-                    logger.LogInfo($"AssemblyPath: Skipping {p}.");
+                    logger.LogInfo($"AssemblyLookupLocation: Skipping {p}.");
                 }
-                return;
+                return dllsToIndex;
             }
 
             if (Directory.Exists(p))
             {
-                logger.LogInfo($"AssemblyPath: Finding reference DLLs in {p}...");
+                logger.LogInfo($"AssemblyLookupLocation: Finding reference DLLs in {p}...");
                 AddReferenceDirectory(dllsToIndex, logger);
             }
             else
             {
-                logger.LogInfo("AssemblyCache: Path not found: " + p);
+                logger.LogInfo("AssemblyLookupLocation: Path not found: " + p);
             }
+            return dllsToIndex;
         }
 
         public override bool Equals(object? obj) =>
-            obj is AssemblyPath ap && p.Equals(ap.Path);
+            obj is AssemblyLookupLocation ap && p.Equals(ap.Path);
 
         public override int GetHashCode() => p.GetHashCode();
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
index e808235e54d..40f240f3145 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     public sealed partial class DependencyManager
     {
-        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyPath> dllPaths)
+        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyLookupLocation> dllPaths)
         {
             try
             {
@@ -55,7 +55,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 }
 
                 nugetPackageDllPaths.ExceptWith(excludedPaths);
-                dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyPath(p)));
+                dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyLookupLocation(p)));
             }
             catch (Exception exc)
             {
@@ -72,7 +72,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .Paths
                 .Select(d => Path.Combine(packageDirectory.DirInfo.FullName, d))
                 .ToList();
-            dllPaths.UnionWith(paths.Select(p => new AssemblyPath(p)));
+            dllPaths.UnionWith(paths.Select(p => new AssemblyLookupLocation(p)));
 
             LogAllUnusedPackages(dependencies);
             DownloadMissingPackages(allNonBinaryFiles, dllPaths);
@@ -148,7 +148,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
         }
 
-        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyPath> dllPaths, bool withNugetConfig = true)
+        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyLookupLocation> dllPaths, bool withNugetConfig = true)
         {
             var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 228f26850f8..a59312a1e35 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -91,7 +91,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             this.generatedSources = new();
             var allProjects = allNonBinaryFiles.SelectFileNamesByExtension(".csproj").ToList();
             var allSolutions = allNonBinaryFiles.SelectFileNamesByExtension(".sln").ToList();
-            var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select<string, AssemblyPath>(x => x).ToHashSet();
+            var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select(x => new AssemblyLookupLocation(x)).ToHashSet();
 
             logger.LogInfo($"Found {allFiles.Count} files, {nonGeneratedSources.Count} source files, {allProjects.Count} project files, {allSolutions.Count} solution files, {dllPaths.Count} DLLs.");
 
@@ -192,7 +192,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             ]);
         }
 
-        private HashSet<string> AddFrameworkDlls(HashSet<AssemblyPath> dllPaths)
+        private HashSet<string> AddFrameworkDlls(HashSet<AssemblyLookupLocation> dllPaths)
         {
             var frameworkLocations = new HashSet<string>();
 
@@ -230,7 +230,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                             continue;
                         }
 
-                        dllPaths.UnionWith(dlls.Select<string, AssemblyPath>(x => x));
+                        dllPaths.UnionWith(dlls.Select(x => new AssemblyLookupLocation(x)));
                         frameworkLocations.UnionWith(dlls);
                     }
                     catch (Exception e)
@@ -284,7 +284,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             var versionFolders = GetPackageVersionSubDirectories(frameworkPath);
             if (versionFolders.Length > 1)
@@ -313,7 +313,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .ToArray();
         }
 
-        private void RemoveFrameworkNugetPackages(ISet<AssemblyPath> dllPaths, int fromIndex = 0)
+        private void RemoveFrameworkNugetPackages(ISet<AssemblyLookupLocation> dllPaths, int fromIndex = 0)
         {
             var packagesInPrioOrder = FrameworkPackageNames.NetFrameworks;
             for (var i = fromIndex; i < packagesInPrioOrder.Length; i++)
@@ -322,7 +322,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void AddNetFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             // Multiple dotnet framework packages could be present.
             // The order of the packages is important, we're adding the first one that is present in the nuget cache.
@@ -371,7 +371,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             if (runtimeLocation is null)
             {
                 runtimeLocation ??= Runtime.ExecutingRuntime;
-                dllPaths.Add(new AssemblyPath(runtimeLocation, name => !name.StartsWith("Semmle.")));
+                dllPaths.Add(new AssemblyLookupLocation(runtimeLocation, name => !name.StartsWith("Semmle.")));
             }
             else
             {
@@ -382,7 +382,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             frameworkLocations.Add(runtimeLocation);
         }
 
-        private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyPath> dllPaths)
+        private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyLookupLocation> dllPaths)
         {
             var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();
             if (packageFolder == null)
@@ -404,7 +404,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return fileContent.IsNewProjectStructureUsed && fileContent.UseAspNetCoreDlls;
         }
 
-        private void AddAspNetCoreFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void AddAspNetCoreFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             if (!IsAspNetCoreDetected())
             {
@@ -426,7 +426,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             if (GetPackageDirectory(FrameworkPackageNames.WindowsDesktopFramework, packageDirectory) is string windowsDesktopApp)
             {

From 99f0ed26e9791f1bdf2e2e0ea8736e2958f0a73f Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Tue, 9 Apr 2024 13:01:20 +0200
Subject: [PATCH 132/136] C#: Make the assembly lookup case insensitive on the
 dll file extension and log if no dlls are found in a directory.

---
 .../AssemblyLookupLocation.cs                            | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
index 380c60cab56..8711b7f2a6c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Semmle.Util.Logging;
 
 namespace Semmle.Extraction.CSharp.DependencyFetching
@@ -25,7 +26,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// <param name="dir">The directory to index.</param>
         private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)
         {
-            foreach (var dll in new DirectoryInfo(p).EnumerateFiles("*.dll", SearchOption.AllDirectories))
+            var dlls = new DirectoryInfo(p).EnumerateFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = true, MatchCasing = MatchCasing.CaseInsensitive, AttributesToSkip = FileAttributes.None });
+            if (!dlls.Any())
+            {
+                logger.LogWarning($"AssemblyLookupLocation: No DLLs found in the path '{p}'.");
+                return;
+            }
+            foreach (var dll in dlls)
             {
                 if (includeFileName(dll.Name))
                 {

From a18a4fb62e1a8fc503279a87d9a3f37c03519737 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Wed, 10 Apr 2024 11:38:27 +0100
Subject: [PATCH 133/136] Avoid magic in `TSynthLocation` definition

This improves performance, because in this case magic is not beneficial.
---
 go/ql/lib/semmle/go/internal/Locations.qll | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/go/ql/lib/semmle/go/internal/Locations.qll b/go/ql/lib/semmle/go/internal/Locations.qll
index 498ac9d1170..8b0a206b883 100644
--- a/go/ql/lib/semmle/go/internal/Locations.qll
+++ b/go/ql/lib/semmle/go/internal/Locations.qll
@@ -11,12 +11,19 @@ newtype TLocation =
   TSynthLocation(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
     any(DataFlow::Node n).hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
     // avoid overlap with existing DB locations
-    not exists(File f |
-      locations_default(_, f, startline, startcolumn, endline, endcolumn) and
-      f.getAbsolutePath() = filepath
-    )
+    not existingDBLocation(filepath, startline, startcolumn, endline, endcolumn)
   }
 
+pragma[nomagic]
+private predicate existingDBLocation(
+  string filepath, int startline, int startcolumn, int endline, int endcolumn
+) {
+  exists(File f |
+    locations_default(_, f, startline, startcolumn, endline, endcolumn) and
+    f.getAbsolutePath() = filepath
+  )
+}
+
 /**
  * A location as given by a file, a start line, a start column,
  * an end line, and an end column.

From 3b42dc25a144c8dc64fecbd01075a5b9e399dae0 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Tue, 9 Apr 2024 16:16:21 +0200
Subject: [PATCH 134/136] C#: Also use AssemblyLookupLocation for framework
 dlls.

---
 .../AssemblyLookupLocation.cs                 | 35 +++++++++++--------
 .../DependencyManager.cs                      | 25 ++-----------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
index 8711b7f2a6c..533b547e45d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
@@ -10,7 +10,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     /// Used to represent a path to an assembly or a directory containing assemblies
     /// and a selector function to determine which files to include, when indexing the assemblies.
     /// </summary>
-    internal sealed class AssemblyLookupLocation(string p, Func<string, bool> includeFileName)
+    internal sealed class AssemblyLookupLocation(string p, Func<string, bool> includeFileName, bool indexSubdirectories = true)
     {
         public string Path => p;
 
@@ -26,22 +26,29 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// <param name="dir">The directory to index.</param>
         private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)
         {
-            var dlls = new DirectoryInfo(p).EnumerateFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = true, MatchCasing = MatchCasing.CaseInsensitive, AttributesToSkip = FileAttributes.None });
-            if (!dlls.Any())
+            try
             {
-                logger.LogWarning($"AssemblyLookupLocation: No DLLs found in the path '{p}'.");
-                return;
+                var dlls = new DirectoryInfo(p).EnumerateFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = indexSubdirectories, MatchCasing = MatchCasing.CaseInsensitive, AttributesToSkip = FileAttributes.None });
+                if (!dlls.Any())
+                {
+                    logger.LogWarning($"AssemblyLookupLocation: No DLLs found in the path '{p}'.");
+                    return;
+                }
+                foreach (var dll in dlls)
+                {
+                    if (includeFileName(dll.Name))
+                    {
+                        dllsToIndex.Add(dll.FullName);
+                    }
+                    else
+                    {
+                        logger.LogInfo($"AssemblyLookupLocation: Skipping {dll.FullName}.");
+                    }
+                }
             }
-            foreach (var dll in dlls)
+            catch (Exception e)
             {
-                if (includeFileName(dll.Name))
-                {
-                    dllsToIndex.Add(dll.FullName);
-                }
-                else
-                {
-                    logger.LogInfo($"AssemblyLookupLocation: Skipping {dll.FullName}.");
-                }
+                logger.LogError($"AssemblyLookupLocation: Error while searching for DLLs in '{p}': {e.Message}");
             }
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index a59312a1e35..8115b0e8ae5 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -214,29 +214,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                         continue;
                     }
 
-                    if (useSubfolders)
-                    {
-                        dllPaths.Add(path);
-                        frameworkLocations.Add(path);
-                        continue;
-                    }
-
-                    try
-                    {
-                        var dlls = Directory.GetFiles(path, "*.dll", new EnumerationOptions { RecurseSubdirectories = false, MatchCasing = MatchCasing.CaseInsensitive });
-                        if (dlls.Length == 0)
-                        {
-                            logger.LogError($"No DLLs found in specified framework reference path '{path}'.");
-                            continue;
-                        }
-
-                        dllPaths.UnionWith(dlls.Select(x => new AssemblyLookupLocation(x)));
-                        frameworkLocations.UnionWith(dlls);
-                    }
-                    catch (Exception e)
-                    {
-                        logger.LogError($"Error while searching for DLLs in '{path}': {e.Message}");
-                    }
+                    dllPaths.Add(new AssemblyLookupLocation(path, _ => true, useSubfolders));
+                    frameworkLocations.Add(path);
                 }
 
                 return frameworkLocations;

From ff498f616a9896fb18f693d2cb4c36cd9be4f8d7 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 10 Apr 2024 13:20:57 +0200
Subject: [PATCH 135/136] C#: Some renaming.

---
 .../DependencyManager.Nuget.cs                | 14 ++---
 .../DependencyManager.cs                      | 61 +++++++++----------
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
index 40f240f3145..cf9c7253b17 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -12,14 +12,14 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     public sealed partial class DependencyManager
     {
-        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyLookupLocation> dllPaths)
+        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyLookupLocation> dllLocations)
         {
             try
             {
                 var checkNugetFeedResponsiveness = EnvironmentVariables.GetBoolean(EnvironmentVariableNames.CheckNugetFeedResponsiveness);
                 if (checkNugetFeedResponsiveness && !CheckFeeds(allNonBinaryFiles))
                 {
-                    DownloadMissingPackages(allNonBinaryFiles, dllPaths, withNugetConfig: false);
+                    DownloadMissingPackages(allNonBinaryFiles, dllLocations, withNugetConfig: false);
                     return;
                 }
 
@@ -55,7 +55,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 }
 
                 nugetPackageDllPaths.ExceptWith(excludedPaths);
-                dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyLookupLocation(p)));
+                dllLocations.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyLookupLocation(p)));
             }
             catch (Exception exc)
             {
@@ -72,10 +72,10 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .Paths
                 .Select(d => Path.Combine(packageDirectory.DirInfo.FullName, d))
                 .ToList();
-            dllPaths.UnionWith(paths.Select(p => new AssemblyLookupLocation(p)));
+            dllLocations.UnionWith(paths.Select(p => new AssemblyLookupLocation(p)));
 
             LogAllUnusedPackages(dependencies);
-            DownloadMissingPackages(allNonBinaryFiles, dllPaths);
+            DownloadMissingPackages(allNonBinaryFiles, dllLocations);
         }
 
         /// <summary>
@@ -148,7 +148,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
         }
 
-        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyLookupLocation> dllPaths, bool withNugetConfig = true)
+        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyLookupLocation> dllLocations, bool withNugetConfig = true)
         {
             var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
@@ -206,7 +206,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
             CompilationInfos.Add(("Successfully ran fallback nuget restore", successCount.ToString()));
 
-            dllPaths.Add(missingPackageDirectory.DirInfo.FullName);
+            dllLocations.Add(missingPackageDirectory.DirInfo.FullName);
         }
 
         private string[] GetAllNugetConfigs(List<FileInfo> allFiles) => allFiles.SelectFileNamesByName("nuget.config").ToArray();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
index 8115b0e8ae5..7f8306c2d9d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 using Semmle.Util;
@@ -91,9 +90,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             this.generatedSources = new();
             var allProjects = allNonBinaryFiles.SelectFileNamesByExtension(".csproj").ToList();
             var allSolutions = allNonBinaryFiles.SelectFileNamesByExtension(".sln").ToList();
-            var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select(x => new AssemblyLookupLocation(x)).ToHashSet();
+            var dllLocations = allFiles.SelectFileNamesByExtension(".dll").Select(x => new AssemblyLookupLocation(x)).ToHashSet();
 
-            logger.LogInfo($"Found {allFiles.Count} files, {nonGeneratedSources.Count} source files, {allProjects.Count} project files, {allSolutions.Count} solution files, {dllPaths.Count} DLLs.");
+            logger.LogInfo($"Found {allFiles.Count} files, {nonGeneratedSources.Count} source files, {allProjects.Count} project files, {allSolutions.Count} solution files, {dllLocations.Count} DLLs.");
 
             void startCallback(string s, bool silent)
             {
@@ -122,12 +121,12 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 throw;
             }
 
-            RestoreNugetPackages(allNonBinaryFiles, allProjects, allSolutions, dllPaths);
+            RestoreNugetPackages(allNonBinaryFiles, allProjects, allSolutions, dllLocations);
             // Find DLLs in the .Net / Asp.Net Framework
             // This needs to come after the nuget restore, because the nuget restore might fetch the .NET Core/Framework reference assemblies.
-            var frameworkLocations = AddFrameworkDlls(dllPaths);
+            var frameworkLocations = AddFrameworkDlls(dllLocations);
 
-            assemblyCache = new AssemblyCache(dllPaths, frameworkLocations, logger);
+            assemblyCache = new AssemblyCache(dllLocations, frameworkLocations, logger);
             AnalyseSolutions(allSolutions);
 
             foreach (var filename in assemblyCache.AllAssemblies.Select(a => a.Filename))
@@ -192,7 +191,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             ]);
         }
 
-        private HashSet<string> AddFrameworkDlls(HashSet<AssemblyLookupLocation> dllPaths)
+        private HashSet<string> AddFrameworkDlls(HashSet<AssemblyLookupLocation> dllLocations)
         {
             var frameworkLocations = new HashSet<string>();
 
@@ -200,9 +199,9 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             var useSubfolders = EnvironmentVariables.GetBoolean(EnvironmentVariableNames.DotnetFrameworkReferencesUseSubfolders);
             if (!string.IsNullOrWhiteSpace(frameworkReferences))
             {
-                RemoveFrameworkNugetPackages(dllPaths);
-                RemoveNugetPackageReference(FrameworkPackageNames.AspNetCoreFramework, dllPaths);
-                RemoveNugetPackageReference(FrameworkPackageNames.WindowsDesktopFramework, dllPaths);
+                RemoveFrameworkNugetPackages(dllLocations);
+                RemoveNugetPackageReference(FrameworkPackageNames.AspNetCoreFramework, dllLocations);
+                RemoveNugetPackageReference(FrameworkPackageNames.WindowsDesktopFramework, dllLocations);
 
                 var frameworkPaths = frameworkReferences.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
 
@@ -214,16 +213,16 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                         continue;
                     }
 
-                    dllPaths.Add(new AssemblyLookupLocation(path, _ => true, useSubfolders));
+                    dllLocations.Add(new AssemblyLookupLocation(path, _ => true, useSubfolders));
                     frameworkLocations.Add(path);
                 }
 
                 return frameworkLocations;
             }
 
-            AddNetFrameworkDlls(dllPaths, frameworkLocations);
-            AddAspNetCoreFrameworkDlls(dllPaths, frameworkLocations);
-            AddMicrosoftWindowsDesktopDlls(dllPaths, frameworkLocations);
+            AddNetFrameworkDlls(dllLocations, frameworkLocations);
+            AddAspNetCoreFrameworkDlls(dllLocations, frameworkLocations);
+            AddMicrosoftWindowsDesktopDlls(dllLocations, frameworkLocations);
 
             return frameworkLocations;
         }
@@ -263,7 +262,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
         }
 
-        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
+        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyLookupLocation> dllLocations, ISet<string> frameworkLocations)
         {
             var versionFolders = GetPackageVersionSubDirectories(frameworkPath);
             if (versionFolders.Length > 1)
@@ -279,7 +278,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 selectedFrameworkFolder = frameworkPath;
             }
 
-            dllPaths.Add(selectedFrameworkFolder);
+            dllLocations.Add(selectedFrameworkFolder);
             frameworkLocations.Add(selectedFrameworkFolder);
             logger.LogInfo($"Found {frameworkType} DLLs in NuGet packages at {selectedFrameworkFolder}.");
         }
@@ -292,16 +291,16 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                 .ToArray();
         }
 
-        private void RemoveFrameworkNugetPackages(ISet<AssemblyLookupLocation> dllPaths, int fromIndex = 0)
+        private void RemoveFrameworkNugetPackages(ISet<AssemblyLookupLocation> dllLocations, int fromIndex = 0)
         {
             var packagesInPrioOrder = FrameworkPackageNames.NetFrameworks;
             for (var i = fromIndex; i < packagesInPrioOrder.Length; i++)
             {
-                RemoveNugetPackageReference(packagesInPrioOrder[i], dllPaths);
+                RemoveNugetPackageReference(packagesInPrioOrder[i], dllLocations);
             }
         }
 
-        private void AddNetFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
+        private void AddNetFrameworkDlls(ISet<AssemblyLookupLocation> dllLocations, ISet<string> frameworkLocations)
         {
             // Multiple dotnet framework packages could be present.
             // The order of the packages is important, we're adding the first one that is present in the nuget cache.
@@ -321,8 +320,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
                     dotnetFrameworkVersionVariantCount += GetPackageVersionSubDirectories(fp.Path!).Length;
                 }
 
-                SelectNewestFrameworkPath(frameworkPath.Path, ".NET Framework", dllPaths, frameworkLocations);
-                RemoveFrameworkNugetPackages(dllPaths, frameworkPath.Index + 1);
+                SelectNewestFrameworkPath(frameworkPath.Path, ".NET Framework", dllLocations, frameworkLocations);
+                RemoveFrameworkNugetPackages(dllLocations, frameworkPath.Index + 1);
                 return;
             }
 
@@ -350,18 +349,18 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             if (runtimeLocation is null)
             {
                 runtimeLocation ??= Runtime.ExecutingRuntime;
-                dllPaths.Add(new AssemblyLookupLocation(runtimeLocation, name => !name.StartsWith("Semmle.")));
+                dllLocations.Add(new AssemblyLookupLocation(runtimeLocation, name => !name.StartsWith("Semmle.")));
             }
             else
             {
-                dllPaths.Add(runtimeLocation);
+                dllLocations.Add(runtimeLocation);
             }
 
             logger.LogInfo($".NET runtime location selected: {runtimeLocation}");
             frameworkLocations.Add(runtimeLocation);
         }
 
-        private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyLookupLocation> dllPaths)
+        private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyLookupLocation> dllLocations)
         {
             var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();
             if (packageFolder == null)
@@ -370,10 +369,10 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
 
             var packagePathPrefix = Path.Combine(packageFolder, packagePrefix.ToLowerInvariant());
-            var toRemove = dllPaths.Where(s => s.Path.StartsWith(packagePathPrefix, StringComparison.InvariantCultureIgnoreCase));
+            var toRemove = dllLocations.Where(s => s.Path.StartsWith(packagePathPrefix, StringComparison.InvariantCultureIgnoreCase));
             foreach (var path in toRemove)
             {
-                dllPaths.Remove(path);
+                dllLocations.Remove(path);
                 logger.LogInfo($"Removed reference {path}");
             }
         }
@@ -383,7 +382,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             return fileContent.IsNewProjectStructureUsed && fileContent.UseAspNetCoreDlls;
         }
 
-        private void AddAspNetCoreFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
+        private void AddAspNetCoreFrameworkDlls(ISet<AssemblyLookupLocation> dllLocations, ISet<string> frameworkLocations)
         {
             if (!IsAspNetCoreDetected())
             {
@@ -393,23 +392,23 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             // First try to find ASP.NET Core assemblies in the NuGet packages
             if (GetPackageDirectory(FrameworkPackageNames.AspNetCoreFramework, packageDirectory) is string aspNetCorePackage)
             {
-                SelectNewestFrameworkPath(aspNetCorePackage, "ASP.NET Core", dllPaths, frameworkLocations);
+                SelectNewestFrameworkPath(aspNetCorePackage, "ASP.NET Core", dllLocations, frameworkLocations);
                 return;
             }
 
             if (Runtime.AspNetCoreRuntime is string aspNetCoreRuntime)
             {
                 logger.LogInfo($"ASP.NET runtime location selected: {aspNetCoreRuntime}");
-                dllPaths.Add(aspNetCoreRuntime);
+                dllLocations.Add(aspNetCoreRuntime);
                 frameworkLocations.Add(aspNetCoreRuntime);
             }
         }
 
-        private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
+        private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyLookupLocation> dllLocations, ISet<string> frameworkLocations)
         {
             if (GetPackageDirectory(FrameworkPackageNames.WindowsDesktopFramework, packageDirectory) is string windowsDesktopApp)
             {
-                SelectNewestFrameworkPath(windowsDesktopApp, "Windows Desktop App", dllPaths, frameworkLocations);
+                SelectNewestFrameworkPath(windowsDesktopApp, "Windows Desktop App", dllLocations, frameworkLocations);
             }
         }
 

From ef68e3344980006eec8eabef044053d3b69d7452 Mon Sep 17 00:00:00 2001
From: Michael Nebel <michaelnebel@github.com>
Date: Wed, 10 Apr 2024 14:48:02 +0200
Subject: [PATCH 136/136] C#: Address review comments.

---
 .../AssemblyLookupLocation.cs                 | 37 ++++++++++---------
 .../global.json                               |  5 ---
 2 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
index 533b547e45d..98f43b9dcb7 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
@@ -10,11 +10,11 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     /// Used to represent a path to an assembly or a directory containing assemblies
     /// and a selector function to determine which files to include, when indexing the assemblies.
     /// </summary>
-    internal sealed class AssemblyLookupLocation(string p, Func<string, bool> includeFileName, bool indexSubdirectories = true)
+    internal sealed class AssemblyLookupLocation(string path, Func<string, bool> includeFileName, bool indexSubdirectories = true)
     {
-        public string Path => p;
+        public string Path => path;
 
-        public AssemblyLookupLocation(string p) : this(p, _ => true) { }
+        public AssemblyLookupLocation(string path) : this(path, _ => true) { }
 
         public static implicit operator AssemblyLookupLocation(string path) => new(path);
 
@@ -23,15 +23,16 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// and adds them to the a list of assembly names to index.
         /// Indexing is performed at a later stage. This only collects the names.
         /// </summary>
-        /// <param name="dir">The directory to index.</param>
+        /// <param name="dllsToIndex">List of dlls to index.</param>
+        /// <param name="logger">Logger.</param>
         private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)
         {
             try
             {
-                var dlls = new DirectoryInfo(p).EnumerateFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = indexSubdirectories, MatchCasing = MatchCasing.CaseInsensitive, AttributesToSkip = FileAttributes.None });
+                var dlls = new DirectoryInfo(path).EnumerateFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = indexSubdirectories, MatchCasing = MatchCasing.CaseInsensitive, AttributesToSkip = FileAttributes.None });
                 if (!dlls.Any())
                 {
-                    logger.LogWarning($"AssemblyLookupLocation: No DLLs found in the path '{p}'.");
+                    logger.LogWarning($"AssemblyLookupLocation: No DLLs found in the path '{path}'.");
                     return;
                 }
                 foreach (var dll in dlls)
@@ -48,47 +49,47 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             }
             catch (Exception e)
             {
-                logger.LogError($"AssemblyLookupLocation: Error while searching for DLLs in '{p}': {e.Message}");
+                logger.LogError($"AssemblyLookupLocation: Error while searching for DLLs in '{path}': {e.Message}");
             }
         }
 
         /// <summary>
-        /// Returns a list of paths to all assemblies in `p` that should be indexed.
+        /// Returns a list of paths to all assemblies in `path` that should be indexed.
         /// </summary>
         /// <param name="logger">Logger</param>
         public List<string> GetDlls(ILogger logger)
         {
             var dllsToIndex = new List<string>();
-            if (File.Exists(p))
+            if (File.Exists(path))
             {
-                if (includeFileName(System.IO.Path.GetFileName(p)))
+                if (includeFileName(System.IO.Path.GetFileName(path)))
                 {
-                    dllsToIndex.Add(p);
+                    dllsToIndex.Add(path);
                 }
                 else
                 {
-                    logger.LogInfo($"AssemblyLookupLocation: Skipping {p}.");
+                    logger.LogInfo($"AssemblyLookupLocation: Skipping {path}.");
                 }
                 return dllsToIndex;
             }
 
-            if (Directory.Exists(p))
+            if (Directory.Exists(path))
             {
-                logger.LogInfo($"AssemblyLookupLocation: Finding reference DLLs in {p}...");
+                logger.LogInfo($"AssemblyLookupLocation: Finding reference DLLs in {path}...");
                 AddReferenceDirectory(dllsToIndex, logger);
             }
             else
             {
-                logger.LogInfo("AssemblyLookupLocation: Path not found: " + p);
+                logger.LogInfo("AssemblyLookupLocation: Path not found: " + path);
             }
             return dllsToIndex;
         }
 
         public override bool Equals(object? obj) =>
-            obj is AssemblyLookupLocation ap && p.Equals(ap.Path);
+            obj is AssemblyLookupLocation ap && path.Equals(ap.Path);
 
-        public override int GetHashCode() => p.GetHashCode();
+        public override int GetHashCode() => path.GetHashCode();
 
-        public override string ToString() => p;
+        public override string ToString() => path;
     }
 }
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json b/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json
deleted file mode 100644
index d54915e8d4d..00000000000
--- a/csharp/ql/integration-tests/posix-only/standalone_dependencies_executing_runtime/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.101"
-  }
-}