Issue #109. Added a new field to the Callable object to now track all the crud operations and queries that occur in it as an array list. Also updated the test case to capture this.

rahlk · rahlk · commit 2907fecbcf5e · 2025-02-08T11:59:13.000-05:00
Signed-off-by: Rahul Krishna &lt;i.m.ralk@gmail.com&gt;
diff --git a/src/main/java/com/ibm/cldk/SymbolTable.java b/src/main/java/com/ibm/cldk/SymbolTable.java
@@ -418,6 +418,12 @@ private static Pair<String, Callable> processCallableDeclaration(CallableDeclara
                         .filter(Objects::nonNull)
                         .collect(Collectors.toList())
         );
+        callableNode.setCrudQueries(
+                callableNode.getCallSites().stream()
+                        .map(CallSite::getCrudQuery)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList())
+        );
         callableNode.setVariableDeclarations(getVariableDeclarations(body));
         callableNode.setCyclomaticComplexity(getCyclomaticComplexity(callableDecl));
 
@@ -697,20 +703,22 @@ private static List<CallSite> getCallSites(Optional<BlockStmt> callableBody) {
             // Get argument string from the callsite
             List<String> listOfArgumentStrings = methodCallExpr.getArguments().stream().map(Expression::toString).collect(Collectors.toList());
             // Determine if this call site is potentially a CRUD operation.
-            CRUDOperation crudOperation = new CRUDOperation();
+            CRUDOperation crudOperation = null;
             Optional<CRUDOperationType> crudOperationType = findCRUDOperation(declaringType, methodCallExpr.getNameAsString());
             if (crudOperationType.isPresent()) {
                 // We found a CRUD operation, so we need to populate the details of the call site this CRUD operation.
                 int lineNumber = methodCallExpr.getRange().isPresent() ? methodCallExpr.getRange().get().begin.line : -1;
+                crudOperation = new CRUDOperation();
                 crudOperation.setLineNumber(lineNumber);
                 crudOperation.setOperationType(crudOperationType.get());
             }
             // Determine if this call site is potentially a CRUD query.
-            CRUDQuery crudQuery = new CRUDQuery();
+            CRUDQuery crudQuery = null;
             Optional<CRUDQueryType> crudQueryType = findCRUDQuery(declaringType, methodCallExpr.getNameAsString(), Optional.of(listOfArgumentStrings));
             if (crudQueryType.isPresent()) {
                 // We found a CRUD query, so we need to populate the details of the call site this CRUD query.
                 int lineNumber = methodCallExpr.getRange().isPresent() ? methodCallExpr.getRange().get().begin.line : -1;
+                crudQuery = new CRUDQuery();
                 crudQuery.setLineNumber(lineNumber);
                 crudQuery.setQueryType(crudQueryType.get());
                 crudQuery.setQueryArguments(listOfArgumentStrings);
diff --git a/src/main/java/com/ibm/cldk/entities/Callable.java b/src/main/java/com/ibm/cldk/entities/Callable.java
@@ -26,6 +26,7 @@ public class Callable {
     private List<CallSite> callSites;
     private List<VariableDeclaration> variableDeclarations;
     private List<CRUDOperation> crudOperations = new ArrayList<>();
+    private List<CRUDQuery> crudQueries = new ArrayList<>();
     private int cyclomaticComplexity;
     private boolean isEntrypoint = false;
 }
diff --git a/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java b/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java
@@ -15,6 +15,7 @@
 import java.nio.file.Paths;
 import java.util.Properties;
 
+
 @Testcontainers
 @SuppressWarnings("resource")
 public class CodeAnalyzerIntegrationTest {
@@ -165,9 +166,32 @@ void shouldBeAbleToDetectCRUDOperationsAndQueriesForPlantByWebsphere() throws Ex
                 "--input=/test-applications/plantsbywebsphere",
                 "--analysis-level=1", "--verbose"
         );
-        Assertions.assertTrue(runCodeAnalyzerOnPlantsByWebsphere.getStdout().contains("\"query_type\": \"NAMED\""), "No entry point classes found");
-        Assertions.assertTrue(runCodeAnalyzerOnPlantsByWebsphere.getStdout().contains("\"operation_type\": \"READ\""), "No entry point methods found");
-        Assertions.assertTrue(runCodeAnalyzerOnPlantsByWebsphere.getStdout().contains("\"operation_type\": \"UPDATE\""), "No entry point methods found");
-        Assertions.assertTrue(runCodeAnalyzerOnPlantsByWebsphere.getStdout().contains("\"operation_type\": \"CREATE\""), "No entry point methods found");
+
+        String output = runCodeAnalyzerOnPlantsByWebsphere.getStdout();
+
+        Assertions.assertTrue(output.contains("\"query_type\": \"NAMED\""), "No entry point classes found");
+        Assertions.assertTrue(output.contains("\"operation_type\": \"READ\""), "No entry point methods found");
+        Assertions.assertTrue(output.contains("\"operation_type\": \"UPDATE\""), "No entry point methods found");
+        Assertions.assertTrue(output.contains("\"operation_type\": \"CREATE\""), "No entry point methods found");
+
+        // Convert the expected JSON structure into a string
+        String expectedCrudOperation =
+                "\"crud_operations\": [" +
+                        "{" +
+                            "\"line_number\": 115," +
+                            "\"operation_type\": \"READ\"," +
+                            "\"target_table\": null," +
+                            "\"involved_fields\": null," +
+                            "\"condition\": null," +
+                            "\"joined_tables\": null," +
+                            "\"technology\": null," +
+                            "\"is_batch_operation\": false" +
+                        "}]";
+
+        // Remove whitespace and newlines for a more robust comparison
+        String normalizedOutput = output.replaceAll("\\s+", "");
+        String normalizedExpectedCrudOperation = expectedCrudOperation.replaceAll("\\s+", "");
+
+        Assertions.assertTrue(normalizedOutput.contains(normalizedExpectedCrudOperation), "Expected CRUD operation JSON structure not found");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public class Callable {`
`26`	`26`	`private List<CallSite> callSites;`
`27`	`27`	`private List<VariableDeclaration> variableDeclarations;`
`28`	`28`	`private List<CRUDOperation> crudOperations = new ArrayList<>();`
	`29`	`+ private List<CRUDQuery> crudQueries = new ArrayList<>();`
`29`	`30`	`private int cyclomaticComplexity;`
`30`	`31`	`private boolean isEntrypoint = false;`
`31`	`32`	`}`