Remove exception or errors from the conservative call graph

ls1intum · Aug 19, 2024 · f5120a2 · f5120a2
1 parent fd2f320
commit f5120a2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/.../ase/ares/api/architecturetest/java/postcompile/TransitivelyAccessesMethodsCondition.java b/.../ase/ares/api/architecturetest/java/postcompile/TransitivelyAccessesMethodsCondition.java
@@ -143,12 +143,13 @@ private Set<JavaAccess<?>> getDirectAccessTargetsOutsideOfAnalyzedClasses(JavaAc
              * These classes are always generic interfaces or abstract classes
              * TODO: Check if this is also the case for foreign packages
              */
-            if (subclasses.size() > 20) {
+            if (subclasses.size() > 20 || isExceptionOrError(resolvedTarget)) {
                 return Collections.emptySet();
             }
 
             return subclasses.stream()
-                    .map(javaClass -> getAccessesFromClass(javaClass, item.getTarget().getFullName().substring(item.getTargetOwner().getFullName().length())))
+                    .map(javaClass ->
+                            getAccessesFromClass(javaClass, item.getTarget().getFullName().substring(item.getTargetOwner().getFullName().length())))
                     .flatMap(Set::stream)
                     .collect(toSet());
         }
@@ -160,13 +161,18 @@ private Set<JavaAccess<?>> getAccessesFromClass(JavaClass javaClass, String meth
                             .getOrigin()
                             .getFullName()
                             .substring(javaClass.getFullName().length())
-                            .equals(methodName))
+                            .equals(methodName)
+                    && isExceptionOrError(a.getTargetOwner()))
                     .collect(toSet());
         }
 
         private JavaClass resolveTargetOwner(JavaClass targetOwner) {
             Optional<JavaClass> resolvedTarget = customClassResolver.tryResolve(targetOwner.getFullName());
             return resolvedTarget.orElse(targetOwner);
         }
+
+        private boolean isExceptionOrError(JavaClass javaClass) {
+            return javaClass.isAssignableTo(Exception.class) || javaClass.isAssignableTo(Error.class);
+        }
     }
 }