diff --git a/cldk/analysis/java/codeanalyzer/codeanalyzer.py b/cldk/analysis/java/codeanalyzer/codeanalyzer.py
index 11f0143..ddc8608 100644
--- a/cldk/analysis/java/codeanalyzer/codeanalyzer.py
+++ b/cldk/analysis/java/codeanalyzer/codeanalyzer.py
@@ -1079,8 +1079,10 @@ def get_all_docstrings(self) -> List[Tuple[str, JComment]]:
         Returns:
             Dict[str, List[str]]: Dictionary of file paths and their corresponding docstrings.
         """
-        docstrings = []
+        docstrings = {}
         for file_path, list_of_comments in self.get_all_comments().items():
-            docstrings += [(file_path, docstring) for docstring in list_of_comments if docstring.is_javadoc]
+            javadoc_comments = [docstring for docstring in list_of_comments if docstring.is_javadoc]
+            if javadoc_comments:
+                docstrings[file_path] = javadoc_comments
 
-        return docstrings
+        return docstrings
\ No newline at end of file