Merge pull request #157 from tylerstennett/feat/jfield-variable-initializers

feat: add per-variable field initializers from codeanalyzer 2.3.8

Author: sinha108

…/codeanalyzer/jar/codeanalyzer-2.3.7.jar …/codeanalyzer/jar/codeanalyzer-2.3.8.jarcldk/analysis/java/codeanalyzer/jar/codeanalyzer-2.3.7.jar renamed to cldk/analysis/java/codeanalyzer/jar/codeanalyzer-2.3.8.jar cldk/analysis/java/codeanalyzer/jar/codeanalyzer-2.3.7.jar renamed to cldk/analysis/java/codeanalyzer/jar/codeanalyzer-2.3.8.jar

@@ -39,7 +39,9 @@
     - :mod:`~cldk.models.java.enums`: Related enumeration types.
 """
 from typing import Any, Dict, List, Optional, Union
+
 from pydantic import BaseModel, Field, field_validator, model_validator
+
 from cldk.models.java.enums import CRUDOperationType, CRUDQueryType
 
 _CALLABLES_LOOKUP_TABLE = dict()
@@ -111,6 +113,8 @@ class JField(BaseModel):
         variables (List[str]): The variables declared in the field.
         modifiers (List[str]): The modifiers applied to the field (e.g., public, static).
         annotations (List[str]): The annotations applied to the field.
+        variable_initializers (Dict[str, str] | None): Initializer expression text keyed by
+            variable name. None is used as the default for backwards compatibility.
     """
 
     comment: JComment | None
@@ -120,6 +124,7 @@ class JField(BaseModel):
     variables: List[str]
     modifiers: List[str]
     annotations: List[str]
+    variable_initializers: Dict[str, str] | None = None
 
 
 class JCallableParameter(BaseModel):

cldk/models/java/models.py

@@ -83,7 +83,7 @@ include = [
 ]
 
 [tool.backend-versions]
-codeanalyzer-java = "2.3.7"
+codeanalyzer-java = "2.3.8"
 codeanalyzer-python = "0.1.14"
 
 ########################################

pyproject.toml

@@ -682,6 +682,26 @@ def test_get_fields(test_fixture, analysis_json):
         assert len(fields) == 8
         for field in fields:
             assert isinstance(field, JField)
+            # Analyses generated by codeanalyzer < 2.3.8 lack variable_initializers
+            assert field.variable_initializers is None
+
+
+def test_get_fields_variable_initializers(java_code):
+    """Should return per-variable initializer text for fields"""
+
+    cldk = CLDK(language="java")
+    analysis = cldk.analysis(
+        source_code=java_code,
+        analysis_backend_path=None,
+        eager=True,
+        analysis_level=AnalysisLevel.symbol_table,
+    )
+
+    fields = analysis.get_fields("com.acme.modres.WeatherServlet")
+    by_variable = {variable: field for field in fields for variable in field.variables}
+    assert by_variable["serialVersionUID"].variable_initializers == {"serialVersionUID": "1L"}
+    assert by_variable["WEATHER_API_KEY"].variable_initializers == {"WEATHER_API_KEY": '"WEATHER_API_KEY"'}
+    assert by_variable["customerInfo"].variable_initializers == {}
 
 
 def test_get_nested_classes(test_fixture, analysis_json):