slim json

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

Author: rahlk

cldk/analysis/analysis_level.py

@@ -24,7 +24,7 @@
 class AnalysisLevel(str, Enum):
     """Analysis levels"""
 
-    symbol_table = "symbol-table"
-    call_graph = "call-graph"
-    program_dependency_graph = "program-dependency-graph"
-    system_dependency_graph = "system-dependency-graph"
+    symbol_table = "symbol table"
+    call_graph = "call graph"
+    program_dependency_graph = "program dependency graph"
+    system_dependency_graph = "system dependency graph"

cldk/models/java/models.py

@@ -360,9 +360,10 @@ class JGraphEdges(BaseModel):
     @field_validator("source", "target", mode="before")
     @classmethod
     def validate_source(cls, value) -> JMethodDetail:
-        file_path, type_declaration, signature = value["file_path"], value["type_declaration"], value["signature"]
-        if file_path == "":
-            j_callable = JCallable(
+        _, type_declaration, signature = value["file_path"], value["type_declaration"], value["signature"]
+        j_callable = _CALLABLES_LOOKUP_TABLE.get(
+            (type_declaration, signature),
+            JCallable(
                 signature=signature,
                 is_implicit=True,
                 is_constructor="<init>" in value["callable_declaration"],
@@ -380,11 +381,9 @@ def validate_source(cls, value) -> JMethodDetail:
                 call_sites=[],
                 variable_declarations=[],
                 cyclomatic_complexity=0,
-            )
-        else:
-            j_callable = _CALLABLES_LOOKUP_TABLE.get((type_declaration, signature), None)
-            if j_callable is None:
-                raise ValueError(f"Callable not found in lookup table: {file_path}, {type_declaration}, {signature}")
+            ),
+        )
+        _CALLABLES_LOOKUP_TABLE[(type_declaration, signature)] = j_callable
         class_name = type_declaration
         method_decl = j_callable.declaration
         return JMethodDetail(method_declaration=method_decl, klass=class_name, method=j_callable)

tests/analysis/java/test_java.py

@@ -13,90 +13,38 @@
 from urllib.request import urlretrieve
 
 
-@pytest.fixture(scope="session", autouse=True)
-def test_fixture(application: str = ''):
-    """
-    Returns the path to the test data directory.
-
-    Yields:
-        Path : The path to the test data directory.
-    """
-    # ----------------------------------[ SETUP ]----------------------------------
-    # Path to your pyproject.toml
-    pyproject_path = Path(__file__).parent.parent.parent.parent / "pyproject.toml"
-
-    # Load the configuration
-    config = toml.load(pyproject_path)
-
-    # Access the test data path
-    test_data_path = config["tool"]["cldk"]["testing"]["sample-application"]
-
-    if not Path(__file__).parent.parent.parent.parent.joinpath(test_data_path).exists():
-        Path(test_data_path).mkdir(parents=True)
-    if application == "daytrader":
-        url = "https://github.com/OpenLiberty/sample.daytrader8/archive/refs/tags/v1.2.zip"
-        filename = Path(test_data_path).absolute() / "v1.2.zip"
-    elif application == "CLI" or application == "":
-        url = "https://github.com/apache/commons-cli/archive/refs/tags/commons-cli-1.8.0-RC2.zip"
-        filename = Path(__file__).parent.parent.parent.parent.joinpath(test_data_path).joinpath("commons-cli-1.8.0-RC2.zip")
-    urlretrieve(url, filename)
-
-    # Extract the zip file to the test data path
-    with zipfile.ZipFile(filename, "r") as zip_ref:
-        zip_ref.extractall(Path(__file__).parent.parent.parent.parent.joinpath(test_data_path))
-
-    # Remove the zip file
-    filename.unlink()
-    # --------------------------------------------------------------------------------
-    if application == "daytrader":
-        # Daytrader8 sample application path
-        yield Path(Path(__file__).parent.parent.parent.parent.joinpath(test_data_path)) / "sample.daytrader8-1.2"
-    else:
-        yield Path(Path(__file__).parent.parent.parent.parent.joinpath(test_data_path)) / "commons-cli-commons-cli-1.8.0-RC2"
-
-    # -----------------------------------[ TEARDOWN ]----------------------------------
-    # Remove the daytrader8 sample application that was downloaded for testing
-    for directory in Path(test_data_path).iterdir():
-        if directory.exists() and directory.is_dir():
-            shutil.rmtree(directory)
-    # ---------------------------------------------------------------------------------
-
-
-@pytest.mark.parametrize('test_fixture', ['daytrader'], indirect=['test_fixture'])
-def test_get_class_call_graph(test_fixture):
+# @pytest.mark.parametrize("test_fixture", ["daytrader"], indirect=["test_fixture"])
+def test_get_class_call_graph(test_fixture, codeanalyzer_jar_path):
     # Initialize the CLDK object with the project directory, language, and analysis_backend.
     cldk = CLDK(language="java")
 
     analysis = cldk.analysis(
         project_path=test_fixture,
         analysis_backend="codeanalyzer",
-        analysis_json_path="../../../tests/resources/java/analysis_db",
+        analysis_backend_path=codeanalyzer_jar_path,
         eager=True,
-        analysis_level=AnalysisLevel.call_graph
+        analysis_level=AnalysisLevel.call_graph,
     )
     class_call_graph: List[Tuple[JMethodDetail, JMethodDetail]] = analysis.get_class_call_graph(
         qualified_class_name="com.ibm.websphere.samples.daytrader.impl.direct.TradeDirectDBUtils"
     )
