Second refactoring of:

- src/main/java/de/tum/cit/ase/ares/api/policy

Author: Markus Paulsen

src/main/java/de/tum/cit/ase/ares/api/aop/java/JavaAOPMode.java

@@ -3,6 +3,10 @@
 import de.tum.cit.ase.ares.api.aop.java.javaAOPModeData.JavaCSVFileLoader;
 import de.tum.cit.ase.ares.api.aop.java.javaAOPModeData.JavaFileLoader;
 import de.tum.cit.ase.ares.api.policy.SecurityPolicy;
+import de.tum.cit.ase.ares.api.policy.policySubComponents.CommandPermission;
+import de.tum.cit.ase.ares.api.policy.policySubComponents.FilePermission;
+import de.tum.cit.ase.ares.api.policy.policySubComponents.NetworkPermission;
+import de.tum.cit.ase.ares.api.policy.policySubComponents.ThreadPermission;
 import de.tum.cit.ase.ares.api.util.FileTools;
 
 import javax.annotation.Nonnull;
@@ -140,13 +144,13 @@ public String threePartedFileBody(
             @Nonnull List<String> allowedListedClasses,
             @Nonnull List<JavaAOPTestCase> javaAOPTestCases
     ) {
-        List<SecurityPolicy.SupervisedCode.FilePermission> filePermissions =
+        List<FilePermission> filePermissions =
                 extractPermissions(javaAOPTestCases, JavaAOPTestCaseSupported.FILESYSTEM_INTERACTION);
-        List<SecurityPolicy.SupervisedCode.NetworkPermission> networkPermissions =
+        List<NetworkPermission> networkPermissions =
                 extractPermissions(javaAOPTestCases, JavaAOPTestCaseSupported.NETWORK_CONNECTION);
-        List<SecurityPolicy.SupervisedCode.CommandPermission> commandPermissions =
+        List<CommandPermission> commandPermissions =
                 extractPermissions(javaAOPTestCases, JavaAOPTestCaseSupported.COMMAND_EXECUTION);
-        List<SecurityPolicy.SupervisedCode.ThreadPermission> threadPermissions =
+        List<ThreadPermission> threadPermissions =
                 extractPermissions(javaAOPTestCases, JavaAOPTestCaseSupported.THREAD_CREATION);
 
         return JavaAOPTestCase.writeAOPSecurityTestCaseFile(

src/main/java/de/tum/cit/ase/ares/api/aop/java/JavaAOPTestCase.java

@@ -6,6 +6,7 @@
 import de.tum.cit.ase.ares.api.architecture.java.archunit.JavaArchUnitSecurityTestCase;
 import de.tum.cit.ase.ares.api.architecture.java.wala.JavaWalaSecurityTestCase;
 import de.tum.cit.ase.ares.api.policy.SecurityPolicy;
+import de.tum.cit.ase.ares.api.policy.policySubComponents.PackagePermission;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -30,7 +31,7 @@ public class JavaArchitectureTestCase implements ArchitectureTestCase {
      * List of allowed packages to be imported.
      */
     @Nullable
-    private final Set<SecurityPolicy.SupervisedCode.PackagePermission> allowedPackages;
+    private final Set<PackagePermission> allowedPackages;
 
     // The following attributes are used for caching
     // TODO Sarp: Explain what are the javaclasses and the call graph with a comment
@@ -56,7 +57,7 @@ public class JavaArchitectureTestCase implements ArchitectureTestCase {
      * @param callGraph                        Call graph of the analyzed Java classes.
      * @param allowedPackages                  List of allowed packages to be imported.
      */
-    public JavaArchitectureTestCase(@Nonnull JavaArchitectureTestCaseSupported javaArchitectureTestCaseSupported, @Nonnull JavaClasses javaClasses, @Nullable CallGraph callGraph, @Nullable Set<SecurityPolicy.SupervisedCode.PackagePermission> allowedPackages) {
+    public JavaArchitectureTestCase(@Nonnull JavaArchitectureTestCaseSupported javaArchitectureTestCaseSupported, @Nonnull JavaClasses javaClasses, @Nullable CallGraph callGraph, @Nullable Set<PackagePermission> allowedPackages) {
         this.javaArchitectureTestCaseSupported = javaArchitectureTestCaseSupported;
         this.javaClasses = javaClasses;
         this.callGraph = callGraph;
@@ -121,7 +122,7 @@ public static class Builder {
         private JavaArchitectureTestCaseSupported javaArchitectureTestCaseSupported;
         private JavaClasses javaClasses;
         private CallGraph callGraph;
-        private Set<SecurityPolicy.SupervisedCode.PackagePermission> allowedPackages;
+        private Set<PackagePermission> allowedPackages;
 
         public Builder javaArchitecturalTestCaseSupported(JavaArchitectureTestCaseSupported javaArchitectureTestCaseSupported) {
             if (javaArchitectureTestCaseSupported == null) {
@@ -141,7 +142,7 @@ public Builder callGraph(CallGraph callGraph) {
             return this;
         }
 
-        public Builder allowedPackages(Set<SecurityPolicy.SupervisedCode.PackagePermission> allowedPackages) {
+        public Builder allowedPackages(Set<PackagePermission> allowedPackages) {
             this.allowedPackages = allowedPackages;
             return this;
         }

src/main/java/de/tum/cit/ase/ares/api/architecture/java/JavaArchitectureTestCase.java

@@ -5,6 +5,7 @@
 import com.tngtech.archunit.core.domain.JavaClasses;
 import de.tum.cit.ase.ares.api.architecture.java.JavaArchitectureTestCaseSupported;
 import de.tum.cit.ase.ares.api.policy.SecurityPolicy;
+import de.tum.cit.ase.ares.api.policy.policySubComponents.PackagePermission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -131,10 +132,10 @@ public Builder javaArchitecturalTestCaseSupported(JavaArchitectureTestCaseSuppor
             return this;
         }
 
-        public Builder allowedPackages(Set<SecurityPolicy.SupervisedCode.PackagePermission> packages) {
+        public Builder allowedPackages(Set<PackagePermission> packages) {
             if (packages != null) {
                 this.allowedPackages = packages.stream()
-                        .map(SecurityPolicy.SupervisedCode.PackagePermission::importTheFollowingPackage)
+                        .map(PackagePermission::importTheFollowingPackage)
                         .collect(Collectors.toSet());
             }
             return this;

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

@@ -6,6 +6,7 @@
 import com.tngtech.archunit.core.domain.JavaClasses;
 import de.tum.cit.ase.ares.api.architecture.java.JavaArchitectureTestCaseSupported;
 import de.tum.cit.ase.ares.api.policy.SecurityPolicy;
+import de.tum.cit.ase.ares.api.policy.policySubComponents.PackagePermission;
 
 import javax.annotation.Nonnull;
 import java.util.HashSet;
@@ -126,10 +127,10 @@ public Builder javaArchitecturalTestCaseSupported(JavaArchitectureTestCaseSuppor
             return this;
         }
 
-        public Builder allowedPackages(Set<SecurityPolicy.SupervisedCode.PackagePermission> packages) {
+        public Builder allowedPackages(Set<PackagePermission> packages) {
             if (packages != null) {
                 this.allowedPackages = packages.stream()
-                        .map(SecurityPolicy.SupervisedCode.PackagePermission::importTheFollowingPackage)
+                        .map(PackagePermission::importTheFollowingPackage)
                         .collect(Collectors.toSet());
             }
             return this;