Update codeanalyzer jar

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

Author: rahlk

cldk/analysis/commons/treesitter/treesitter_java.py

@@ -103,8 +103,8 @@ def get_all_imports(self, source_code: str) -> Set[str]:
         Returns:
             Set[str]: A set of all the imports in the class.
         """
-        import_declerations: Captures = self.frame_query_and_capture_output(query="(import_declaration (scoped_identifier) @name)", code_to_process=source_code)
-        return {capture.node.text.decode() for capture in import_declerations}
+        import_declarations: Captures = self.frame_query_and_capture_output(query="(import_declaration (scoped_identifier) @name)", code_to_process=source_code)
+        return {capture.node.text.decode() for capture in import_declarations}
 
     # TODO: This typo needs to be fixed (i.e., package not pacakge)
     def get_pacakge_name(self, source_code: str) -> str:

cldk/analysis/java/codeanalyzer/codeanalyzer.py

@@ -592,7 +592,7 @@ def get_all_nested_classes(self, qualified_class_name) -> List[JType]:
         if ci is None:
             logging.warning(f"Class {qualified_class_name} not found in the application view.")
             return list()
-        nested_classes = ci.nested_type_declerations
+        nested_classes = ci.nested_type_declarations
         return [self.get_class(c) for c in nested_classes]  # Assuming qualified nested class names
 
     def get_extended_classes(self, qualified_class_name) -> List[str]:
@@ -1052,4 +1052,4 @@ def get_all_docstrings(self) -> List[Tuple[str, JComment]]:
             if javadoc_comments:
                 docstrings[file_path] = javadoc_comments
 
-        return docstrings
+        return docstrings

cldk/analysis/java/codeanalyzer/jar/codeanalyzer-2.3.1.jar renamed to cldk/analysis/java/codeanalyzer/jar/codeanalyzer-2.3.3.jar

@@ -350,7 +350,7 @@ class JType(BaseModel):
     modifiers: List[str] | None = []
     annotations: List[str] | None = []
     parent_type: str
-    nested_type_declerations: List[str] | None = []
+    nested_type_declarations: List[str] | None = []
     callable_declarations: Dict[str, JCallable] = {}
     field_declarations: List[JField] = []
     enum_constants: List[JEnumConstant] | None = []
@@ -427,7 +427,7 @@ class JGraphEdges(BaseModel):
     @classmethod
     def validate_source(cls, value) -> JMethodDetail:
         _, type_declaration, signature = value["file_path"], value["type_declaration"], value["signature"]
-        j_callable = _CALLABLES_LOOKUP_TABLE.get(
+        j_callable: JCallable = _CALLABLES_LOOKUP_TABLE.get(
             (type_declaration, signature),
             JCallable(
                 comments=[],

cldk/models/java/models.py

@@ -29,6 +29,7 @@ class PyArg(BaseModel):
 
 class PyImport(BaseModel):
     from_statement: str
+    # code_body: str
     imports: List[str]
 
 

cldk/models/python/models.py

@@ -86,11 +86,11 @@ def remove_unused_imports(self, sanitized_code: str) -> str:
         + Finally, remove all the unused imports from the source code and prettify it.
         """
         pruned_source_code: str = deepcopy(sanitized_code)
-        import_declerations: Captures = self.__javasitter.frame_query_and_capture_output(query="((import_declaration) @imports)", code_to_process=self.source_code)
+        import_declarations: Captures = self.__javasitter.frame_query_and_capture_output(query="((import_declaration) @imports)", code_to_process=self.source_code)
 
         unused_imports: Set = set()
         ids_and_typeids: Set = set()
-        class_bodies: Captures = self.__javasitter.frame_query_and_capture_output(query="((class_declaration) @class_decleration)", code_to_process=self.source_code)
+        class_bodies: Captures = self.__javasitter.frame_query_and_capture_output(query="((class_declaration) @class_declaration)", code_to_process=self.source_code)
         for class_body in class_bodies:
             all_type_identifiers_in_class: Captures = self.__javasitter.frame_query_and_capture_output(
                 query="((type_identifier) @type_id)",
@@ -103,17 +103,17 @@ def remove_unused_imports(self, sanitized_code: str) -> str:
             ids_and_typeids.update({type_id.node.text.decode() for type_id in all_type_identifiers_in_class})
             ids_and_typeids.update({other_id.node.text.decode() for other_id in all_other_identifiers_in_class})
 
-        for import_decleration in import_declerations:
-            wildcard_import: Captures = self.__javasitter.frame_query_and_capture_output(query="((asterisk) @wildcard)", code_to_process=import_decleration.node.text.decode())
+        for import_declaration in import_declarations:
+            wildcard_import: Captures = self.__javasitter.frame_query_and_capture_output(query="((asterisk) @wildcard)", code_to_process=import_declaration.node.text.decode())
             if len(wildcard_import) > 0:
                 continue
 
             import_statement: Captures = self.__javasitter.frame_query_and_capture_output(
-                query="((scoped_identifier) @scoped_identifier)", code_to_process=import_decleration.node.text.decode()
+                query="((scoped_identifier) @scoped_identifier)", code_to_process=import_declaration.node.text.decode()
             )
             import_str = import_statement.captures[0].node.text.decode()
             if not import_str.split(".")[-1] in ids_and_typeids:
-                unused_imports.add(import_decleration.node.text.decode())
+                unused_imports.add(import_declaration.node.text.decode())
 
         for unused_import in unused_imports:
             pruned_source_code = pruned_source_code.replace(unused_import, "")