Java: Tag quality queries with quality and sub-category

java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected

@@ -1,13 +1,82 @@
+ql/java/ql/src/Advisory/Declarations/MissingOverrideAnnotation.ql
+ql/java/ql/src/Advisory/Deprecated Code/AvoidDeprecatedCallableAccess.ql
+ql/java/ql/src/Advisory/Documentation/ImpossibleJavadocThrows.ql
+ql/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql
+ql/java/ql/src/Compatibility/JDK9/JdkInternalAccess.ql
+ql/java/ql/src/Compatibility/JDK9/UnderscoreIdentifier.ql
+ql/java/ql/src/DeadCode/UselessParameter.ql
+ql/java/ql/src/Language Abuse/ChainedInstanceof.ql
+ql/java/ql/src/Language Abuse/IterableIterator.ql
+ql/java/ql/src/Language Abuse/UselessNullCheck.ql
+ql/java/ql/src/Language Abuse/UselessTypeTest.ql
+ql/java/ql/src/Language Abuse/WrappedIterator.ql
+ql/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
 ql/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql
+ql/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.ql
+ql/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
+ql/java/ql/src/Likely Bugs/Collections/ArrayIndexOutOfBounds.ql
+ql/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql
+ql/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.ql
+ql/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql
 ql/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql
+ql/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.ql
+ql/java/ql/src/Likely Bugs/Comparison/EqualsArray.ql
+ql/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql
 ql/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.ql
 ql/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.ql
 ql/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.ql
 ql/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.ql
+ql/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql
+ql/java/ql/src/Likely Bugs/Comparison/WrongNanComparison.ql
+ql/java/ql/src/Likely Bugs/Concurrency/CallsToRunnableRun.ql
+ql/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.ql
+ql/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.ql
+ql/java/ql/src/Likely Bugs/Concurrency/NonSynchronizedOverride.ql
+ql/java/ql/src/Likely Bugs/Concurrency/SynchOnBoxedType.ql
+ql/java/ql/src/Likely Bugs/Concurrency/SynchSetUnsynchGet.ql
 ql/java/ql/src/Likely Bugs/Frameworks/JUnit/JUnit5MissingNestedAnnotation.ql
+ql/java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/MissingFormatArg.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/MissingSpaceTypo.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/StringBufferCharInit.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/UnusedFormatArg.ql
+ql/java/ql/src/Likely Bugs/Nullness/NullAlways.ql
+ql/java/ql/src/Likely Bugs/Nullness/NullExprDeref.ql
+ql/java/ql/src/Likely Bugs/Nullness/NullMaybe.ql
 ql/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.ql
+ql/java/ql/src/Likely Bugs/Resource Leaks/CloseSql.ql
 ql/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.ql
+ql/java/ql/src/Likely Bugs/Statements/ContinueInFalseLoop.ql
+ql/java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.ql
+ql/java/ql/src/Likely Bugs/Statements/UseBraces.ql
+ql/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql
+ql/java/ql/src/Performance/InefficientEmptyStringTest.ql
+ql/java/ql/src/Performance/InefficientKeySetIterator.ql
+ql/java/ql/src/Performance/InefficientOutputStream.ql
+ql/java/ql/src/Performance/InefficientPrimConstructor.ql
+ql/java/ql/src/Performance/InnerClassCouldBeStatic.ql
+ql/java/ql/src/Performance/NewStringString.ql
 ql/java/ql/src/Performance/StringReplaceAllWithNonRegex.ql
+ql/java/ql/src/Violations of Best Practice/Boxed Types/BoxedVariable.ql
+ql/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.ql
+ql/java/ql/src/Violations of Best Practice/Dead Code/InterfaceCannotBeImplemented.ql
+ql/java/ql/src/Violations of Best Practice/Dead Code/UnreadLocal.ql
+ql/java/ql/src/Violations of Best Practice/Dead Code/UnusedLabel.ql
+ql/java/ql/src/Violations of Best Practice/Declarations/NoConstantsOnly.ql
+ql/java/ql/src/Violations of Best Practice/Exception Handling/IgnoreExceptionalReturn.ql
+ql/java/ql/src/Violations of Best Practice/Exception Handling/NumberFormatException.ql
+ql/java/ql/src/Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
+ql/java/ql/src/Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+ql/java/ql/src/Violations of Best Practice/Naming Conventions/AmbiguousOuterSuper.ql
+ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingMethodNames.ql
+ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
+ql/java/ql/src/Violations of Best Practice/Naming Conventions/LocalShadowsFieldConfusing.ql
+ql/java/ql/src/Violations of Best Practice/Naming Conventions/SameNameAsSuper.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToStringToString.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DefaultToString.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DoNotCallFinalize.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/PrintLnArray.ql

