Merge pull request #1116 from soot-oss/removeLanguageConstruct

Remove Language construct

sootup.java.bytecode.frontend/src/main/java/sootup/java/bytecode/frontend/inputlocation/ModuleMultiReleaseJarAnalysisInputLocation.java

@@ -29,7 +29,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import javax.annotation.Nonnull;
-import sootup.core.Language;
 import sootup.core.frontend.SootClassSource;
 import sootup.core.model.SourceType;
 import sootup.core.transform.BodyInterceptor;
@@ -45,8 +44,8 @@
 public class ModuleMultiReleaseJarAnalysisInputLocation extends MultiReleaseJarAnalysisInputLocation
     implements ModuleInfoAnalysisInputLocation {
   public ModuleMultiReleaseJarAnalysisInputLocation(
-      @Nonnull Path path, @Nonnull SourceType srcType, @Nonnull Language language) {
-    super(path, srcType, language);
+      @Nonnull Path path, @Nonnull SourceType srcType, int version) {
+    super(path, srcType, version);
 
     /*
 

sootup.java.bytecode.frontend/src/main/java/sootup/java/bytecode/frontend/inputlocation/MultiReleaseJarAnalysisInputLocation.java

@@ -36,7 +36,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
-import sootup.core.Language;
 import sootup.core.frontend.SootClassSource;
 import sootup.core.inputlocation.AnalysisInputLocation;
 import sootup.core.model.SourceType;
@@ -59,52 +58,53 @@ public class MultiReleaseJarAnalysisInputLocation extends ArchiveBasedAnalysisIn
   // "usual" Jar
   protected static final Integer DEFAULT_VERSION = 0;
 
-  @Nonnull protected final Language language;
   @Nonnull private final List<BodyInterceptor> bodyInterceptors;
 
   @Nonnull
   protected final Map<Integer, AnalysisInputLocation> inputLocations = new LinkedHashMap<>();
 
+  private final int version;
+
   public static AnalysisInputLocation create(
       @Nonnull Path path,
       @Nonnull SourceType srcType,
-      @Nonnull Language language,
+      int version,
       List<BodyInterceptor> bodyInterceptors) {
 
     if (isMultiReleaseJar(path)) {
       return new MultiReleaseJarAnalysisInputLocation(
-          path, srcType, language, bodyInterceptors, true);
+          path, srcType, version, bodyInterceptors, true);
     }
 
     return create(
         path, srcType, bodyInterceptors, Collections.singletonList(Paths.get("/META-INF")));
   }
 
-  public MultiReleaseJarAnalysisInputLocation(@Nonnull Path path, @Nonnull Language language) {
-    this(path, SourceType.Application, language);
+  public MultiReleaseJarAnalysisInputLocation(@Nonnull Path path, int version) {
+    this(path, SourceType.Application, version);
   }
 
   public MultiReleaseJarAnalysisInputLocation(
-      @Nonnull Path path, @Nonnull SourceType srcType, @Nonnull Language language) {
-    this(path, srcType, language, BytecodeBodyInterceptors.Default.getBodyInterceptors());
+      @Nonnull Path path, @Nonnull SourceType srcType, int version) {
+    this(path, srcType, version, BytecodeBodyInterceptors.Default.getBodyInterceptors());
   }
 
   public MultiReleaseJarAnalysisInputLocation(
       @Nonnull Path path,
       @Nonnull SourceType srcType,
-      @Nonnull Language language,
+      int version,
       @Nonnull List<BodyInterceptor> bodyInterceptors) {
-    this(path, srcType, language, bodyInterceptors, isMultiReleaseJar(path));
+    this(path, srcType, version, bodyInterceptors, isMultiReleaseJar(path));
   }
 
   protected MultiReleaseJarAnalysisInputLocation(
       @Nonnull Path path,
       @Nonnull SourceType srcType,
-      @Nonnull Language language,
+      int version,
       @Nonnull List<BodyInterceptor> bodyInterceptors,
       boolean isMultiRelease) {
     super(path, srcType);
-    this.language = language;
+    this.version = version;
     this.bodyInterceptors = bodyInterceptors;
 
     if (!isMultiRelease) {
@@ -128,16 +128,14 @@ protected MultiReleaseJarAnalysisInputLocation(
                 return versionDirName.substring(0, versionDirName.length() - 1);
               })
           .map(Integer::new)
-          .filter(version -> version <= language.getVersion())
+          .filter(ver -> ver <= version)
           .sorted(Comparator.reverseOrder())
           .forEach(
-              version -> {
+              ver -> {
                 final Path versionRoot =
-                    archiveRoot
-                        .getFileSystem()
-                        .getPath("/META-INF", "versions", version.toString());
+                    archiveRoot.getFileSystem().getPath("/META-INF", "versions", ver.toString());
                 inputLocations.put(
-                    version,
+                    ver,
                     create(versionRoot, sourceType, bodyInterceptors, Collections.emptyList()));
               });
 
@@ -199,8 +197,8 @@ public Collection<JavaSootClassSource> getClassSources(@Nonnull View view) {
   }
 
   @Nonnull
-  public Language getLanguage() {
-    return language;
+  public int getVersion() {
+    return version;
   }
 
   public static boolean isMultiReleaseJar(Path path) {

sootup.java.bytecode.frontend/src/test/java/sootup/java/bytecode/frontend/inputlocation/ModuleMultiReleaseJarAnalysisInputLocationTest.java

@@ -37,7 +37,6 @@
 import sootup.core.types.ClassType;
 import sootup.java.core.JavaModuleIdentifierFactory;
 import sootup.java.core.ModuleInfoAnalysisInputLocation;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.signatures.ModuleSignature;
 import sootup.java.core.types.ModuleJavaClassType;
 import sootup.java.core.views.JavaModuleView;
@@ -70,17 +69,15 @@ public void modularMultiReleaseJar() {
         getIdentifierFactory().getClassType("de.upb.swt.multirelease.Main");
 
     ModuleInfoAnalysisInputLocation moduleMultiReleaseJarAnalysisInputLocation8 =
-        new ModuleMultiReleaseJarAnalysisInputLocation(
-            mmrj, SourceType.Application, new JavaLanguage(8));
+        new ModuleMultiReleaseJarAnalysisInputLocation(mmrj, SourceType.Application, 8);
 
     final JavaView view_8 =
         new JavaModuleView(
             Collections.emptyList(),
             Collections.singletonList(moduleMultiReleaseJarAnalysisInputLocation8));
 
     ModuleMultiReleaseJarAnalysisInputLocation moduleMultiReleaseJarAnalysisInputLocation9 =
-        new ModuleMultiReleaseJarAnalysisInputLocation(
-            mmrj, SourceType.Application, new JavaLanguage(9));
+        new ModuleMultiReleaseJarAnalysisInputLocation(mmrj, SourceType.Application, 9);
     final JavaModuleView view_9 =
         new JavaModuleView(
             Collections.emptyList(),

sootup.java.bytecode.frontend/src/test/java/sootup/java/bytecode/frontend/inputlocation/MultiReleaseJarAnalysisInputLocationTest.java

@@ -37,7 +37,6 @@
 import sootup.core.model.SourceType;
 import sootup.core.signatures.MethodSubSignature;
 import sootup.core.types.ClassType;
-import sootup.java.core.language.JavaLanguage;
 import sootup.java.core.views.JavaView;
 
 @Tag(TestCategories.JAVA_8_CATEGORY)
@@ -56,25 +55,15 @@ public class MultiReleaseJarAnalysisInputLocationTest extends AnalysisInputLocat
   public void multiReleaseJar() {
 
     view_min =
-        new JavaView(
-            new MultiReleaseJarAnalysisInputLocation(
-                mrj, SourceType.Application, new JavaLanguage(1)));
-    view_8 =
-        new JavaView(
-            new MultiReleaseJarAnalysisInputLocation(
-                mrj, SourceType.Application, new JavaLanguage(8)));
-    view_9 =
-        new JavaView(
-            new MultiReleaseJarAnalysisInputLocation(
-                mrj, SourceType.Application, new JavaLanguage(9)));
+        new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, SourceType.Application, 1));
+    view_8 = new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, SourceType.Application, 8));
+    view_9 = new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, SourceType.Application, 9));
     view_10 =
-        new JavaView(
-            new MultiReleaseJarAnalysisInputLocation(
-                mrj, SourceType.Application, new JavaLanguage(10)));
+        new JavaView(new MultiReleaseJarAnalysisInputLocation(mrj, SourceType.Application, 10));
     view_max =
         new JavaView(
             new MultiReleaseJarAnalysisInputLocation(
-                mrj, SourceType.Application, new JavaLanguage(Integer.MAX_VALUE)));
+                mrj, SourceType.Application, Integer.MAX_VALUE));
 
     classType = getIdentifierFactory().getClassType("de.upb.sse.multirelease.Utility");
     classType2 = getIdentifierFactory().getClassType("de.upb.sse.multirelease.Main");

sootup.jimple.frontend/src/main/java/sootup/jimple/frontend/JimpleView.java

@@ -41,6 +41,7 @@
 import sootup.core.model.SourceType;
 import sootup.core.types.ClassType;
 import sootup.core.views.AbstractView;
+import sootup.java.core.JavaIdentifierFactory;
 
 /**
  * The Class JimpleView manages the Sootclasses of the application being analyzed.
@@ -97,7 +98,7 @@ public synchronized Optional<SootClass> getClass(@Nonnull ClassType type) {
   @Nonnull
   @Override
   public IdentifierFactory getIdentifierFactory() {
-    return new JimpleLanguage().getIdentifierFactory();
+    return JavaIdentifierFactory.getInstance();
   }
 
   @Nonnull