Java: change model to summary and update comments

Jami Cogswell · Jami Cogswell · commit 99320857af3c · 2023-04-13T09:12:55.000-04:00
diff --git a/java/ql/lib/ext/org.apache.hc.client5.http.protocol.yml b/java/ql/lib/ext/org.apache.hc.client5.http.protocol.yml
@@ -3,4 +3,5 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["org.apache.hc.client5.http.protocol", "RedirectLocations", True, "add", "", "", "Argument[0]", "Argument[-1].Element", "value", "manual"]  # ! double-check the output for this step
+      # ! `RedirectLocations` only extends `Object`, no subclasses listed
+      - ["org.apache.hc.client5.http.protocol", "RedirectLocations", True, "add", "(URI)", "", "Argument[0]", "Argument[-1].Element", "value", "manual"]
diff --git a/java/ql/lib/ext/org.apache.hc.client5.http.utils.yml b/java/ql/lib/ext/org.apache.hc.client5.http.utils.yml
@@ -3,7 +3,7 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      # ! all of the below may need "HttpHost target" parameter accounted for as part of the step as well
+      # ! all of the below may need "HttpHost target" parameter accounted for as part of the step, and possibly `String reference` and `URI reference` as well.
       - ["org.apache.hc.client5.http.utils", "URIUtils", True, "extractHost", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.hc.client5.http.utils", "URIUtils", True, "resolve", "(URI,HttpHost,List)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.hc.client5.http.utils", "URIUtils", True, "resolve", "(URI,String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.apache.hc.core5.benchmark.model.yml b/java/ql/lib/ext/org.apache.hc.core5.benchmark.model.yml
@@ -1,6 +1,7 @@
 extensions:
   - addsTo:
       pack: codeql/java-all
-      extensible: sinkModel
+      extensible: summaryModel
     data:
-      - ["org.apache.hc.core5.benchmark", "Builder", True, "setUri", "", "", "Argument[0]", "%-url", "manual"] # ! maybe step instead; also check docs again, name should be BenchmarkConfig$Builder instead I believe
+      # ! `BenchmarkConfig$Builder` only extends Object, no Javadocs on the setUri method, may be too internal to include?
+      - ["org.apache.hc.core5.benchmark", "BenchmarkConfig$Builder", True, "setUri", "(URI)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.apache.hc.core5.http.impl.bootstrap.model.yml b/java/ql/lib/ext/org.apache.hc.core5.http.impl.bootstrap.model.yml
@@ -3,5 +3,6 @@ extensions:
       pack: codeql/java-tests
       extensible: sinkModel
     data:
-      - ["org.apache.hc.core5.http.impl.bootstrap", "HttpAsyncRequester", True, "connect", "(HttpHost,Timeout)", "", "Argument[0]", "%-url", "manual"] # ! ModelType: sink, Notes: double-check this
-      - ["org.apache.hc.core5.http.impl.bootstrap", "HttpAsyncRequester", True, "connect", "(HttpHost,Timeout,Object,FutureCallback)", "", "Argument[0]", "%-url", "manual"] # ! ModelType: sink, Notes: double-check this
+     # ! `HttpAsyncRequester` extends Object>AsyncRequester, no subclasses, inconsistent javadocs
+      - ["org.apache.hc.core5.http.impl.bootstrap", "HttpAsyncRequester", True, "connect", "(HttpHost,Timeout)", "", "Argument[0]", "%-url", "manual"]
+      - ["org.apache.hc.core5.http.impl.bootstrap", "HttpAsyncRequester", True, "connect", "(HttpHost,Timeout,Object,FutureCallback)", "", "Argument[0]", "%-url", "manual"]
