Use code-quality-selectors in Java suite

tamasvajk · tamasvajk · commit 425e020d6c22 · 2025-04-29T16:09:51.000+02:00
diff --git 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
diff --git a/java/ql/src/Language Abuse/TypeVariableHidesType.ql b/java/ql/src/Language Abuse/TypeVariableHidesType.ql
@@ -9,6 +9,7 @@
  * @tags reliability
  *       readability
  *       types
+ *       quality
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql b/java/ql/src/Likely 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
diff --git a/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql b/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql
@@ -7,6 +7,7 @@
  * @id java/unused-container
  * @tags maintainability
  *       useless-code
+ *       quality
  *       external/cwe/cwe-561
  */
 
diff --git a/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.ql b/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.ql
@@ -8,6 +8,7 @@
  * @id java/equals-on-unrelated-types
  * @tags reliability
  *       correctness
+ *       quality
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.ql b/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.ql
@@ -8,6 +8,7 @@
  * @id java/inconsistent-equals-and-hashcode
  * @tags reliability
  *       correctness
+ *       quality
  *       external/cwe/cwe-581
  */
 
diff --git a/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.ql b/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.ql
@@ -8,6 +8,7 @@
  * @id java/unchecked-cast-in-equals
  * @tags reliability
  *       correctness
+ *       quality
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.ql b/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.ql
@@ -8,6 +8,7 @@
  * @id java/reference-equality-of-boxed-types
  * @tags reliability
  *       correctness
+ *       quality
  *       external/cwe/cwe-595
  */
 
diff --git a/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.ql b/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.ql
@@ -9,6 +9,7 @@
  * @id java/contradictory-type-checks
  * @tags correctness
  *       logic
+ *       quality
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.ql b/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.ql
@@ -6,6 +6,7 @@
  * @precision high
  * @id java/suspicious-date-format
  * @tags correctness
+ *       quality
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.ql b/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.ql
@@ -9,6 +9,7 @@
  * @tags efficiency
  *       correctness
  *       resources
+ *       quality
  *       external/cwe/cwe-404
  *       external/cwe/cwe-772
  */
diff --git a/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.ql b/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.ql
@@ -9,6 +9,7 @@
  * @tags efficiency
  *       correctness
  *       resources
+ *       quality
  *       external/cwe/cwe-404
  *       external/cwe/cwe-772
  */
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-ql/java/ql/src/Language Abuse/TypeVariableHidesType.ql`
`2`	`1`	`ql/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql`
`3`	`2`	`ql/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql`
`4`	`3`	`ql/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.ql`