Fixes for issues 61, 62, and 64. New patch marked version v1.0.2.

Signed-off-by: Rahul Krishna <[email protected]>

Author: rahlk

gradle.properties

@@ -1 +1 @@
-version=1.0.1
+version=1.0.2

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

@@ -69,6 +69,9 @@ public class CodeAnalyzer implements Runnable {
     @Option(names = {"--no-build"}, description = "Do not build your application. Use this option if you have already built your application.")
     private static boolean noBuild = false;
 
+    @Option(names = {"--no-copy-dependencies"}, description = "Do copy dependencies to a temporary directory.")
+    private static boolean noCopyDeps = false;
+
 
     @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;
@@ -119,10 +122,15 @@ private static void analyze() throws Exception {
         else {
             // download library dependencies of project for type resolution
             String dependencies = null;
-            if (BuildProject.downloadLibraryDependencies(input)) {
-                dependencies = String.valueOf(BuildProject.libDownloadPath);
+
+            if (!noCopyDeps) {
+                if (BuildProject.downloadLibraryDependencies(input)) {
+                    dependencies = String.valueOf(BuildProject.libDownloadPath);
+                } else {
+                    Log.warn("Failed to download library dependencies of project");
+                }
             } else {
-                Log.warn("Failed to download library dependencies of project");
+                Log.warn("--no-copy-dependencies is activated, skipping library dependencies download");
             }
             boolean analysisFileExists = output != null && Files.exists(Paths.get(output + File.separator + outputFileName));
 

src/main/java/com/ibm/cldk/utils/AnalysisUtils.java

@@ -86,10 +86,16 @@ public static Pair<String, Callable> createAndPutNewCallableInSymbolTable(IMetho
      * @return int Cyclomatic complexity for method/constructor
      */
     public static int getCyclomaticComplexity(IR ir) {
-        int branchCount = (int)Arrays.stream(ir.getInstructions())
-            .filter(inst -> inst instanceof SSAConditionalBranchInstruction)
-            .count();
-        return branchCount + 1;
+
+        try {
+            int branchCount = (int)Arrays.stream(ir.getInstructions())
+                    .filter(inst -> inst instanceof SSAConditionalBranchInstruction)
+                    .count();
+            return branchCount + 1;
+        } catch (NullPointerException nullPointerException) {
+            Log.error("Null pointer exception in getCyclomaticComplexity");
+            throw new RuntimeException("Could not get cyclomatic complexity.");
+        }
     }
 
     public static Pair<String, Callable> getCallableFromSymbolTable(IMethod method) {

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

@@ -16,7 +16,9 @@ public class BuildProject {
 
     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 MAVEN_CMD = System.getProperty("os.name").toLowerCase().contains("windows")
+            ? (new File("mvnw.cmd").exists() ? "mvnw.cmd" : "mvn.cmd")
+            : (new File("mvnw").exists() ? "mvnw" : "mvn");
     private static final String GRADLE_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "gradlew.bat" : "gradlew";
     public static Path  tempInitScript;
     static {

src/main/java/com/ibm/cldk/utils/ScopeUtils.java

@@ -75,6 +75,12 @@ public static AnalysisScope createScope(String projectPath, String applicationDe
         .map(path -> path.toAbsolutePath().toString())
         .toArray(String[]::new);
 
+    // Check if stdlibs is empty and throw an exception if true
+    if (stdlibs.length == 0) {
+      Log.error("jmods directory not found or no .jmod files present");
+      throw new RuntimeException("jmods directory not found or no .jmod files present");
+    }
+
     for (String stdlib : stdlibs) {
       scope.addToScope(ClassLoaderReference.Primordial, new JarFile(stdlib));
     }
@@ -106,7 +112,7 @@ public static AnalysisScope createScope(String projectPath, String applicationDe
 
     List<Path> applicationClassFiles = BuildProject.buildProjectAndStreamClassFiles(projectPath, build);
     Log.debug("Application class files: " + String.valueOf(applicationClassFiles.size()));
-    if (applicationClassFiles == null) {
+    if (applicationClassFiles.isEmpty()) {
       Log.error("No application classes found.");
       throw new RuntimeException("No application classes found.");
     }