hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 12:16:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Java: Improve Annotation.getAnAssociatedAnnotation

Browse Source 
As suggested by smowton during review.
This commit is contained in:
Marcono1234
2022-03-27 23:32:04 +02:00
committed by Chris Smowton
parent fd5fdd89d9
commit 47e38952d1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/ql/lib/semmle/code/java/Annotation.qll
View File

@@ -217,13 +217,15 @@ class Annotatable extends Element {
)
}
private Annotation getAnAssociatedAnnotation(AnnotationType t) {
result.getType() = t and
private Annotation getADeclaredAssociatedAnnotation(AnnotationType t) {
// Direct or indirect annotation
if getADeclaredAnnotation().getType() = t or getAnIndirectAnnotation().getType() = t
then (
result = getADeclaredAnnotation() or result = getAnIndirectAnnotation()
) else (
result.getType() = t and result = [getADeclaredAnnotation(), getAnIndirectAnnotation()]
}
private Annotation getAnAssociatedAnnotation(AnnotationType t) {
if exists(getADeclaredAssociatedAnnotation(t))
then result = getADeclaredAssociatedAnnotation(t)
else (
// Only if neither a direct nor an indirect annotation is present look for an inherited one
t.isInherited() and
// @Inherited only works for classes; cast to Annotatable is necessary because predicate is private