Support optional fields in JType to accept null values.

Signed-off-by: Rahul Krishna <i.m.ralk@gmail.com>

Author: rahlk

cldk/analysis/java/codeanalyzer/codeanalyzer.py

@@ -160,6 +160,9 @@ def _init_japplication(data: str) -> JApplication:
         JApplication
             The application view of the Java code with the analysis results.
         """
+        # from ipdb import set_trace
+
+        # set_trace()
         return JApplication(**json.loads(data))
 
     def _init_codeanalyzer(self, analysis_level=1) -> JApplication:
@@ -231,7 +234,7 @@ def _init_codeanalyzer(self, analysis_level=1) -> JApplication:
                     raise CodeanalyzerExecutionException(str(e)) from e
             with open(analysis_json_path_file) as f:
                 data = json.load(f)
-                return JApplication(**data)
+                return self._init_japplication(json.dumps(data))
 
     def _codeanalyzer_single_file(self) -> JApplication:
         """Invokes codeanalyzer in a single file mode.

cldk/models/java/models.py

@@ -260,13 +260,13 @@ class JType(BaseModel):
     is_concrete_class: bool = False
     is_entry_point: bool = False
     comment: str
-    extends_list: List[str] = []
-    implements_list: List[str] = []
-    modifiers: List[str] = []
-    annotations: List[str] = []
+    extends_list: List[str] | None = []
+    implements_list: List[str] | None = []
+    modifiers: List[str] | None = []
+    annotations: List[str] | None = []
     parent_type: str
     is_entrypoint_class: bool = False
-    nested_type_declerations: List[str] = []
+    nested_type_declerations: List[str] | None = []
     callable_declarations: Dict[str, JCallable] = {}
     field_declarations: List[JField] = []
     enum_constants: List[JEnumConstant] | None = []
@@ -359,6 +359,8 @@ def validate_source(cls, value) -> JMethodDetail:
                 accessed_fields=[],
                 call_sites=[],
                 variable_declarations=[],
+                crud_operations=[],
+                crud_queries=[],
                 cyclomatic_complexity=0,
             ),
         )

tests/analysis/java/test_jcodeanalyzer.py

@@ -20,6 +20,7 @@
 
 import os
 import json
+from pdb import set_trace
 from typing import Dict, List, Tuple
 from unittest.mock import patch, MagicMock
 import networkx as nx
@@ -992,3 +993,28 @@ def test_get_all_get_crud_delete_operations(test_fixture_pbw, codeanalyzer_jar_p
             assert isinstance(crud_op, JCRUDOperation)
             assert crud_op.line_number > 0
             assert crud_op.operation_type.value == "DELETE"
+
+
+def test_get_all_get_crud_operations_daytrader8(test_fixture, codeanalyzer_jar_path):
+    """It should return all of the CRUD operations in an application"""
+    code_analyzer = JCodeanalyzer(
+        project_dir=test_fixture,
+        source_code=None,
+        analysis_backend_path=codeanalyzer_jar_path,
+        analysis_json_path=test_fixture / "build",
+        analysis_level=AnalysisLevel.symbol_table,
+        use_graalvm_binary=False,
+        eager_analysis=True,
+        target_files=None,
+    )
+    crud_operations = code_analyzer.get_all_crud_operations()
+    assert crud_operations is not None
+    for operation in crud_operations:
+        assert operation is not None
+        assert isinstance(operation, Dict)
+        assert isinstance(operation["crud_operations"], list)
+        for crud_op in operation["crud_operations"]:
+            assert crud_op is not None
+            assert isinstance(crud_op, JCRUDOperation)
+            assert crud_op.line_number > 0
+            assert crud_op.operation_type.value in ["CREATE", "READ", "UPDATE", "DELETE"]