From e2abd3ff1373fc2f2fa0f82514d773475e0ac2ae Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Thu, 3 Aug 2023 13:47:30 +0200
Subject: [PATCH 1/9] Create separate automodel pack.

---
 java/ql/automodel/qlpack.yml                               | 7 +++++++
 .../Telemetry => automodel/src}/AutomodelAlertSinkUtil.qll | 0
 .../Telemetry => automodel/src}/AutomodelAlertSinks.ql     | 0
 .../src}/AutomodelAlertSinksPerQuery.ql                    | 0
 .../src}/AutomodelApplicationModeCharacteristics.qll       | 0
 .../src}/AutomodelApplicationModeExtractCandidates.ql      | 0
 .../AutomodelApplicationModeExtractNegativeExamples.ql     | 0
 .../AutomodelApplicationModeExtractPositiveExamples.ql     | 0
 .../src}/AutomodelCountGeneratedSinks.ql                   | 0
 .../Telemetry => automodel/src}/AutomodelEndpointTypes.qll | 0
 .../src}/AutomodelFrameworkModeCharacteristics.qll         | 0
 .../src}/AutomodelFrameworkModeExtractCandidates.ql        | 0
 .../src}/AutomodelFrameworkModeExtractNegativeExamples.ql  | 0
 .../src}/AutomodelFrameworkModeExtractPositiveExamples.ql  | 0
 .../{src/Telemetry => automodel/src}/AutomodelJavaUtil.qll | 0
 .../src}/AutomodelSharedCharacteristics.qll                | 0
 .../src}/AutomodelSharedGetCallable.qll                    | 0
 .../src}/AutomodelSinkModelMrvaQueries.ql                  | 0
 .../AutomodelApplicationModeExtractCandidates.expected     | 0
 .../AutomodelApplicationModeExtractCandidates.qlref        | 0
 ...utomodelApplicationModeExtractNegativeExamples.expected | 0
 .../AutomodelApplicationModeExtractNegativeExamples.qlref  | 0
 ...utomodelApplicationModeExtractPositiveExamples.expected | 0
 .../AutomodelApplicationModeExtractPositiveExamples.qlref  | 0
 .../test}/AutomodelApplicationModeExtraction/Test.java     | 0
 .../AutomodelFrameworkModeExtractCandidates.expected       | 0
 .../AutomodelFrameworkModeExtractCandidates.qlref          | 0
 .../AutomodelFrameworkModeExtractNegativeExamples.expected | 0
 .../AutomodelFrameworkModeExtractNegativeExamples.qlref    | 0
 .../AutomodelFrameworkModeExtractPositiveExamples.expected | 0
 .../AutomodelFrameworkModeExtractPositiveExamples.qlref    | 0
 .../com/github/codeql/test/NonPublicClass.java             | 0
 .../com/github/codeql/test/PublicClass.java                | 0
 .../com/github/codeql/test/PublicInterface.java            | 0
 .../AutomodelFrameworkModeExtraction/java/io/File.java     | 0
 .../java/nio/file/Files.java                               | 0
 36 files changed, 7 insertions(+)
 create mode 100644 java/ql/automodel/qlpack.yml
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelAlertSinkUtil.qll (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelAlertSinks.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelAlertSinksPerQuery.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelApplicationModeCharacteristics.qll (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelApplicationModeExtractCandidates.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelApplicationModeExtractNegativeExamples.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelApplicationModeExtractPositiveExamples.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelCountGeneratedSinks.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelEndpointTypes.qll (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelFrameworkModeCharacteristics.qll (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelFrameworkModeExtractCandidates.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelFrameworkModeExtractNegativeExamples.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelFrameworkModeExtractPositiveExamples.ql (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelJavaUtil.qll (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelSharedCharacteristics.qll (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelSharedGetCallable.qll (100%)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelSinkModelMrvaQueries.ql (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelApplicationModeExtraction/Test.java (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/java/io/File.java (100%)
 rename java/ql/{test/query-tests/Telemetry => automodel/test}/AutomodelFrameworkModeExtraction/java/nio/file/Files.java (100%)

diff --git a/java/ql/automodel/qlpack.yml b/java/ql/automodel/qlpack.yml
new file mode 100644
index 000000000000..12d756bc67dd
--- /dev/null
+++ b/java/ql/automodel/qlpack.yml
@@ -0,0 +1,7 @@
+name: codeql/java-automodel-queries
+version: 0.0.1
+dependencies:
+  codeql/java-all: ${workspace}
+extractor: java
+tests: test
+warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/src/Telemetry/AutomodelAlertSinkUtil.qll b/java/ql/automodel/src/AutomodelAlertSinkUtil.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelAlertSinkUtil.qll
rename to java/ql/automodel/src/AutomodelAlertSinkUtil.qll
diff --git a/java/ql/src/Telemetry/AutomodelAlertSinks.ql b/java/ql/automodel/src/AutomodelAlertSinks.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelAlertSinks.ql
rename to java/ql/automodel/src/AutomodelAlertSinks.ql
diff --git a/java/ql/src/Telemetry/AutomodelAlertSinksPerQuery.ql b/java/ql/automodel/src/AutomodelAlertSinksPerQuery.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelAlertSinksPerQuery.ql
rename to java/ql/automodel/src/AutomodelAlertSinksPerQuery.ql
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeCharacteristics.qll b/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeCharacteristics.qll
rename to java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeExtractCandidates.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeExtractCandidates.ql
rename to java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeExtractNegativeExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeExtractNegativeExamples.ql
rename to java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeExtractPositiveExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeExtractPositiveExamples.ql
rename to java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelCountGeneratedSinks.ql b/java/ql/automodel/src/AutomodelCountGeneratedSinks.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelCountGeneratedSinks.ql
rename to java/ql/automodel/src/AutomodelCountGeneratedSinks.ql
diff --git a/java/ql/src/Telemetry/AutomodelEndpointTypes.qll b/java/ql/automodel/src/AutomodelEndpointTypes.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelEndpointTypes.qll
rename to java/ql/automodel/src/AutomodelEndpointTypes.qll
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeCharacteristics.qll b/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeCharacteristics.qll
rename to java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeExtractCandidates.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeExtractCandidates.ql
rename to java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeExtractNegativeExamples.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractNegativeExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeExtractNegativeExamples.ql
rename to java/ql/automodel/src/AutomodelFrameworkModeExtractNegativeExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeExtractPositiveExamples.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractPositiveExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeExtractPositiveExamples.ql
rename to java/ql/automodel/src/AutomodelFrameworkModeExtractPositiveExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelJavaUtil.qll b/java/ql/automodel/src/AutomodelJavaUtil.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelJavaUtil.qll
rename to java/ql/automodel/src/AutomodelJavaUtil.qll
diff --git a/java/ql/src/Telemetry/AutomodelSharedCharacteristics.qll b/java/ql/automodel/src/AutomodelSharedCharacteristics.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelSharedCharacteristics.qll
rename to java/ql/automodel/src/AutomodelSharedCharacteristics.qll
diff --git a/java/ql/src/Telemetry/AutomodelSharedGetCallable.qll b/java/ql/automodel/src/AutomodelSharedGetCallable.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelSharedGetCallable.qll
rename to java/ql/automodel/src/AutomodelSharedGetCallable.qll
diff --git a/java/ql/src/Telemetry/AutomodelSinkModelMrvaQueries.ql b/java/ql/automodel/src/AutomodelSinkModelMrvaQueries.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelSinkModelMrvaQueries.ql
rename to java/ql/automodel/src/AutomodelSinkModelMrvaQueries.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/Test.java b/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/Test.java
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/io/File.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/io/File.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/io/File.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/io/File.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/nio/file/Files.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/nio/file/Files.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/nio/file/Files.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/nio/file/Files.java

From e7ca2330cbfdc454437ce5ee15ed52d495694c9d Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Thu, 3 Aug 2023 15:55:42 +0200
Subject: [PATCH 2/9] Update workspace.

---
 codeql-workspace.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codeql-workspace.yml b/codeql-workspace.yml
index c2258bd1363f..042c57878435 100644
--- a/codeql-workspace.yml
+++ b/codeql-workspace.yml
@@ -4,6 +4,7 @@ provide:
   - "*/ql/test/qlpack.yml"
   - "*/ql/examples/qlpack.yml"
   - "*/ql/consistency-queries/qlpack.yml"
+  - "*/ql/automodel/qlpack.yml"
   - "shared/*/qlpack.yml"
   - "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
   - "go/ql/config/legacy-support/qlpack.yml"

From 3ef82c10919d0b51253acdfdf17f6d680ad94710 Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Fri, 4 Aug 2023 10:22:17 +0200
Subject: [PATCH 3/9] Address comments.

---
 codeql-workspace.yml                   |  3 ++-
 java/ql/automodel/publish.sh           | 28 ++++++++++++++++++++++++++
 java/ql/automodel/{ => src}/qlpack.yml |  7 ++++---
 java/ql/automodel/test/qlpack.yml      | 12 +++++++++++
 4 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100755 java/ql/automodel/publish.sh
 rename java/ql/automodel/{ => src}/qlpack.yml (66%)
 create mode 100644 java/ql/automodel/test/qlpack.yml

diff --git a/codeql-workspace.yml b/codeql-workspace.yml
index 042c57878435..2d86498cbeae 100644
--- a/codeql-workspace.yml
+++ b/codeql-workspace.yml
@@ -4,7 +4,8 @@ provide:
   - "*/ql/test/qlpack.yml"
   - "*/ql/examples/qlpack.yml"
   - "*/ql/consistency-queries/qlpack.yml"
-  - "*/ql/automodel/qlpack.yml"
+  - "*/ql/automodel/src/qlpack.yml"
+  - "*/ql/automodel/test/qlpack.yml"
   - "shared/*/qlpack.yml"
   - "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
   - "go/ql/config/legacy-support/qlpack.yml"
diff --git a/java/ql/automodel/publish.sh b/java/ql/automodel/publish.sh
new file mode 100755
index 000000000000..04b0d3f6ac11
--- /dev/null
+++ b/java/ql/automodel/publish.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+
+AUTOMODEL_ROOT="$(dirname $0)"
+WORKSPACE_ROOT="$AUTOMODEL_ROOT/../../../.."
+GRPS="automodel,-test"
+
+if [ -z "$CODEQL_DIST" ]; then
+  echo "CODEQL_DIST not set"
+  exit -1
+fi
+
+cd "$AUTOMODEL_ROOT"
+echo Testing automodel queries
+"${CODEQL_DIST}/codeql" test run test
+
+cd "$WORKSPACE_ROOT"
+
+echo Preparing release
+"${CODEQL_DIST}/codeql" pack release --groups $GRPS
+
+echo Publishing automodel
+"${CODEQL_DIST}/codeql" pack publish --groups $GRPS
+
+echo Bumping versions
+"${CODEQL_DIST}/codeql" pack post-release --groups $GRPS
+
+echo Automodel packs successfully published. Please commit and push the version changes.
diff --git a/java/ql/automodel/qlpack.yml b/java/ql/automodel/src/qlpack.yml
similarity index 66%
rename from java/ql/automodel/qlpack.yml
rename to java/ql/automodel/src/qlpack.yml
index 12d756bc67dd..9a6f54562efb 100644
--- a/java/ql/automodel/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,7 +1,8 @@
 name: codeql/java-automodel-queries
-version: 0.0.1
+version: 0.0.1-dev
+groups:
+    - java
+    - automodel
 dependencies:
   codeql/java-all: ${workspace}
-extractor: java
-tests: test
 warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/automodel/test/qlpack.yml b/java/ql/automodel/test/qlpack.yml
new file mode 100644
index 000000000000..11f5ec8c1926
--- /dev/null
+++ b/java/ql/automodel/test/qlpack.yml
@@ -0,0 +1,12 @@
+name: codeql/java-automodel-tests
+version: 0.0.1-dev
+groups:
+    - java
+    - automodel
+    - test
+dependencies:
+  codeql/java-all: ${workspace}
+  codeql/java-automodel-queries: ${workspace}
+extractor: java
+tests: .
+warnOnImplicitThis: true
\ No newline at end of file

From 0d78eeb871626346b00e78b06d79979412e1906f Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Mon, 7 Aug 2023 10:47:59 +0200
Subject: [PATCH 4/9] Address comments.

---
 csharp/ql/campaigns/Solorigate/publish.sh                       | 2 +-
 java/ql/automodel/publish.sh                                    | 2 +-
 .../AutomodelApplicationModeExtractCandidates.qlref             | 2 +-
 .../AutomodelApplicationModeExtractNegativeExamples.qlref       | 2 +-
 .../AutomodelApplicationModeExtractPositiveExamples.qlref       | 2 +-
 .../AutomodelFrameworkModeExtractCandidates.qlref               | 2 +-
 .../AutomodelFrameworkModeExtractNegativeExamples.qlref         | 2 +-
 .../AutomodelFrameworkModeExtractPositiveExamples.qlref         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/csharp/ql/campaigns/Solorigate/publish.sh b/csharp/ql/campaigns/Solorigate/publish.sh
index 2d1dcfa3bfb1..0c57fd6c4880 100755
--- a/csharp/ql/campaigns/Solorigate/publish.sh
+++ b/csharp/ql/campaigns/Solorigate/publish.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-SOLORIGATE_ROOT="$(dirname $0)"
+SOLORIGATE_ROOT="$(readlink -f "$(dirname $0)")"
 WORKSPACE_ROOT="$SOLORIGATE_ROOT/../../../.."
 GRPS="solorigate,-test"
 
diff --git a/java/ql/automodel/publish.sh b/java/ql/automodel/publish.sh
index 04b0d3f6ac11..202cdd690a75 100755
--- a/java/ql/automodel/publish.sh
+++ b/java/ql/automodel/publish.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-AUTOMODEL_ROOT="$(dirname $0)"
+AUTOMODEL_ROOT="$(readlink -f "$(dirname $0)")"
 WORKSPACE_ROOT="$AUTOMODEL_ROOT/../../../.."
 GRPS="automodel,-test"
 
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
index b97c87be55fd..5ea712b0239a 100644
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
@@ -1 +1 @@
-Telemetry/AutomodelApplicationModeExtractCandidates.ql
+AutomodelApplicationModeExtractCandidates.ql
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
index 43610d3cc1a5..ccd3827571ee 100644
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
@@ -1 +1 @@
-Telemetry/AutomodelApplicationModeExtractNegativeExamples.ql
+AutomodelApplicationModeExtractNegativeExamples.ql
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
index 585a78f94f92..5cf6baa1dba0 100644
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
@@ -1 +1 @@
-Telemetry/AutomodelApplicationModeExtractPositiveExamples.ql
+AutomodelApplicationModeExtractPositiveExamples.ql
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
index e68551eb3ec7..e9b513032aaf 100644
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
+++ b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
@@ -1 +1 @@
-Telemetry/AutomodelFrameworkModeExtractCandidates.ql
+AutomodelFrameworkModeExtractCandidates.ql
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
index d58a0997fdc5..69498caf8998 100644
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
+++ b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
@@ -1 +1 @@
-Telemetry/AutomodelFrameworkModeExtractNegativeExamples.ql
+AutomodelFrameworkModeExtractNegativeExamples.ql
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
index ae52dc664968..fbda3f3dd376 100644
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
+++ b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
@@ -1 +1 @@
-Telemetry/AutomodelFrameworkModeExtractPositiveExamples.ql
+AutomodelFrameworkModeExtractPositiveExamples.ql

From 3918e57ffe226106021853c3f9573ad9142fa41a Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Tue, 8 Aug 2023 15:10:12 +0200
Subject: [PATCH 5/9] Take filter pack into account.

---
 .../Telemetry => automodel/src}/AutomodelCandidateFilter.yml    | 0
 java/ql/automodel/src/qlpack.yml                                | 2 ++
 java/ql/src/qlpack.yml                                          | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename java/ql/{src/Telemetry => automodel/src}/AutomodelCandidateFilter.yml (100%)

diff --git a/java/ql/src/Telemetry/AutomodelCandidateFilter.yml b/java/ql/automodel/src/AutomodelCandidateFilter.yml
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelCandidateFilter.yml
rename to java/ql/automodel/src/AutomodelCandidateFilter.yml
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 9a6f54562efb..1ae0225cb2a6 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -5,4 +5,6 @@ groups:
     - automodel
 dependencies:
   codeql/java-all: ${workspace}
+dataExtensions:
+  - AutomodelCandidateFilter.yml
 warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 0e7c892f469d..76f4fcc77973 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -12,5 +12,4 @@ dependencies:
   codeql/util: ${workspace}
 dataExtensions:
   - Telemetry/ExtractorInformation.yml
-  - Telemetry/AutomodelCandidateFilter.yml
 warnOnImplicitThis: true

From 1b31c4dd4c94f809fbeb5db61caa57023340ad1a Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Thu, 17 Aug 2023 11:07:27 +0200
Subject: [PATCH 6/9] Update filter to point to right pack.

---
 java/ql/automodel/src/AutomodelCandidateFilter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/automodel/src/AutomodelCandidateFilter.yml b/java/ql/automodel/src/AutomodelCandidateFilter.yml
index 52e64d54446b..c945ae3206fe 100644
--- a/java/ql/automodel/src/AutomodelCandidateFilter.yml
+++ b/java/ql/automodel/src/AutomodelCandidateFilter.yml
@@ -1,5 +1,5 @@
 extensions:
   - addsTo:
-      pack: codeql/java-queries
+      pack: codeql/java-automodel-queries
       extensible: automodelCandidateFilter
     data: []

From 480e3bf506f1061fee51f3f91b51e5893741cf90 Mon Sep 17 00:00:00 2001
From: Stephan Brandauer <kaeluka@github.com>
Date: Fri, 18 Aug 2023 10:27:46 +0200
Subject: [PATCH 7/9] Java: update model exclusions logic to cope with new
 automodel test location

---
 .../lib/semmle/code/java/dataflow/internal/ModelExclusions.qll  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
index 745cf7934f0a..5f1996989ade 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
@@ -27,7 +27,7 @@ class TestLibrary extends RefType {
 /** Holds if the given file is a test file. */
 private predicate isInTestFile(File file) {
   file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"]) and
-  not file.getAbsolutePath().matches("%/ql/test/%") // allows our test cases to work
+  not file.getAbsolutePath().matches(["%/ql/test/%", "%/ql/automodel/test/%"]) // allows our test cases to work
 }
 
 /** Holds if the given compilation unit's package is a JDK internal. */

From 3aeacf6df34a0d50ffb324cfd6dc6660428296c1 Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Tue, 22 Aug 2023 09:37:31 +0200
Subject: [PATCH 8/9] Update publish script to have right path.

---
 java/ql/automodel/publish.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/automodel/publish.sh b/java/ql/automodel/publish.sh
index 202cdd690a75..b13570c950f7 100755
--- a/java/ql/automodel/publish.sh
+++ b/java/ql/automodel/publish.sh
@@ -2,7 +2,7 @@
 set -e
 
 AUTOMODEL_ROOT="$(readlink -f "$(dirname $0)")"
-WORKSPACE_ROOT="$AUTOMODEL_ROOT/../../../.."
+WORKSPACE_ROOT="$AUTOMODEL_ROOT/../../.."
 GRPS="automodel,-test"
 
 if [ -z "$CODEQL_DIST" ]; then

From 3b8b33a94de439776a32ed0f29b012500511d0ee Mon Sep 17 00:00:00 2001
From: Anders Starcke Henriksen <starcke@github.com>
Date: Tue, 22 Aug 2023 09:45:52 +0200
Subject: [PATCH 9/9] Released pack.

---
 java/ql/automodel/src/qlpack.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
index 1ae0225cb2a6..851dbe69e825 100644
--- a/java/ql/automodel/src/qlpack.yml
+++ b/java/ql/automodel/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 0.0.1-dev
+version: 0.0.3-dev
 groups:
     - java
     - automodel