From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Fri, 12 Apr 2024 11:18:04 +0000 (+0200)
Subject: SignaturePattern: Add exception for meta annotations
X-Git-Tag: V1_9_22_1~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c2acbdf9ea5056219e177b54ff08d0d1b38b0c95;p=aspectj.git

SignaturePattern: Add exception for meta annotations

Upon meta annotation usage in signature patterns, lint warnings like the
following were issued during type parameter traversal:

  does not match because annotation @java.lang.annotation.Inherited
  has @Target{ElementType.ANNOTATION_TYPE} [Xlint:unmatchedTargetKind]

To avoid this, we now heuristically check if we are in a meta annotation
situation and, if so, permit it.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---

diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
index d04d127a4..750e3cbc7 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
@@ -200,35 +200,35 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern {
 		@Override
 		public Object visit(ExactAnnotationTypePattern node, Object data) {
 			ResolvedType resolvedType = node.getAnnotationType().resolve(scope.getWorld());
+			AnnotationTargetKind[] targetKinds = resolvedType.getAnnotationTargetKinds();
+			if (targetKinds == null)
+				return data;
+			boolean isMetaAnnotation = data instanceof AnnotationTypePattern || data instanceof AnyWithAnnotationTypePattern;
 			if (targetsOtherThanTypeAllowed) {
-				AnnotationTargetKind[] targetKinds = resolvedType.getAnnotationTargetKinds();
-				if (targetKinds == null) {
-					return data;
-				}
 				List<AnnotationTargetKind> incorrectTargets = new ArrayList<>();
 				for (AnnotationTargetKind targetKind : targetKinds) {
-					if (targetKind.getName().equals(kind.getName())
-							|| (targetKind.getName().equals("PARAMETER") && node.isForParameterAnnotationMatch())) {
+					if (
+						isMetaAnnotation && targetKind.equals(AnnotationTargetKind.ANNOTATION_TYPE) ||
+							targetKind.getName().equals(kind.getName()) ||
+							targetKind.equals(AnnotationTargetKind.PARAMETER) && node.isForParameterAnnotationMatch()
+					) {
 						return data;
 					}
 					incorrectTargets.add(targetKind);
 				}
-				if (incorrectTargets.isEmpty()) {
+				if (incorrectTargets.isEmpty())
 					return data;
-				}
 				AnnotationTargetKind[] kinds = new AnnotationTargetKind[incorrectTargets.size()];
 				incorrectTargetKinds.put(node, incorrectTargets.toArray(kinds));
-			} else if (!targetsOtherThanTypeAllowed && !resolvedType.canAnnotationTargetType()) {
-				AnnotationTargetKind[] targetKinds = resolvedType.getAnnotationTargetKinds();
-				if (targetKinds == null) {
-					return data;
-				}
-				// exception here is if parameter annotations are allowed
-				if (parameterTargettingAnnotationsAllowed) {
-					for (AnnotationTargetKind annotationTargetKind : targetKinds) {
-						if (annotationTargetKind.getName().equals("PARAMETER") && node.isForParameterAnnotationMatch()) {
-							return data;
-						}
+			}
+			else if (!resolvedType.canAnnotationTargetType()) {
+				for (AnnotationTargetKind targetKind : targetKinds) {
+					if (
+						isMetaAnnotation && targetKind.equals(AnnotationTargetKind.ANNOTATION_TYPE) ||
+							parameterTargettingAnnotationsAllowed &&
+								targetKind.equals(AnnotationTargetKind.PARAMETER) && node.isForParameterAnnotationMatch()
+					) {
+						return data;
 					}
 				}
 				incorrectTargetKinds.put(node, targetKinds);