Java: Cleanup threat model taxanomy to align with the EDR.

java/ql/test/library-tests/dataflow/threat-models/Test.java

@@ -59,7 +59,7 @@ class Test {
   }
 
   public void M5(Statement handle) throws Exception {
-    // Only a source if "cli" is a selected threat model.
+    // Only a source if "commandargs" is a selected threat model.
     byte[] data = new byte[1024];
     System.in.read(data);
 

java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ext.yml

@@ -5,7 +5,7 @@ extensions:
       extensible: supportedThreatModels
     data:
       - ["environment"]
-      - ["cli"]
+      - ["commandargs"]
 
   - addsTo:
       pack: codeql/java-all

java/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.ql

@@ -1,6 +1,6 @@
 /**
  * This is a dataflow test using the "default" threat model with the
- * addition of "environment" and "cli".
+ * addition of "environment" and "commandargs".
  */
 
 import Test

java/ql/test/library-tests/dataflow/threat-models/threat-models1.expected

@@ -2,4 +2,3 @@
 | remote |
 | request |
 | response |
-| uri-path |

java/ql/test/library-tests/dataflow/threat-models/threat-models2.expected

@@ -1,4 +1,4 @@
-| cli |
+| commandargs |
 | database |
 | default |
 | environment |
@@ -7,4 +7,3 @@
 | remote |
 | request |
 | response |
-| uri-path |