fmt

soot-oss · Nov 23, 2023 · cb56161 · cb56161
1 parent 5b7eb64
commit cb56161
Show file tree

Hide file tree

Showing 40 changed files with 23 additions and 93 deletions.
diff --git a/sootup.analysis/src/test/java/sootup/analysis/interprocedural/icfg/ICFGDotExporterTest.java b/sootup.analysis/src/test/java/sootup/analysis/interprocedural/icfg/ICFGDotExporterTest.java
@@ -19,7 +19,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 

diff --git a/sootup.analysis/src/test/java/sootup/analysis/interprocedural/ifds/CGEdgeUtilTest.java b/sootup.analysis/src/test/java/sootup/analysis/interprocedural/ifds/CGEdgeUtilTest.java
@@ -44,7 +44,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 import sootup.java.sourcecode.inputlocation.JavaSourcePathAnalysisInputLocation;

diff --git a/sootup.analysis/src/test/java/sootup/analysis/interprocedural/ifds/IFDSTaintTestSetUp.java b/sootup.analysis/src/test/java/sootup/analysis/interprocedural/ifds/IFDSTaintTestSetUp.java
@@ -33,7 +33,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 

diff --git a/sootup.callgraph/src/test/java/sootup/callgraph/CallGraphTestBase.java b/sootup.callgraph/src/test/java/sootup/callgraph/CallGraphTestBase.java
@@ -12,7 +12,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 import sootup.java.sourcecode.inputlocation.JavaSourcePathAnalysisInputLocation;

diff --git a/sootup.callgraph/src/test/java/sootup/callgraph/ConcreteDispatchTest.java b/sootup.callgraph/src/test/java/sootup/callgraph/ConcreteDispatchTest.java
@@ -16,7 +16,6 @@
 import sootup.core.types.ClassType;
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaProject;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 /** @author : Hasitha Rajapakse, Jonas Klauke * */

diff --git a/sootup.callgraph/src/test/java/sootup/callgraph/InstantiateClassValueVisitorTest.java b/sootup.callgraph/src/test/java/sootup/callgraph/InstantiateClassValueVisitorTest.java
@@ -68,7 +68,6 @@
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
 import sootup.java.core.language.JavaJimple;