-
     assert class_call_graph is not None
 
 
-@pytest.mark.parametrize('test_fixture', ['CLI'], indirect=['test_fixture'])
-def test_get_class_call_graph_using_symbol_table(test_fixture):
-    # Initialize the CLDK object with the project directory, language, and analysis_backend.
-    cldk = CLDK(language="java")
+# @pytest.mark.parametrize("test_fixture", ["CLI"], indirect=["test_fixture"])
+# def test_get_class_call_graph_using_symbol_table(test_fixture):
+#     # Initialize the CLDK object with the project directory, language, and analysis_backend.
+#     cldk = CLDK(language="java")
 
-    analysis = cldk.analysis(
-        project_path=test_fixture,
-        analysis_backend="codeanalyzer",
-        analysis_json_path="../../../tests/resources/java/analysis_db",
-        eager=False,
-        analysis_level=AnalysisLevel.symbol_table
-    )
-    class_call_graph: List[Tuple[JMethodDetail, JMethodDetail]] = analysis.get_class_call_graph(
-        qualified_class_name="org.apache.commons.cli.DefaultParser",
-        method_signature="handleConcatenatedOptions(String)",
-        using_symbol_table=True
-    )
+#     analysis = cldk.analysis(
+#         project_path=test_fixture,
+#         analysis_backend="codeanalyzer",
+#         analysis_json_path="../../../tests/resources/java/analysis_db",
+#         eager=False,
+#         analysis_level=AnalysisLevel.symbol_table,
+#     )
+#     class_call_graph: List[Tuple[JMethodDetail, JMethodDetail]] = analysis.get_class_call_graph(
+#         qualified_class_name="org.apache.commons.cli.DefaultParser", method_signature="handleConcatenatedOptions(String)", using_symbol_table=True
+#     )
 
-    assert class_call_graph is not None
+#     assert class_call_graph is not None

tests/test_core.py

@@ -1,17 +1,3 @@
-# def test_specifiy_codeanalyzer_analysis_backend_manually(test_fixture):
-#     # Initialize the CLDK object with the project directory, language, and analysis_backend.
-#     ns = CLDK(
-#         project_dir=test_fixture[0],
-#         language="java",
-#         analysis_backend="codeanalyzer",
-#         analysis_backend_path=test_fixture[1],
-#         analysis_json_path="/tmp",
-#         sdg=True,
-#         use_graalvm_binary=False,
-#         eager=False,
-#     )
-#     assert ns.preprocessing.get_all_classes() is not None
-
 # def test_specifiy_codeanalyzer_backend_manually(test_fixture):
 #     # Initialize the CLDK object with the project directory, language, and backend.
 #     ns = CLDK(