separate intraprocedural and interprocedural analysis modules and sep…

…arate interceptors into its own module

pom.xml

@@ -63,12 +63,14 @@
         <module>sootup.core</module>
         <module>sootup.jimple.parser</module>
         <module>sootup.java.core</module>
+        <module>sootup.interceptors</module>
         <module>sootup.java.bytecode</module>
         <module>sootup.java.sourcecode</module>
         <module>sootup.tests</module>
         <module>sootup.callgraph</module>
         <module>sootup.qilin</module>
-        <module>sootup.analysis</module>
+        <module>sootup.analysis.interprocedural</module>
+        <module>sootup.analysis.intraprocedural</module>
         <module>sootup.examples</module>
         <module>sootup.report</module>
         <module>sootup.apk.parser</module>
@@ -445,7 +447,22 @@
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.analysis</artifactId>
+            <artifactId>sootup.analysis.interprocedural</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.analysis.intraprocedural</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.interceptors</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.codepropertygraph</artifactId>
             <version>${project.version}</version>
         </dependency>
 

sootup.analysis/pom.xml → sootup.analysis.interprocedural/pom.xml

@@ -3,8 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>SootUp Analysis</name>
-    <artifactId>sootup.analysis</artifactId>
+    <name>SootUp Interprocedural Analysis</name>
+    <artifactId>sootup.analysis.interprocedural</artifactId>
     <packaging>jar</packaging>
     <parent>
         <groupId>org.soot-oss</groupId>

sootup.analysis.intraprocedural/pom.xml

@@ -0,0 +1,45 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>SootUp Intraprocedural Analysis</name>
+    <artifactId>sootup.analysis.intraprocedural</artifactId>
+    <packaging>jar</packaging>
+    <parent>
+        <groupId>org.soot-oss</groupId>
+        <artifactId>sootup</artifactId>
+        <version>1.3.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.java.bytecode</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.java.sourcecode</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+</project>

sootup.apk.parser/pom.xml

@@ -9,6 +9,7 @@
         <version>1.3.1-SNAPSHOT</version>
     </parent>
 
+    <name>SootUp APK Frontend</name>
     <artifactId>sootup.apk.parser</artifactId>
 
     <properties>

sootup.apk.parser/src/main/java/DexBodyInterceptors.java

@@ -1,11 +1,10 @@
+import interceptors.DexNullTransformer;
+import interceptors.DexNumberTranformer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nonnull;
 import sootup.core.transform.BodyInterceptor;