-import sootup.java.core.language.JavaLanguage;
 
 @Category(Java8Test.class)
 public class InstantiateClassValueVisitorTest {

diff --git a/sootup.examples/src/test/java/sootup/examples/basicSetup/BasicSetup.java b/sootup.examples/src/test/java/sootup/examples/basicSetup/BasicSetup.java
@@ -9,7 +9,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import sootup.core.Language;
 import sootup.core.Project;
 import sootup.core.inputlocation.AnalysisInputLocation;
 import sootup.core.jimple.common.expr.JVirtualInvokeExpr;
@@ -24,7 +23,6 @@
 import sootup.java.core.JavaSootClass;
 import sootup.java.core.JavaSootClassSource;
 import sootup.java.core.language.JavaJimple;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.sourcecode.inputlocation.JavaSourcePathAnalysisInputLocation;
 import sootup.jimple.parser.JimpleAnalysisInputLocation;
 import sootup.jimple.parser.JimpleProject;
@@ -38,8 +36,7 @@ public void createSourceCodeProject() {
     Path pathToSource = Paths.get("src/test/resources/BasicSetup/source");
     AnalysisInputLocation<JavaSootClass> inputLocation =
         new JavaSourcePathAnalysisInputLocation(pathToSource.toString());
-    Project project =
-        JavaProject.builder().addInputLocation(inputLocation).build();
+    Project project = JavaProject.builder().addInputLocation(inputLocation).build();
   }
 
   @Ignore
@@ -59,8 +56,7 @@ public void createByteCodeProject() {
         PathBasedAnalysisInputLocation.create(pathToBinary, null);
 
     // Create a new JavaProject based on the input location
-    Project project =
-        JavaProject.builder().addInputLocation(inputLocation).build();
+    Project project = JavaProject.builder().addInputLocation(inputLocation).build();
 
     // Create a view for project, which allows us to retrieve classes
     View view = project.createView();

diff --git a/sootup.examples/src/test/java/sootup/examples/bodyInterceptor/BodyInterceptor.java b/sootup.examples/src/test/java/sootup/examples/bodyInterceptor/BodyInterceptor.java
@@ -22,7 +22,6 @@
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
 import sootup.java.core.JavaSootClassSource;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 /** This example illustrates how to invoke body interceptors. */
@@ -37,7 +36,6 @@ public void test() {
         PathBasedAnalysisInputLocation.create(
             Paths.get("src/test/resources/BodyInterceptor/binary"), null);
 
-
     // Create a new JavaProject based on the input location
     JavaProject project = JavaProject.builder().addInputLocation(inputLocation).build();
     JavaView view = project.createView();

diff --git a/sootup.examples/src/test/java/sootup/examples/callgraph/CallgraphExample.java b/sootup.examples/src/test/java/sootup/examples/callgraph/CallgraphExample.java
@@ -14,7 +14,6 @@
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 public class CallgraphExample {

diff --git a/sootup.examples/src/test/java/sootup/examples/classhierarchy/ClassHierarchy.java b/sootup.examples/src/test/java/sootup/examples/classhierarchy/ClassHierarchy.java
@@ -12,7 +12,6 @@
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 

diff --git a/sootup.examples/src/test/java/sootup/examples/mutatingSootClass/MutatingSootClass.java b/sootup.examples/src/test/java/sootup/examples/mutatingSootClass/MutatingSootClass.java
@@ -26,7 +26,6 @@
 import sootup.java.core.JavaSootClassSource;
 import sootup.java.core.OverridingJavaClassSource;
 import sootup.java.core.language.JavaJimple;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/IndyTests.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/IndyTests.java
@@ -9,7 +9,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 /** InvokeDynamics and the Operand stack.. */
@@ -22,8 +21,7 @@ public void test() {
     AnalysisInputLocation<JavaSootClass> inputLocation =
         new JavaClassPathAnalysisInputLocation(directory);
 
-    JavaProject project =
-        JavaProject.builder().addInputLocation(inputLocation).build();
+    JavaProject project = JavaProject.builder().addInputLocation(inputLocation).build();
 
     JavaView view = project.createView();
     Assert.assertEquals(1, view.getClasses().size());

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/RuntimeJarConversionTests.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/RuntimeJarConversionTests.java
@@ -10,7 +10,6 @@
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 public class RuntimeJarConversionTests {
@@ -19,8 +18,7 @@ private static void execute(String methodSignature1) {
     AnalysisInputLocation<JavaSootClass> inputLocation =
         PathBasedAnalysisInputLocation.create(
             Paths.get(System.getProperty("java.home") + "/lib/rt.jar"), null);
-    JavaProject project =
-        JavaProject.builder().addInputLocation(inputLocation).build();
+    JavaProject project = JavaProject.builder().addInputLocation(inputLocation).build();
 
     final MethodSignature methodSignature =
         JavaIdentifierFactory.getInstance().parseMethodSignature(methodSignature1);

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/Soot1577Test.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/Soot1577Test.java
@@ -11,7 +11,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 @Category(Java8Test.class)
@@ -24,8 +23,7 @@ public void test() {
     AnalysisInputLocation<JavaSootClass> inputLocation =
         new JavaClassPathAnalysisInputLocation(directory);
 
-    JavaProject project =
-        JavaProject.builder().addInputLocation(inputLocation).build();
+    JavaProject project = JavaProject.builder().addInputLocation(inputLocation).build();
 
     JavaView view = project.createView();
     view.configBodyInterceptors((ail) -> EmptyClassLoadingOptions.Default);

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/Soot1580Test.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/Soot1580Test.java
@@ -15,7 +15,6 @@
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 @Category(Java8Test.class)
@@ -28,8 +27,7 @@ public void test() {
     AnalysisInputLocation<JavaSootClass> inputLocation =
         PathBasedAnalysisInputLocation.create(jar, null);
 
-    JavaProject project =
-        JavaProject.builder().addInputLocation(inputLocation).build();
+    JavaProject project = JavaProject.builder().addInputLocation(inputLocation).build();
 
     JavaView view =
         project.createView(analysisInputLocation -> BytecodeClassLoadingOptions.Default);

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java
@@ -13,7 +13,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/JavaModuleViewTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/JavaModuleViewTest.java
@@ -15,7 +15,6 @@
 import sootup.java.core.JavaModuleInfo;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.signatures.ModulePackageName;
 import sootup.java.core.types.ModuleJavaClassType;
 import sootup.java.core.views.JavaModuleView;
@@ -28,9 +27,7 @@ public class JavaModuleViewTest {
   @Test
   public void testGeneralClassReceivalFromModule() {
     JavaProject p =
-        JavaProject.builder()
-            .addInputLocation(new JrtFileSystemAnalysisInputLocation())
-            .build();
+        JavaProject.builder().addInputLocation(new JrtFileSystemAnalysisInputLocation()).build();
     JavaModuleView view = (JavaModuleView) p.createView();
     ModuleJavaClassType targetClass =
         JavaModuleIdentifierFactory.getInstance().getClassType("String", "java.lang", "java.base");

diff --git a/....bytecode/src/test/java/sootup/java/bytecode/inputlocation/AnalysisInputLocationTest.java b/....bytecode/src/test/java/sootup/java/bytecode/inputlocation/AnalysisInputLocationTest.java
@@ -14,7 +14,6 @@
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 /*-
@@ -59,8 +58,7 @@ protected IdentifierFactory getIdentifierFactory() {
   protected void testClassReceival(
       AnalysisInputLocation<JavaSootClass> ns, List<ClassType> sigs, int classesFound) {
 
-    final JavaProject project =
-        JavaProject.builder().addInputLocation(ns).build();
+    final JavaProject project = JavaProject.builder().addInputLocation(ns).build();
     final JavaView view = project.createView();
 
     for (ClassType classType : sigs) {

diff --git a/...test/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocationTest.java b/...test/java/sootup/java/bytecode/inputlocation/JavaModulePathAnalysisInputLocationTest.java
@@ -11,7 +11,6 @@
 import sootup.core.model.SourceType;
 import sootup.core.types.ClassType;
 import sootup.java.core.*;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.signatures.ModulePackageName;
 import sootup.java.core.signatures.ModuleSignature;
 import sootup.java.core.types.JavaClassType;

diff --git a/.../src/test/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocationTest.java b/.../src/test/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocationTest.java
@@ -47,7 +47,6 @@
 import sootup.core.util.ImmutableUtils;
 import sootup.core.views.View;
 import sootup.java.core.*;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 /**
@@ -205,11 +204,7 @@ public void testRuntimeJar() {
         PathBasedAnalysisInputLocation.create(
             Paths.get(System.getProperty("java.home") + "/lib/rt.jar"), null);
 
-    JavaView v =
-        JavaProject.builder()
-            .addInputLocation(pathBasedNamespace)
-            .build()
-            .createView();
+    JavaView v = JavaProject.builder().addInputLocation(pathBasedNamespace).build().createView();
 
     // test some standard jre classes
     runtimeContains(v, "Object", "java.lang");

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/AggregatorTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/AggregatorTest.java
@@ -191,8 +191,7 @@ public void testIssue739() {
             Paths.get("../shared-test-resources/bugfixes/Issue739_Aggregator.class"),
             SourceType.Application);
 
-    JavaProject project =
-        JavaProject.builder().addInputLocation(inputLocation).build();
+    JavaProject project = JavaProject.builder().addInputLocation(inputLocation).build();
 
     JavaView view = project.createView();
     view.configBodyInterceptors(a -> BytecodeClassLoadingOptions.Default);

diff --git a/.../src/test/java/sootup/java/bytecode/interceptors/typeresolving/BytecodeHierarchyTest.java b/.../src/test/java/sootup/java/bytecode/interceptors/typeresolving/BytecodeHierarchyTest.java
@@ -17,7 +17,6 @@
 import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.bytecode.interceptors.typeresolving.types.BottomType;
 import sootup.java.core.JavaProject;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 /** @author Zun Wang */
@@ -75,8 +74,7 @@ public void setUp() {
             .collect(Collectors.joining(File.pathSeparator));
     JavaClassPathAnalysisInputLocation analysisInputLocation =
         new JavaClassPathAnalysisInputLocation(jarFile + File.pathSeparator + rtJarClassPath);
-    JavaProject p =
-        JavaProject.builder().addInputLocation(analysisInputLocation).build();
+    JavaProject p = JavaProject.builder().addInputLocation(analysisInputLocation).build();
     view = p.createView();
     ViewTypeHierarchy typeHierarchy = new ViewTypeHierarchy(view);
 

diff --git a/.../src/test/java/sootup/java/bytecode/interceptors/typeresolving/TypeAssignerTestSuite.java b/.../src/test/java/sootup/java/bytecode/interceptors/typeresolving/TypeAssignerTestSuite.java
@@ -14,7 +14,6 @@
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
 import sootup.java.core.JavaSootMethod;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 public class TypeAssignerTestSuite {

diff --git a/...ode/src/test/java/sootup/java/bytecode/minimaltestsuite/MinimalBytecodeTestSuiteBase.java b/...ode/src/test/java/sootup/java/bytecode/minimaltestsuite/MinimalBytecodeTestSuiteBase.java
@@ -23,7 +23,6 @@
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
 import sootup.java.core.JavaSootMethod;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
 

diff --git a/sootup.java.core/src/main/java/sootup/java/core/JavaProject.java b/sootup.java.core/src/main/java/sootup/java/core/JavaProject.java
@@ -153,15 +153,15 @@ public JavaProjectBuilder addInputLocation(
 
     @Nonnull
     public JavaProjectBuilder addInputLocation(
-      ModuleInfoAnalysisInputLocation analysisInputLocation) {
+        ModuleInfoAnalysisInputLocation analysisInputLocation) {
       useModules = true;
       this.moduleAnalysisInputLocations.add(analysisInputLocation);
       return this;
     }
 
     @Nonnull
     public JavaProjectBuilder addInputLocation(
-            MultiReleaseModuleInfoAnalysisInputLocation analysisInputLocation) {
+        MultiReleaseModuleInfoAnalysisInputLocation analysisInputLocation) {
       if (analysisInputLocation.getLanguage().getVersion() > 8) {
         useModules = true;
         this.moduleAnalysisInputLocations.add(analysisInputLocation);

diff --git a/sootup.java.core/src/main/java/sootup/java/core/ModuleInfoAnalysisInputLocation.java b/sootup.java.core/src/main/java/sootup/java/core/ModuleInfoAnalysisInputLocation.java
@@ -4,8 +4,6 @@
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nonnull;
-
-import sootup.core.Language;
 import sootup.core.frontend.AbstractClassSource;
 import sootup.core.inputlocation.AnalysisInputLocation;
 import sootup.core.views.View;

diff --git a/...java.core/src/main/java/sootup/java/core/MultiReleaseModuleInfoAnalysisInputLocation.java b/...java.core/src/main/java/sootup/java/core/MultiReleaseModuleInfoAnalysisInputLocation.java
@@ -1,22 +1,15 @@
 package sootup.java.core;
 
-import sootup.core.Language;
-import sootup.core.frontend.AbstractClassSource;
-import sootup.core.inputlocation.AnalysisInputLocation;
-import sootup.core.views.View;
-import sootup.java.core.signatures.ModuleSignature;
-
 import javax.annotation.Nonnull;
-import java.util.Collection;
-import java.util.Optional;
-import java.util.Set;
+import sootup.core.Language;
 
 /**
  * @author Markus Schmidt
  *     <p>Interface to mark AnalysisInputLocations that are capable of retreiving
  *     JavaModuleInformations
  */
-public interface MultiReleaseModuleInfoAnalysisInputLocation extends ModuleInfoAnalysisInputLocation {
+public interface MultiReleaseModuleInfoAnalysisInputLocation
+    extends ModuleInfoAnalysisInputLocation {
 
   @Nonnull
   Language getLanguage();

diff --git a/sootup.java.core/src/test/java/sootup/java/core/jimple/common/ref/JFieldRefTest.java b/sootup.java.core/src/test/java/sootup/java/core/jimple/common/ref/JFieldRefTest.java
@@ -27,7 +27,6 @@
 import sootup.java.core.JavaProject;
 import sootup.java.core.JavaSootClass;
 import sootup.java.core.OverridingJavaClassSource;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 /** @author Linghui Luo */
@@ -38,8 +37,7 @@ public class JFieldRefTest {
 
   @Before
   public void setUp() {
-    JavaProject project =
-        JavaProject.builder().addInputLocation(new EagerInputLocation()).build();
+    JavaProject project = JavaProject.builder().addInputLocation(new EagerInputLocation()).build();
     view = project.createView();
   }