Ensure packages are added in runner checker

Author: eyuan-netflix

nebula-archrules-core/src/main/java/com/netflix/nebula/archrules/core/Runner.java

@@ -2,10 +2,18 @@
 
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.core.importer.Location;
+import com.tngtech.archunit.core.importer.Locations;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.EvaluationResult;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class Runner {
     public static EvaluationResult check(ArchRule rule, JavaClasses classesToCheck) {
         try {
@@ -32,8 +40,18 @@ public static EvaluationResult check(ArchRule rule, JavaClasses classesToCheck)
      * @return the result, which contains information about failure
      */
     public static EvaluationResult check(ArchRule rule, Class<?>... classesToCheck) {
+        Set<Location> locs = new HashSet<>();
+        locs.addAll(Arrays.stream(classesToCheck)
+                .map(Locations::ofClass)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList()));
+        locs.addAll(Arrays.stream(classesToCheck)
+                .map(clazz -> clazz.getPackage().getName())
+                .map(Locations::ofPackage)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList()));
         final JavaClasses classes = new ClassFileImporter()
-                .importClasses(classesToCheck);
+                .importLocations(locs);
         return check(rule, classes);
     }
 }

nebula-archrules-core/src/test/java/com/netflix/nebula/archrules/core/RunnerTest.java

@@ -1,15 +1,23 @@
 package com.netflix.nebula.archrules.core;
 
+import com.netflix.nebula.archrules.testpackage.TestDeprecated;
+import com.tngtech.archunit.core.domain.JavaClass;
+import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
+import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.EvaluationResult;
 import com.tngtech.archunit.lang.Priority;
+import com.tngtech.archunit.lang.SimpleConditionEvent;
 import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
 import org.junit.jupiter.api.Test;
 
 import static com.tngtech.archunit.core.domain.JavaClass.Predicates.simpleName;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RunnerTest {
+    private final ArchRule noDeprecatedRule = ArchRuleDefinition.classes().should()
+            .notBeAnnotatedWith(Deprecated.class);
+
     @Test
     public void test_pass() {
         final EvaluationResult result = Runner.check(noDeprecatedRule, PassingClass.class);
@@ -36,8 +44,6 @@ static class PassingClass {
     static class FailingClass {
     }
 
-    private final ArchRule noDeprecatedRule = ArchRuleDefinition.classes().should()
-            .notBeAnnotatedWith(Deprecated.class);
     private final ArchRule smokeTestRule = ArchRuleDefinition.priority(Priority.MEDIUM)
             .classes().that(simpleName("SmokeTest"))
             .should().beAnnotatedWith(Deprecated.class)
@@ -63,4 +69,25 @@ public void test_smoke_fail() {
         assertThat(result.getFailureReport().getDetails())
                 .contains(NoClassesMatchedEvent.NO_MATCH_MESSAGE);
     }
+
+    private final ArchCondition<JavaClass> notBeInDeprecatedPackage =
+            new ArchCondition<JavaClass>("not be in a package marked with @Deprecated") {
+                @Override
+                public void check(JavaClass javaClass, ConditionEvents events) {
+                    boolean isInDeprecatedPackage = javaClass.getPackage().getPackageInfo().isAnnotatedWith(Deprecated.class);
+                    if (isInDeprecatedPackage) {
+                        String message = String.format("Class %s is in a package marked with @Deprecated", javaClass.getName());
+                        events.add(SimpleConditionEvent.violated(javaClass, message));
+                    }
+                }
+            };
+    private final ArchRule noDeprecatedPackageRule = ArchRuleDefinition
+            .classes().should(notBeInDeprecatedPackage);
+
+    @Test
+    public void test_package_deprecated_rule() {
+        final EvaluationResult result = Runner.check(noDeprecatedPackageRule, TestDeprecated.class);
+        assertThat(result.hasViolation()).isTrue();
+    }
+
 }

nebula-archrules-core/src/test/java/com/netflix/nebula/archrules/testpackage/TestDeprecated.java

@@ -0,0 +1,4 @@
+package com.netflix.nebula.archrules.testpackage;
+
+public class TestDeprecated {
+}

nebula-archrules-core/src/test/java/com/netflix/nebula/archrules/testpackage/package-info.java

@@ -0,0 +1,2 @@
+@Deprecated
+package com.netflix.nebula.archrules.testpackage;