refactor: remove ClassLoadingOptions -> helps simplifiying specificat…

…ion of Interceptors
soot-oss · Feb 8, 2024 · 78bae3c · 78bae3c
1 parent 84b98b6
commit 78bae3c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 196 deletions.
diff --git a/sootup.core/src/main/java/sootup/core/inputlocation/ClassLoadingOptions.java b/sootup.core/src/main/java/sootup/core/inputlocation/ClassLoadingOptions.java
diff --git a/sootup.core/src/main/java/sootup/core/inputlocation/EmptyClassLoadingOptions.java b/sootup.core/src/main/java/sootup/core/inputlocation/EmptyClassLoadingOptions.java
diff --git a/...ytecode/src/main/java/sootup/java/bytecode/inputlocation/BytecodeClassLoadingOptions.java b/...ytecode/src/main/java/sootup/java/bytecode/inputlocation/BytecodeClassLoadingOptions.java
diff --git a/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java b/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java
@@ -23,15 +23,12 @@
  */
 
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import sootup.core.cache.provider.ClassCacheProvider;
 import sootup.core.cache.provider.FullCacheProvider;
 import sootup.core.inputlocation.AnalysisInputLocation;
-import sootup.core.inputlocation.ClassLoadingOptions;
-import sootup.core.inputlocation.EmptyClassLoadingOptions;
 import sootup.core.signatures.PackageName;
 import sootup.core.types.ClassType;
 import sootup.java.core.*;
@@ -55,29 +52,11 @@ public JavaModuleView(
     this(inputLocations, moduleInputLocations, new FullCacheProvider());
   }
 
+  /** Creates a new instance of the {@link JavaModuleView} class. */
   public JavaModuleView(
       @Nonnull List<AnalysisInputLocation> inputLocations,
       @Nonnull List<ModuleInfoAnalysisInputLocation> moduleInputLocations,
       @Nonnull ClassCacheProvider cacheProvider) {
-    this(
-        inputLocations,
-        moduleInputLocations,
-        cacheProvider,
-        analysisInputLocation -> EmptyClassLoadingOptions.Default);
-  }
-
-  /**
-   * Creates a new instance of the {@link JavaModuleView} class.
-   *
-   * @param classLoadingOptionsSpecifier To use the default {@link ClassLoadingOptions} for an
-   *     {@link AnalysisInputLocation}, simply return <code>null</code>, otherwise the desired
-   *     options.
-   */
-  public JavaModuleView(
-      @Nonnull List<AnalysisInputLocation> inputLocations,
-      @Nonnull List<ModuleInfoAnalysisInputLocation> moduleInputLocations,
-      @Nonnull ClassCacheProvider cacheProvider,
-      @Nonnull Function<AnalysisInputLocation, ClassLoadingOptions> classLoadingOptionsSpecifier) {
     super(inputLocations, cacheProvider, JavaModuleIdentifierFactory.getInstance());
     this.moduleInfoAnalysisInputLocations = moduleInputLocations;
     JavaModuleInfo unnamedModuleInfo = JavaModuleInfo.getUnnamedModuleInfo();
@@ -180,7 +159,6 @@ public synchronized Optional<JavaSootClass> getClass(
               .filter(Optional::isPresent)
               .limit(1)
               .map(Optional::get)
-              .map(src -> (JavaSootClassSource) src)
               .collect(Collectors.toList());
 
       if (!foundClassSources.isEmpty()) {
@@ -208,7 +186,6 @@ public synchronized Optional<JavaSootClass> getClass(
                 .filter(Optional::isPresent)
                 .limit(1)
                 .map(Optional::get)
-                .map(src -> (JavaSootClassSource) src)
                 .collect(Collectors.toList());
 
         if (!foundClassSources.isEmpty()) {
@@ -229,7 +206,6 @@ public synchronized Optional<JavaSootClass> getClass(
             getAbstractClassSourcesForModules(entryPackage.getModuleSignature(), type)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .map(src -> (JavaSootClassSource) src)
                 .filter(
                     sc -> {
                       if (targetIsFromSameModule) {

diff --git a/...c/main/java/sootup/java/sourcecode/inputlocation/JavaSourcePathAnalysisInputLocation.java b/...c/main/java/sootup/java/sourcecode/inputlocation/JavaSourcePathAnalysisInputLocation.java
@@ -30,7 +30,6 @@
 import org.slf4j.LoggerFactory;
 import sootup.core.frontend.ResolveException;
 import sootup.core.inputlocation.AnalysisInputLocation;
-import sootup.core.inputlocation.ClassLoadingOptions;
 import sootup.core.model.SourceType;
 import sootup.core.transform.BodyInterceptor;
 import sootup.core.types.ClassType;
@@ -41,8 +40,6 @@
 /**
  * An implementation of the {@link AnalysisInputLocation} interface for the Java source code path.
  *
- * <p>Provides default {@link ClassLoadingOptions} from {@link SourcecodeClassLoadingOptions}.
- *
  * @author Linghui Luo
  */
 public class JavaSourcePathAnalysisInputLocation implements AnalysisInputLocation {

diff --git a/...ode/src/main/java/sootup/java/sourcecode/inputlocation/SourcecodeClassLoadingOptions.java b/...ode/src/main/java/sootup/java/sourcecode/inputlocation/SourcecodeClassLoadingOptions.java