Add class type conveniences to Annotation matching

rob-valor · Jul 10, 2024 · 78b97b5 · 78b97b5
1 parent 69addbf
commit 78b97b5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/AnnotationMatcher.java b/rewrite-java/src/main/java/org/openrewrite/java/AnnotationMatcher.java
@@ -63,6 +63,13 @@ public AnnotationMatcher(String signature, @Nullable Boolean matchesMetaAnnotati
         this.matchMetaAnnotations = Boolean.TRUE.equals(matchesMetaAnnotations);
     }
 
+    public AnnotationMatcher(Class<?> annotationType) {
+        this("@" + annotationType.getName());
+        if (!annotationType.isAnnotation()) {
+            throw new IllegalArgumentException(annotationType.getName() + " is not an annotation.");
+        }
+    }
+
     public AnnotationMatcher(String signature) {
         this(signature, false);
     }
@@ -88,7 +95,7 @@ private boolean matchesAnnotationOrMetaAnnotation(@Nullable JavaType.FullyQualif
                 return true;
             } else if (matchMetaAnnotations) {
                 for (JavaType.FullyQualified annotation : fqn.getAnnotations()) {
-                    if(seenAnnotations == null) {
+                    if (seenAnnotations == null) {
                         seenAnnotations = new HashSet<>();
                     }
                     if (seenAnnotations.add(annotation.getFullyQualifiedName()) &&

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/trait/Annotated.java b/rewrite-java/src/main/java/org/openrewrite/java/trait/Annotated.java
@@ -83,6 +83,10 @@ public Matcher(String signature) {
             this.matcher = new AnnotationMatcher(signature);
         }
 
+        public Matcher(Class<?> annotationType) {
+            this.matcher = new AnnotationMatcher(annotationType);
+        }
+
         @Override
         protected @Nullable Annotated test(Cursor cursor) {
             Object value = cursor.getValue();

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/trait/Traits.java b/rewrite-java/src/main/java/org/openrewrite/java/trait/Traits.java
@@ -43,4 +43,8 @@ public static Annotated.Matcher annotated(AnnotationMatcher matcher) {
     public static Annotated.Matcher annotated(String signature) {
         return new Annotated.Matcher(signature);
     }
+
+    public static Annotated.Matcher annotated(Class<?> annotationType) {
+        return new Annotated.Matcher(annotationType);
+    }
 }