java/ql/src/Advisory/Declarations/MissingOverrideAnnotation.ql

@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/missing-override-annotation
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java

java/ql/src/Advisory/Deprecated Code/AvoidDeprecatedCallableAccess.ql

@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/deprecated-call
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  *       non-attributable
  *       external/cwe/cwe-477
  */

java/ql/src/Advisory/Documentation/ImpossibleJavadocThrows.ql

@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/inconsistent-javadoc-throws
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java

java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql

@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision very-high
  * @id java/unknown-javadoc-parameter
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java

java/ql/src/Compatibility/JDK9/JdkInternalAccess.ql

@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/jdk-internal-api-access
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java

java/ql/src/Compatibility/JDK9/UnderscoreIdentifier.ql

@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/underscore-identifier
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java

java/ql/src/DeadCode/UselessParameter.ql

@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/unused-parameter
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
  *       external/cwe/cwe-561
  */

java/ql/src/Language Abuse/ChainedInstanceof.ql

@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/chained-type-tests
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       complexity
  *       language-features
  */
 

java/ql/src/Language Abuse/IterableIterator.ql

@@ -7,8 +7,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/iterator-implements-iterable
- * @tags correctness
+ * @tags quality
  *       reliability
+ *       correctness
  */
 
 import java

java/ql/src/Language Abuse/UselessNullCheck.ql

@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/useless-null-check
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
  *       external/cwe/cwe-561
  */

java/ql/src/Language Abuse/UselessTypeTest.ql

@@ -5,7 +5,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/useless-type-test
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       useless-code
  *       language-features
  *       external/cwe/cwe-561
  */

java/ql/src/Language Abuse/WrappedIterator.ql

@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/iterable-wraps-iterator
- * @tags correctness
+ * @tags quality
  *       reliability
+ *       correctness
  */
 
 import java

java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql

@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/evaluation-to-constant
- * @tags maintainability
- *       useless-code
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java

java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql

@@ -6,10 +6,10 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/integer-multiplication-cast-to-long
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       types
- *       quality
  *       external/cwe/cwe-190
  *       external/cwe/cwe-192
  *       external/cwe/cwe-197

java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.ql

@@ -5,7 +5,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/lshift-larger-than-type-width
- * @tags correctness
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java

java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql

@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision very-high
  * @id java/whitespace-contradicts-precedence
- * @tags maintainability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-783
  */
 

java/ql/src/Likely Bugs/Collections/ArrayIndexOutOfBounds.ql

@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision high
  * @id java/index-out-of-bounds
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       exceptions
  *       external/cwe/cwe-193

java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql

@@ -7,7 +7,8 @@
  * @problem.severity error
  * @precision very-high
  * @id java/type-mismatch-access
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       logic
  */

java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.ql

@@ -5,9 +5,9 @@
  * @problem.severity error
  * @precision very-high
  * @id java/empty-container
- * @tags reliability
- *       maintainability
- *       useless-code
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-561
  */
 

java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql

@@ -7,7 +7,8 @@
  * @problem.severity error
  * @precision very-high
  * @id java/type-mismatch-modification
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       logic
  */

java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql

@@ -5,9 +5,9 @@
  * @problem.severity error
  * @precision very-high
  * @id java/unused-container
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
- *       quality
  *       external/cwe/cwe-561
  */
 

java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.ql

@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision very-high
  * @id java/comparison-of-identical-expressions
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       logic
  */

java/ql/src/Likely Bugs/Comparison/EqualsArray.ql

@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision very-high
  * @id java/equals-on-arrays
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 

java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql

@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision very-high
  * @id java/hashing-without-hashcode
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 

java/ql/src/Likely Bugs/Comparison/IncomparableEquals.ql

@@ -6,9 +6,10 @@
  * @problem.severity error
  * @precision very-high
  * @id java/equals-on-unrelated-types
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
- *       quality
+ *       external/cwe/cwe-571
  */
 
 import java

java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.ql

@@ -6,9 +6,9 @@
  * @problem.severity error
  * @precision very-high
  * @id java/inconsistent-equals-and-hashcode
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
- *       quality
  *       external/cwe/cwe-581
  */
 

java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.ql

@@ -6,9 +6,9 @@
  * @problem.severity error
  * @precision high
  * @id java/unchecked-cast-in-equals
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
- *       quality
  */
 
 import java

java/ql/src/Likely Bugs/Comparison/RefEqBoxed.ql

@@ -6,9 +6,9 @@
  * @problem.severity error
  * @precision very-high
  * @id java/reference-equality-of-boxed-types
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
- *       quality
  *       external/cwe/cwe-595
  */