Rule springBootApplicationShouldBeIn should not check for meta annota…

…tion Closes gh-8
enofex · Jun 6, 2024 · 5c12de2 · 5c12de2
1 parent aa87afc
commit 5c12de2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/com/enofex/taikai/spring/BootConfigurer.java b/src/main/java/com/enofex/taikai/spring/BootConfigurer.java
@@ -1,7 +1,7 @@
 package com.enofex.taikai.spring;
 
 import static com.enofex.taikai.spring.SpringPredicates.ANNOTATION_SPRING_BOOT_APPLICATION;
-import static com.enofex.taikai.spring.SpringPredicates.metaAnnotatedWithSpringBootApplication;
+import static com.enofex.taikai.spring.SpringPredicates.annotatedWithSpringBootApplication;
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.are;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
 
@@ -25,7 +25,7 @@ public BootConfigurer springBootApplicationShouldBeIn(String location) {
 
   public BootConfigurer springBootApplicationShouldBeIn(String location, Configuration configuration) {
     return addRule(TaikaiRule.of(classes()
-        .that(are(metaAnnotatedWithSpringBootApplication()))
+        .that(are(annotatedWithSpringBootApplication()))
         .should().resideInAPackage(location)
         .as("Classes annotated with %s should be located in %s".formatted(
             ANNOTATION_SPRING_BOOT_APPLICATION, location)), configuration));

diff --git a/src/main/java/com/enofex/taikai/spring/SpringPredicates.java b/src/main/java/com/enofex/taikai/spring/SpringPredicates.java
@@ -51,8 +51,8 @@ static DescribedPredicate<CanBeAnnotated> metaAnnotatedWithRepository() {
         "annotated with %s".formatted(ANNOTATION_REPOSITORY));
   }
 
-  static DescribedPredicate<CanBeAnnotated> metaAnnotatedWithSpringBootApplication() {
-    return metaAnnotatedWith(ANNOTATION_SPRING_BOOT_APPLICATION,
+  static DescribedPredicate<CanBeAnnotated> annotatedWithSpringBootApplication() {
+    return annotatedWith(ANNOTATION_SPRING_BOOT_APPLICATION,
         "annotated with %s".formatted(ANNOTATION_SPRING_BOOT_APPLICATION));
   }
 
@@ -61,6 +61,16 @@ static DescribedPredicate<CanBeAnnotated> metaAnnotatedAutowired() {
         "annotated with %s".formatted(ANNOTATION_AUTOWIRED));
   }
 
+  private static DescribedPredicate<CanBeAnnotated> annotatedWith(String annotation,
+      String description) {
+    return new DescribedPredicate<>(description) {
+      @Override
+      public boolean test(CanBeAnnotated canBeAnnotated) {
+        return canBeAnnotated.isMetaAnnotatedWith(annotation);
+      }
+    };
+  }
+
   private static DescribedPredicate<CanBeAnnotated> metaAnnotatedWith(String annotation,
       String description) {
     return new DescribedPredicate<>(description) {