-import sootup.java.core.interceptors.*;
-import sootup.java.core.interceptors.Dex.DexNullTransformer;
-import sootup.java.core.interceptors.Dex.DexNumberTranformer;
 
 public enum DexBodyInterceptors {
   Default(new DexNumberTranformer(), new DexNullTransformer());

sootup.java.core/src/main/java/sootup/java/core/interceptors/Dex/AbstractNullTransformer.java → sootup.apk.parser/src/main/java/interceptors/AbstractNullTransformer.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors.Dex;
+package interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/Dex/DexDefUseAnalysis.java → sootup.apk.parser/src/main/java/interceptors/DexDefUseAnalysis.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors.Dex;
+package interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/Dex/DexNullTransformer.java → sootup.apk.parser/src/main/java/interceptors/DexNullTransformer.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors.Dex;
+package interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/Dex/DexNumberTranformer.java → sootup.apk.parser/src/main/java/interceptors/DexNumberTranformer.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors.Dex;
+package interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/Dex/DexTransformer.java → sootup.apk.parser/src/main/java/interceptors/DexTransformer.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors.Dex;
+package interceptors;
 
 /*-
  * #%L

sootup.codepropertygraph/pom.xml

@@ -21,21 +21,18 @@
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.core</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.core</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.java.bytecode</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.analysis</artifactId>
+            <artifactId>sootup.analysis.intraprocedural</artifactId>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>

sootup.examples/pom.xml

@@ -36,6 +36,10 @@
             <groupId>org.soot-oss</groupId>
             <artifactId>sootup.jimple.parser</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.interceptors</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

sootup.examples/src/test/java/sootup/examples/bodyInterceptor/BodyInterceptor.java

@@ -12,8 +12,8 @@
 import sootup.core.model.SootMethod;
 import sootup.core.signatures.MethodSignature;
 import sootup.core.types.ClassType;
+import sootup.interceptors.DeadAssignmentEliminator;
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
-import sootup.java.core.interceptors.DeadAssignmentEliminator;
 import sootup.java.core.views.JavaView;
 
 /** This example illustrates how to invoke body interceptors. */

sootup.interceptors/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <name>SootUp Interceptors</name>
+    <parent>
+        <groupId>org.soot-oss</groupId>
+        <artifactId>sootup</artifactId>
+        <version>1.3.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sootup.interceptors</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.java.core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

sootup.java.core/src/main/java/sootup/java/core/interceptors/Aggregator.java → sootup.interceptors/src/main/java/sootup/interceptors/Aggregator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/BytecodeBodyInterceptors.java → sootup.interceptors/src/main/java/sootup/interceptors/BytecodeBodyInterceptors.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/CastAndReturnInliner.java → sootup.interceptors/src/main/java/sootup/interceptors/CastAndReturnInliner.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/ConditionalBranchFolder.java → sootup.interceptors/src/main/java/sootup/interceptors/ConditionalBranchFolder.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/ConstantPropagatorAndFolder.java → sootup.interceptors/src/main/java/sootup/interceptors/ConstantPropagatorAndFolder.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/CopyPropagator.java → sootup.interceptors/src/main/java/sootup/interceptors/CopyPropagator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/DeadAssignmentEliminator.java → sootup.interceptors/src/main/java/sootup/interceptors/DeadAssignmentEliminator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/EmptySwitchEliminator.java → sootup.interceptors/src/main/java/sootup/interceptors/EmptySwitchEliminator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/Evaluator.java → sootup.interceptors/src/main/java/sootup/interceptors/Evaluator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/JimpleSemanticsChecker.java → sootup.interceptors/src/main/java/sootup/interceptors/JimpleSemanticsChecker.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/LocalLivenessAnalyser.java → sootup.interceptors/src/main/java/sootup/interceptors/LocalLivenessAnalyser.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/LocalNameStandardizer.java → sootup.interceptors/src/main/java/sootup/interceptors/LocalNameStandardizer.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework
@@ -31,7 +31,7 @@
 import sootup.core.transform.BodyInterceptor;
 import sootup.core.types.Type;
 import sootup.core.views.View;
-import sootup.java.core.interceptors.typeresolving.types.BottomType;
+import sootup.interceptors.typeresolving.types.BottomType;
 
 // https://github.com/Sable/soot/blob/master/src/main/java/soot/jimple/toolkits/scalar/LocalNameStandardizer.java
 

sootup.java.core/src/main/java/sootup/java/core/interceptors/LocalPacker.java → sootup.interceptors/src/main/java/sootup/interceptors/LocalPacker.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/LocalSplitter.java → sootup.interceptors/src/main/java/sootup/interceptors/LocalSplitter.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/NopEliminator.java → sootup.interceptors/src/main/java/sootup/interceptors/NopEliminator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/StaticSingleAssignmentFormer.java → sootup.interceptors/src/main/java/sootup/interceptors/StaticSingleAssignmentFormer.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/TrapTightener.java → sootup.interceptors/src/main/java/sootup/interceptors/TrapTightener.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 
 /*-
  * #%L

sootup.java.core/src/main/java/sootup/java/core/interceptors/TypeAssigner.java → sootup.interceptors/src/main/java/sootup/interceptors/TypeAssigner.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework
@@ -25,7 +25,7 @@
 import sootup.core.model.Body;
 import sootup.core.transform.BodyInterceptor;
 import sootup.core.views.View;
-import sootup.java.core.interceptors.typeresolving.TypeResolver;
+import sootup.interceptors.typeresolving.TypeResolver;
 import sootup.java.core.views.JavaView;
 
 /**

sootup.java.core/src/main/java/sootup/java/core/interceptors/UnreachableCodeEliminator.java → sootup.interceptors/src/main/java/sootup/interceptors/UnreachableCodeEliminator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/UnusedLocalEliminator.java → sootup.interceptors/src/main/java/sootup/interceptors/UnusedLocalEliminator.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors;
+package sootup.interceptors;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework

sootup.java.core/src/main/java/sootup/java/core/interceptors/typeresolving/AugEvalFunction.java → sootup.interceptors/src/main/java/sootup/interceptors/typeresolving/AugEvalFunction.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors.typeresolving;
+package sootup.interceptors.typeresolving;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework
@@ -42,9 +42,9 @@
 import sootup.core.types.PrimitiveType;
 import sootup.core.types.Type;
 import sootup.core.views.View;
-import sootup.java.core.interceptors.typeresolving.types.AugmentIntegerTypes;
-import sootup.java.core.interceptors.typeresolving.types.BottomType;
-import sootup.java.core.interceptors.typeresolving.types.TopType;
+import sootup.interceptors.typeresolving.types.AugmentIntegerTypes;
+import sootup.interceptors.typeresolving.types.BottomType;
+import sootup.interceptors.typeresolving.types.TopType;
 
 /** @author Zun Wang */
 public class AugEvalFunction {

sootup.java.core/src/main/java/sootup/java/core/interceptors/typeresolving/BytecodeHierarchy.java → sootup.interceptors/src/main/java/sootup/interceptors/typeresolving/BytecodeHierarchy.java

@@ -1,4 +1,4 @@
-package sootup.java.core.interceptors.typeresolving;
+package sootup.interceptors.typeresolving;
 /*-
  * #%L
  * Soot - a J*va Optimization Framework
@@ -29,8 +29,8 @@
 import sootup.core.typehierarchy.TypeHierarchy;
 import sootup.core.types.*;
 import sootup.core.views.View;
-import sootup.java.core.interceptors.typeresolving.types.BottomType;
-import sootup.java.core.interceptors.typeresolving.types.TopType;
+import sootup.interceptors.typeresolving.types.BottomType;
+import sootup.interceptors.typeresolving.types.TopType;
 
 /** @author Zun Wang */
 public class BytecodeHierarchy {