Use code-quality-selectors in Java suite

2026-04-25 16:55:19 +02:00 · 2025-04-29 16:09:51 +02:00
parent ea9b95790b
commit 425e020d6c
13 changed files with 13 additions and 17 deletions
--- a/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
@@ -1,4 +1,3 @@
-ql/java/ql/src/Language Abuse/TypeVariableHidesType.ql
 ql/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql
 ql/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql
 ql/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.ql
--- a/Abuse/TypeVariableHidesType.ql
+++ b/Abuse/TypeVariableHidesType.ql
@@ -9,6 +9,7 @@
 * @tags reliability
 *       readability
 *       types
+ *       quality
 */

 import java
--- a/Bugs/Arithmetic/IntMultToLong.ql
+++ b/Bugs/Arithmetic/IntMultToLong.ql
@@ -9,6 +9,7 @@
 * @tags reliability
 *       correctness
 *       types
+ *       quality
 *       external/cwe/cwe-190
 *       external/cwe/cwe-192
 *       external/cwe/cwe-197
--- a/Bugs/Collections/WriteOnlyContainer.ql
+++ b/Bugs/Collections/WriteOnlyContainer.ql
@@ -7,6 +7,7 @@
 * @id java/unused-container
 * @tags maintainability
 *       useless-code
+ *       quality
 *       external/cwe/cwe-561
 */

--- a/Bugs/Comparison/IncomparableEquals.ql
+++ b/Bugs/Comparison/IncomparableEquals.ql
@@ -8,6 +8,7 @@
 * @id java/equals-on-unrelated-types
 * @tags reliability
 *       correctness
+ *       quality
 */

 import java
--- a/Bugs/Comparison/InconsistentEqualsHashCode.ql
+++ b/Bugs/Comparison/InconsistentEqualsHashCode.ql
@@ -8,6 +8,7 @@
 * @id java/inconsistent-equals-and-hashcode
 * @tags reliability
 *       correctness
+ *       quality
 *       external/cwe/cwe-581
 */

--- a/Bugs/Comparison/MissingInstanceofInEquals.ql
+++ b/Bugs/Comparison/MissingInstanceofInEquals.ql
@@ -8,6 +8,7 @@
 * @id java/unchecked-cast-in-equals
 * @tags reliability
 *       correctness
+ *       quality
 */

 import java
--- a/Bugs/Comparison/RefEqBoxed.ql
+++ b/Bugs/Comparison/RefEqBoxed.ql
@@ -8,6 +8,7 @@
 * @id java/reference-equality-of-boxed-types
 * @tags reliability
 *       correctness
+ *       quality
 *       external/cwe/cwe-595
 */

--- a/Typos/ContradictoryTypeChecks.ql
+++ b/Typos/ContradictoryTypeChecks.ql
@@ -9,6 +9,7 @@
 * @id java/contradictory-type-checks
 * @tags correctness
 *       logic
+ *       quality
 */

 import java
--- a/Typos/SuspiciousDateFormat.ql
+++ b/Typos/SuspiciousDateFormat.ql
@@ -6,6 +6,7 @@
 * @precision high
 * @id java/suspicious-date-format
 * @tags correctness
+ *       quality
 */

 import java
--- a/Leaks/CloseReader.ql
+++ b/Leaks/CloseReader.ql
@@ -9,6 +9,7 @@
 * @tags efficiency
 *       correctness
 *       resources
+ *       quality
 *       external/cwe/cwe-404
 *       external/cwe/cwe-772
 */
--- a/Leaks/CloseWriter.ql
+++ b/Leaks/CloseWriter.ql
@@ -9,6 +9,7 @@
 * @tags efficiency
 *       correctness
 *       resources
+ *       quality
 *       external/cwe/cwe-404
 *       external/cwe/cwe-772
 */
--- a/java/ql/src/codeql-suites/java-code-quality.qls
+++ b/java/ql/src/codeql-suites/java-code-quality.qls
@@ -1,17 +1,3 @@
 - queries: .
- include:
-    id:
-      - java/contradictory-type-checks
-      - java/do-not-call-finalize
-      - java/equals-on-unrelated-types
-      - java/inconsistent-equals-and-hashcode
-      - java/input-resource-leak
-      - java/integer-multiplication-cast-to-long
-      - java/junit5-missing-nested-annotation
-      - java/output-resource-leak
-      - java/reference-equality-of-boxed-types
-      - java/string-replace-all-with-non-regex
-      - java/suspicious-date-format
-      - java/type-variable-hides-type
-      - java/unchecked-cast-in-equals
-      - java/unused-container
+- apply: code-quality-selectors.yml
+  from: codeql/suite-helpers