Merge 1.X.X to 2.0 as new version 2.1.0

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: Codeanalyzer CI
 on:
   push:
     branches:
-      - main
+      - 1.X.X
 
 permissions:
   contents: write 
@@ -53,5 +53,6 @@ jobs:
         with:
           files: build/libs/*.jar
           tag_name: ${{ steps.newtag.outputs.tag }}
+          prerelease: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -29,6 +29,10 @@ repositories {
     mavenLocal()
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
 
 if (project.hasProperty('mainClass')) {
     mainClassName = project.getProperty('mainClass')
@@ -119,7 +123,25 @@ dependencies {
     implementation('org.jgrapht:jgrapht-ext:1.5.2')
     implementation('com.github.javaparser:javaparser-symbol-solver-core:3.25.9')
 
-    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
+    // TestContainers
+    testImplementation 'org.testcontainers:testcontainers:1.19.3'
+    testImplementation 'org.testcontainers:junit-jupiter:1.19.3'
+
+    // JUnit 5
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1'  // for @ParameterizedTest
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+
+    // SLF4J - for TestContainers logging
+    testImplementation 'org.slf4j:slf4j-api:2.0.9'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.9'
+
+}
+
+test {
+    useJUnitPlatform()
+    // Optional: Enable TestContainers reuse to speed up tests
+    systemProperty 'testcontainers.reuse.enable', 'true'
 }
 
 task fatJar(type: Jar) {

gradle.properties

@@ -1 +1,6 @@
-version=1.1.0
+<<<<<<< HEAD
+version=1.1.1
+
+=======
+version=1.1.0
+>>>>>>> 9792b653d3b4509e5b74120747e13e69417da994

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

@@ -19,8 +19,6 @@
 import com.ibm.cldk.entities.JavaCompilationUnit;
 import com.ibm.cldk.utils.BuildProject;
 import com.ibm.cldk.utils.Log;
-import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
-import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import org.apache.commons.lang3.tuple.Pair;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
@@ -40,7 +38,7 @@
 
 
 class VersionProvider implements CommandLine.IVersionProvider {
-    public String[] getVersion() throws Exception {
+    public String[] getVersion() {
         String version = getClass().getPackage().getImplementationVersion();
         return new String[]{ version != null ? version : "unknown" };
     }
@@ -69,13 +67,18 @@ 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 = {"-f", "--project-root-path"}, description = "Path to the root pom.xml/build.gradle file of the project.")
+    public static String projectRootPom;
 
     @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 = {"-v", "--verbose"}, description = "Print logs to console.")
     private static boolean verbose = false;
 
+    @Option(names = {"--no-clean-dependencies"}, description = "Do not attempt to auto-clean dependencies")
+    public static boolean noCleanDependencies = false;
+
     private static final String outputFileName = "analysis.json";
 
     public static Gson gson = new GsonBuilder()
@@ -108,22 +111,25 @@ private static void analyze() throws Exception {
 
         JsonObject combinedJsonObject = new JsonObject();
         Map<String, JavaCompilationUnit> symbolTable;
+        projectRootPom = projectRootPom == null ? input : projectRootPom;
         // First of all if, sourceAnalysis is provided, we will analyze the source code instead of the project.
         if (sourceAnalysis != null) {
             // Construct symbol table for source code
             Log.debug("Single file analysis.");
             Pair<Map<String, JavaCompilationUnit>, Map<String, List<Problem>>> symbolTableExtractionResult = SymbolTable.extractSingle(sourceAnalysis);
             symbolTable = symbolTableExtractionResult.getLeft();
-        }
-
-        else {
+        } else {
             // download library dependencies of project for type resolution
             String dependencies = null;
-            if (BuildProject.downloadLibraryDependencies(input)) {
+            try {if (BuildProject.downloadLibraryDependencies(input, projectRootPom)) {
                 dependencies = String.valueOf(BuildProject.libDownloadPath);
             } else {
                 Log.warn("Failed to download library dependencies of project");
             }
+            } catch (IllegalStateException illegalStateException) {
+                Log.warn("Failed to download library dependencies of project");
+            }
+
             boolean analysisFileExists = output != null && Files.exists(Paths.get(output + File.separator + outputFileName));
 
             // if target files are specified, compute symbol table information for the given files

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

@@ -10,7 +10,7 @@
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.nodeTypes.NodeWithName;
-import com.github.javaparser.ast.stmt.BlockStmt;
+import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration;
@@ -276,7 +276,9 @@ private static Pair<String, Callable> processCallableDeclaration(CallableDeclara
 
         // add the complete declaration string, including modifiers, throws, and
         // parameter names
-        callableNode.setDeclaration(callableDecl.getDeclarationAsString(true, true, true).strip());
+        callableNode.setDeclaration(callableDecl
+                .getDeclarationAsString(true, true, true)
+                .strip().replaceAll("//.*\n", ""));
 
         // add information about callable parameters: for each parameter, type, name,
         // annotations,
@@ -304,11 +306,32 @@ private static Pair<String, Callable> processCallableDeclaration(CallableDeclara
         callableNode.setAccessedFields(getAccessedFields(body, classFields, typeName));
         callableNode.setCallSites(getCallSites(body));
         callableNode.setVariableDeclarations(getVariableDeclarations(body));
+        callableNode.setCyclomaticComplexity(getCyclomaticComplexity(callableDecl));
 
         String callableSignature = (callableDecl instanceof MethodDeclaration) ? callableDecl.getSignature().asString() : callableDecl.getSignature().asString().replace(callableDecl.getSignature().getName(), "<init>");
         return Pair.of(callableSignature, callableNode);
     }
 
+    /**
+     * Computes cyclomatic complexity for the given callable.
+     *
+     * @param callableDeclaration Callable to compute cyclomatic complexity for
+     * @return cyclomatic complexity
+     */
+    private static int getCyclomaticComplexity(CallableDeclaration callableDeclaration) {
+        int ifStmtCount = callableDeclaration.findAll(IfStmt.class).size();
+        int loopStmtCount = callableDeclaration.findAll(DoStmt.class).size() +
+            callableDeclaration.findAll(ForStmt.class).size() +
+                callableDeclaration.findAll(ForEachStmt.class).size() +
+                callableDeclaration.findAll(WhileStmt.class).size();
+        int switchCaseCount = callableDeclaration.findAll(SwitchStmt.class).stream()
+                .map(stmt -> stmt.getEntries().size())
+                .reduce(0, Integer::sum);
+        int conditionalExprCount = callableDeclaration.findAll(ConditionalExpr.class).size();
+        int catchClauseCount = callableDeclaration.findAll(CatchClause.class).size();
+        return ifStmtCount + loopStmtCount + switchCaseCount + conditionalExprCount + catchClauseCount + 1;
+    }
+
     /**
      * Processes the given field declaration to extract information about the
      * declared field and

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

@@ -240,7 +240,7 @@ public static List<Dependency> construct(
 
         // Initialize scope
         AnalysisScope scope = ScopeUtils.createScope(input, dependencies, build);
-        IClassHierarchy cha = ClassHierarchyFactory.make(scope,
+        IClassHierarchy cha = ClassHierarchyFactory.makeWithRoot(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/cldk/utils/AnalysisUtils.java

@@ -24,7 +24,9 @@
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAConditionalBranchInstruction;
+import com.ibm.wala.ssa.SSASwitchInstruction;
 import com.ibm.wala.types.ClassLoaderReference;
 
 import java.util.*;
@@ -99,10 +101,20 @@ public static Map<String, String> createAndPutNewCallableInSymbolTable(IMethod m
      * @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;
+        if (ir == null) {
+            return 0;
+        }
+        int conditionalBranchCount = (int) Arrays.stream(ir.getInstructions())
+                .filter(inst -> inst instanceof SSAConditionalBranchInstruction)
+                .count();
+        int switchBranchCount = Arrays.stream(ir.getInstructions())
+                .filter(inst -> inst instanceof SSASwitchInstruction)
+                .map(inst -> ((SSASwitchInstruction) inst).getCasesAndLabels().length).reduce(0, Integer::sum);
+        Iterable<ISSABasicBlock> iterableBasicBlocks = ir::getBlocks;
+        int catchBlockCount = (int) StreamSupport.stream(iterableBasicBlocks.spliterator(), false)
+                .filter(ISSABasicBlock::isCatchBlock)
+                .count();
+        return conditionalBranchCount + switchBranchCount + catchBlockCount + 1;
     }
 
     public static void setCyclomaticComplexity(CallGraph callGraph) {