Merge branch 'main' into main

Author: rahlk

src/main/java/com/ibm/northstar/CodeAnalyzer.java

@@ -29,13 +29,11 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import java.util.zip.GZIPOutputStream;
 
 /**
  * The type Code analyzer.
@@ -61,9 +59,6 @@ public class CodeAnalyzer implements Runnable {
     @Option(names = {"-a", "--analysis-level"}, description = "Level of analysis to perform. Options: 1 (for just symbol table) or 2 (for call graph). Default: 1")
     private static int analysisLevel = 1;
 
-    @Option(names = {"-d", "--dependencies"}, description = "Path to the application 3rd party dependencies that may be helpful in analyzing the application.")
-    private static String dependencies;
-
     @Option(names = {"-v", "--verbose"}, description = "Print logs to console.")
     private static boolean verbose = false;
 
@@ -107,9 +102,11 @@ private static void analyze() throws IOException, ClassHierarchyException, CallG
         }
 
         else {
-
             // download library dependencies of project for type resolution
-            if (!BuildProject.downloadLibraryDependencies(input)) {
+            String dependencies = null;
+            if (BuildProject.downloadLibraryDependencies(input)) {
+                dependencies = String.valueOf(BuildProject.libDownloadPath);
+            } else {
                 Log.warn("Failed to download library dependencies of project");
             }
             // construct symbol table for project, write parse problems to file in output directory if specified
@@ -123,8 +120,8 @@ private static void analyze() throws IOException, ClassHierarchyException, CallG
              if (!Files.exists(outputPath)) {
                  Files.createDirectories(outputPath);
              }
-             String parseError = gson.toJson(symbolTableExtractionResult.getRight());
-             emit(parseError, "parse_errors.json");
+//             String parseError = gson.toJson(symbolTableExtractionResult.getRight());
+//             emit(parseError, "parse_errors.json");
              /*   gson.toJson(symbolTableExtractionResult.getRight(), new FileWriter(new File(outputPath.toString(), "parse_errors.json")));
              *   }
              **/

src/main/java/com/ibm/northstar/SystemDependencyGraph.java

@@ -206,7 +206,7 @@ public static String construct(
 
         // Initialize scope
         AnalysisScope scope = ScopeUtils.createScope(input, dependencies, build);
-        IClassHierarchy cha = ClassHierarchyFactory.makeWithRoot(scope,
+        IClassHierarchy cha = ClassHierarchyFactory.make(scope,
                 new ECJClassLoaderFactory(scope.getExclusions()));
         Log.done("There were a total of " + cha.getNumberOfClasses() + " classes of which "
                 + AnalysisUtils.getNumberOfApplicationClasses(cha) + " are application classes.");

src/main/java/com/ibm/northstar/utils/BuildProject.java

@@ -13,8 +13,8 @@
 
 public class BuildProject {
 
-    private static final String LIB_DEPS_DOWNLOAD_DIR = "_libdeps";
-
+    public static Path libDownloadPath;
+    private static final String LIB_DEPS_DOWNLOAD_DIR = ".library-dependencies";
     private static final String MAVEN_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn";
     private static final String GRADLE_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "gradlew.bat" : "gradlew";
 
@@ -129,7 +129,7 @@ public static List<Path> buildProjectAndStreamClassFiles(String projectPath, Str
      */
     public static boolean downloadLibraryDependencies(String projectPath) {
         // created download dir if it does not exist
-        Path libDownloadPath = Paths.get(projectPath, LIB_DEPS_DOWNLOAD_DIR);
+        libDownloadPath = Paths.get(projectPath, LIB_DEPS_DOWNLOAD_DIR);
         if (!Files.exists(libDownloadPath)) {
             try {
                 Files.createDirectory(libDownloadPath);