add type parameter dependencies to self

I decided to make `JavaTypeParameters.getDependenciesFromSelf()` and `JavaTypeVariable.getDependenciesFromSelf()` public API as it might be useful in general and we need it now to register the dependencies to self within the import context. The alternative would have been some workaround to keep the visibility package private, but I didn't consider it worth the effort, since it makes a nice addition to the public API.

Signed-off-by: Peter Gafert <peter.gafert@tngtech.com>

Author: codecholeric

archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExamplesIntegrationTest.java

@@ -857,8 +857,10 @@ Stream<DynamicTest> LayeredArchitectureTest() {
                                         .inLine(27)
                                         .asDependency())
 
-                                .by(method(ServiceViolatingLayerRules.class, dependentMethod).withParameter(UseCaseTwoController.class))
+                                .by(typeParameter(ServiceHelper.class, "TYPE_PARAMETER_VIOLATING_LAYER_RULE").dependingOn(SomeUtility.class))
+                                .by(typeParameter(ServiceHelper.class, "ANOTHER_TYPE_PARAMETER_VIOLATING_LAYER_RULE").dependingOn(SomeEnum.class))
 
+                                .by(method(ServiceViolatingLayerRules.class, dependentMethod).withParameter(UseCaseTwoController.class))
                                 .by(method(ServiceViolatingLayerRules.class, dependentMethod).withReturnType(SomeGuiController.class))
 
                                 .by(annotatedClass(ServiceViolatingLayerRules.class).withAnnotationParameterType(ComplexControllerAnnotation.class))

archunit/src/main/java/com/tngtech/archunit/core/domain/ImportContext.java

@@ -67,6 +67,8 @@ public interface ImportContext {
 
     Set<InstanceofCheck> getInstanceofChecksOfType(JavaClass javaClass);
 
+    Set<Dependency> getTypeParameterDependenciesWithTargetClass(JavaClass javaClass);
+
     JavaClass resolveClass(String fullyQualifiedClassName);
 
     Optional<JavaClass> getMethodReturnType(String declaringClassName, String methodName);

archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java

@@ -39,6 +39,7 @@ class JavaClassDependencies {
     private final Set<JavaAnnotation<?>> annotationsWithTypeOfClass;
     private final Set<JavaAnnotation<?>> annotationsWithParameterTypeOfClass;
     private final Set<InstanceofCheck> instanceofChecksWithTypeOfClass;
+    private final Set<Dependency> typeParameterDependenciesWithTargetClass;
     private final Supplier<Set<Dependency>> directDependenciesFromClass;
     private final Supplier<Set<Dependency>> directDependenciesToClass;
 
@@ -53,6 +54,7 @@ class JavaClassDependencies {
         this.annotationsWithTypeOfClass = context.getAnnotationsOfType(javaClass);
         this.annotationsWithParameterTypeOfClass = context.getAnnotationsWithParameterOfType(javaClass);
         this.instanceofChecksWithTypeOfClass = context.getInstanceofChecksOfType(javaClass);
+        this.typeParameterDependenciesWithTargetClass = context.getTypeParameterDependenciesWithTargetClass(javaClass);
         this.directDependenciesFromClass = getDirectDependenciesFromClassSupplier();
         this.directDependenciesToClass = getDirectDependenciesToClassSupplier();
     }
@@ -91,6 +93,7 @@ public Set<Dependency> get() {
                 result.addAll(constructorParameterDependenciesToSelf());
                 result.addAll(annotationDependenciesToSelf());
                 result.addAll(instanceofCheckDependenciesToSelf());
+                result.addAll(typeParameterDependenciesWithTargetClass);
                 return result.build();
             }
         });

archunit/src/main/java/com/tngtech/archunit/core/domain/JavaTypeParameters.java

@@ -43,7 +43,8 @@ protected List<JavaTypeVariable<OWNER>> delegate() {
         return typeParameters;
     }
 
