Skip to content

Commit cbb9b01

Browse files
committed
Fix package import for ArchUnit
1 parent 592b4c6 commit cbb9b01

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

src/main/java/de/tum/cit/ase/ares/api/architecture/java/archunit/postcompile/JavaArchitectureTestCaseCollection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ public static String getArchitectureRuleFileContent(String key) {
9696
public static ArchRule noClassesShouldImportForbiddenPackages(Set<String> allowedPackages) {
9797
return ArchRuleDefinition.noClasses()
9898
.should()
99-
.transitivelyDependOnClassesThat(new DescribedPredicate<>("imports package") {
99+
.dependOnClassesThat(new DescribedPredicate<>("imports package") {
100100
@Override
101101
public boolean test(JavaClass javaClass) {
102-
return allowedPackages.stream().allMatch(allowedPackage -> allowedPackage.startsWith(javaClass.getPackageName()));
102+
return allowedPackages.stream().noneMatch(allowedPackage -> javaClass.getPackageName().startsWith(allowedPackage));
103103
}
104104
});
105105
}

src/main/java/de/tum/cit/ase/ares/api/securitytest/java/JavaSecurityTestCaseFactoryAndBuilder.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
import javax.annotation.Nonnull;
2323
import java.nio.file.Path;
2424
import java.nio.file.Paths;
25-
import java.util.ArrayList;
26-
import java.util.Arrays;
27-
import java.util.HashSet;
28-
import java.util.List;
25+
import java.util.*;
2926
import java.util.function.Supplier;
3027
import java.util.stream.IntStream;
3128
import java.util.stream.Stream;

src/test/resources/de/tum/cit/ase/ares/integration/testuser/securitypolicies/EverythingForbiddenPolicy.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ regardingTheSupervisedCode:
1111
- importTheFollowingPackage: "java.io"
1212
- importTheFollowingPackage: "java.lang"
1313
- importTheFollowingPackage: "java.util"
14-
- importTheFollowingPackage: "de.tum.cit.ase.ares.api.aop.aspectj.adviceandpointcut"
15-
- importTheFollowingPackage: "java.nio.file"
14+
- importTheFollowingPackage: "de.tum.cit.ase.ares.api.aop.java.aspectj.adviceandpointcut"
15+
- importTheFollowingPackage: "java.nio"
1616
- importTheFollowingPackage: "org.java.aspectj"
17+
- importTheFollowingPackage: "org.aspectj"
18+
- importTheFollowingPackage: "jdk.internal"
19+
- importTheFollowingPackage: "java.net"
20+
- importTheFollowingPackage: "sun.reflect"

src/test/resources/de/tum/cit/ase/ares/integration/testuser/securitypolicies/OnePathAllowed.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ regardingTheSupervisedCode:
1818
- importTheFollowingPackage: "java.io"
1919
- importTheFollowingPackage: "java.lang"
2020
- importTheFollowingPackage: "java.util"
21-
- importTheFollowingPackage: "de.tum.cit.ase.ares.api.aop.aspectj.adviceandpointcut"
22-
- importTheFollowingPackage: "java.nio.file"
21+
- importTheFollowingPackage: "de.tum.cit.ase.ares.api.aop.java.aspectj.adviceandpointcut"
22+
- importTheFollowingPackage: "java.nio"
2323
- importTheFollowingPackage: "org.java.aspectj"
24+
- importTheFollowingPackage: "org.aspectj"
25+
- importTheFollowingPackage: "jdk.internal"
26+
- importTheFollowingPackage: "java.net"
27+
- importTheFollowingPackage: "sun.reflect"

0 commit comments

Comments
 (0)