-    Set<Dependency> getDependenciesFromSelf() {
+    @PublicAPI(usage = ACCESS)
+    public Set<Dependency> getDependenciesFromSelf() {
         ImmutableSet.Builder<Dependency> result = ImmutableSet.builder();
         for (JavaTypeVariable<?> typeVariable : typeParameters) {
             result.addAll(typeVariable.getDependenciesFromSelf());

archunit/src/main/java/com/tngtech/archunit/core/domain/JavaTypeVariable.java

@@ -157,7 +157,8 @@ public JavaClass toErasure() {
         return erasure;
     }
 
-    Set<Dependency> getDependenciesFromSelf() {
+    @PublicAPI(usage = ACCESS)
+    public Set<Dependency> getDependenciesFromSelf() {
         return dependencies;
     }
 

archunit/src/main/java/com/tngtech/archunit/core/importer/ClassGraphCreator.java

@@ -30,6 +30,7 @@
 import com.tngtech.archunit.core.domain.AccessTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.ConstructorCallTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.MethodCallTarget;
+import com.tngtech.archunit.core.domain.Dependency;
 import com.tngtech.archunit.core.domain.DomainObjectCreationContext;
 import com.tngtech.archunit.core.domain.ImportContext;
 import com.tngtech.archunit.core.domain.InstanceofCheck;
@@ -264,6 +265,11 @@ public Set<InstanceofCheck> getInstanceofChecksOfType(JavaClass javaClass) {
         return memberDependenciesByTarget.getInstanceofChecksOfType(javaClass);
     }
 
+    @Override
+    public Set<Dependency> getTypeParameterDependenciesWithTargetClass(JavaClass javaClass) {
+        return memberDependenciesByTarget.getTypeParameterDependenciesWithTargetClass(javaClass);
+    }
+
     private <T extends AccessTarget, B extends DomainBuilders.JavaAccessBuilder<T, B>>
     B accessBuilderFrom(B builder, AccessRecord<T> record) {
         return builder
@@ -293,7 +299,9 @@ public Set<JavaClass> createInterfaces(JavaClass owner) {
     public JavaTypeParameters<JavaClass> createTypeParameters(JavaClass owner) {
         TypeParametersBuilder typeParametersBuilder = importRecord.getTypeParameterBuildersFor(owner.getName());
         List<JavaTypeVariable<JavaClass>> typeParameters = typeParametersBuilder.build(owner, classes.byTypeName());
-        return DomainObjectCreationContext.createTypeParameters(typeParameters);
+        JavaTypeParameters<JavaClass> result = DomainObjectCreationContext.createTypeParameters(typeParameters);
+        memberDependenciesByTarget.registerTypeParameters(result);
+        return result;
     }
 
     @Override
@@ -389,6 +397,7 @@ private static class MemberDependenciesByTarget {
         private final SetMultimap<JavaClass, JavaAnnotation<?>> annotationTypeDependencies = HashMultimap.create();
         private final SetMultimap<JavaClass, JavaAnnotation<?>> annotationParameterTypeDependencies = HashMultimap.create();
         private final SetMultimap<JavaClass, InstanceofCheck> instanceofCheckDependencies = HashMultimap.create();
+        private final SetMultimap<JavaClass, Dependency> typeParameterDependencies = HashMultimap.create();
 
         void registerFields(Set<JavaField> fields) {
             for (JavaField field : fields) {
@@ -454,6 +463,14 @@ void registerStaticInitializer(JavaStaticInitializer staticInitializer) {
             }
         }
 
+        void registerTypeParameters(JavaTypeParameters<JavaClass> typeParameters) {
+            for (JavaTypeVariable<JavaClass> typeParameter : typeParameters) {
+                for (Dependency dependency : typeParameter.getDependenciesFromSelf()) {
+                    typeParameterDependencies.put(dependency.getTargetClass(), dependency);
+                }
+            }
+        }
+
         Set<JavaField> getFieldsOfType(JavaClass javaClass) {
             return fieldTypeDependencies.get(javaClass);
         }
@@ -489,5 +506,9 @@ Set<JavaAnnotation<?>> getAnnotationsWithParameterOfType(JavaClass javaClass) {
         Set<InstanceofCheck> getInstanceofChecksOfType(JavaClass javaClass) {
             return instanceofCheckDependencies.get(javaClass);
         }
+
+        Set<Dependency> getTypeParameterDependenciesWithTargetClass(JavaClass javaClass) {
+            return typeParameterDependencies.get(javaClass);
+        }
     }
 }

archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassTest.java

@@ -700,6 +700,34 @@ public void direct_dependencies_to_self_by_annotation() {
                         .inLineNumber(0));
     }
 
+    @Test
+    public void direct_dependencies_to_self_by_type_parameter() {
+        class ClassOtherTypeSignaturesDependOn {
+        }
+        @SuppressWarnings("unused")
+        class FirstDependingOnOtherThroughTypeParameter<T extends ClassOtherTypeSignaturesDependOn> {
+        }
+        @SuppressWarnings("unused")
+        class SecondDependingOnOtherThroughTypeParameter<
+                U extends Map<?, List<? super Set<? extends ClassOtherTypeSignaturesDependOn>>>,
+                V extends Map<ClassOtherTypeSignaturesDependOn, ClassOtherTypeSignaturesDependOn>> {
+        }
+
+        JavaClass someClass = importClasses(ClassOtherTypeSignaturesDependOn.class, FirstDependingOnOtherThroughTypeParameter.class, SecondDependingOnOtherThroughTypeParameter.class)
+                .get(ClassOtherTypeSignaturesDependOn.class);
+
+        assertThatDependencies(someClass.getDirectDependenciesToSelf())
+                .contain(from(FirstDependingOnOtherThroughTypeParameter.class).to(ClassOtherTypeSignaturesDependOn.class).inLocation(getClass(), 0)
+                        .withDescriptionContaining("type parameter 'T' depending on")
+
+                        .from(SecondDependingOnOtherThroughTypeParameter.class).to(ClassOtherTypeSignaturesDependOn.class).inLocation(getClass(), 0)
+                        .withDescriptionContaining("type parameter 'U' depending on")
+
+                        .from(SecondDependingOnOtherThroughTypeParameter.class).to(ClassOtherTypeSignaturesDependOn.class).inLocation(getClass(), 0)
+                        .withDescriptionContaining("type parameter 'V' depending on")
+                );
+    }
+
     @Test
     public void direct_dependencies_to_self_finds_correct_set_of_origin_types() {
         JavaClasses classes = importPackagesOf(getClass());

archunit/src/test/java/com/tngtech/archunit/core/importer/ImportTestUtils.java

@@ -22,6 +22,7 @@
 import com.tngtech.archunit.base.Optional;
 import com.tngtech.archunit.core.domain.AccessTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.MethodCallTarget;
+import com.tngtech.archunit.core.domain.Dependency;
 import com.tngtech.archunit.core.domain.DomainObjectCreationContext;
 import com.tngtech.archunit.core.domain.ImportContext;
 import com.tngtech.archunit.core.domain.InstanceofCheck;
@@ -444,6 +445,11 @@ public Set<InstanceofCheck> getInstanceofChecksOfType(JavaClass javaClass) {
             return Collections.emptySet();
         }
 
+        @Override
+        public Set<Dependency> getTypeParameterDependenciesWithTargetClass(JavaClass javaClass) {
+            return Collections.emptySet();
+        }
+
         @Override
         public JavaClass resolveClass(String fullyQualifiedClassName) {
             throw new UnsupportedOperationException("Override me where necessary");