Skip to content

feat: emit per-variable field initializers in field declarations #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sinha108 merged 1 commit into from
Jun 5, 2026
+45 −1
Merged

feat: emit per-variable field initializers in field declarations #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2.3.7
version=2.3.8
9 changes: 9 additions & 0 deletions src/main/java/com/ibm/cldk/SymbolTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,15 @@ private static Field processFieldDeclaration(FieldDeclaration fieldDecl) {
field.setVariables(
fieldDecl.getVariables().stream().map(v -> v.getName().asString()).collect(Collectors.toList()));

// add variable initializers, keyed per variable (one declaration may flatten multiple declarators)
field.setVariableInitializers(fieldDecl.getVariables().stream()
.filter(v -> v.getInitializer().isPresent())
.collect(Collectors.toMap(
v -> v.getName().asString(),
v -> v.getInitializer().get().toString(),
(a, b) -> a,
LinkedHashMap::new)));

// add field modifiers
field.setModifiers(
fieldDecl.getModifiers().stream().map(m -> m.toString().strip()).collect(Collectors.toList()));
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/ibm/cldk/entities/Field.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.ibm.cldk.entities;

import java.util.List;
import java.util.Map;
import lombok.Data;

@Data
Expand All @@ -13,4 +14,5 @@ public class Field {
private List<String> variables;
private List<String> modifiers;
private List<String> annotations;
private Map<String, String> variableInitializers;
}
33 changes: 33 additions & 0 deletions src/test/java/com/ibm/cldk/SymbolTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.google.gson.JsonParser;
import com.ibm.cldk.entities.CallSite;
import com.ibm.cldk.entities.Callable;
import com.ibm.cldk.entities.Field;
import com.ibm.cldk.entities.Import;
import com.ibm.cldk.entities.JavaCompilationUnit;
import com.ibm.cldk.entities.Type;
Expand Down Expand Up @@ -120,6 +121,38 @@ public void testExtractSingleImportMetadata() throws IOException {
}
}

@Test
public void testExtractSingleFieldInitializers() throws IOException {
String javaCode = String.join("\n",
"class T {",
" private static final String QUOTES_PATH = \"/rest/quotes\";",
" private int count;",
" private int first = 1, second, third = first + 2;",
"}");
Map<String, JavaCompilationUnit> symbolTable = SymbolTable.extractSingle(javaCode).getLeft();
Assertions.assertEquals(1, symbolTable.size());
List<Field> fields = symbolTable.values().iterator().next().getTypeDeclarations()
.values().iterator().next().getFieldDeclarations();
Assertions.assertEquals(3, fields.size());

Field quotesPath = fields.get(0);
Assertions.assertEquals(List.of("QUOTES_PATH"), quotesPath.getVariables());
Assertions.assertEquals(Map.of("QUOTES_PATH", "\"/rest/quotes\""), quotesPath.getVariableInitializers());

Field count = fields.get(1);
Assertions.assertEquals(List.of("count"), count.getVariables());
Assertions.assertTrue(count.getVariableInitializers().isEmpty());

Field multi = fields.get(2);
Assertions.assertEquals(List.of("first", "second", "third"), multi.getVariables());
Assertions.assertEquals(Map.of("first", "1", "third", "first + 2"), multi.getVariableInitializers());

JsonObject serializedField = JsonParser.parseString(CodeAnalyzer.gson.toJson(quotesPath)).getAsJsonObject();
Assertions.assertTrue(serializedField.has("variable_initializers"));
Assertions.assertEquals("\"/rest/quotes\"",
serializedField.getAsJsonObject("variable_initializers").get("QUOTES_PATH").getAsString());
}

private static void assertImport(List<Import> imports, String path, boolean isStatic, boolean isWildcard) {
Import matchingImport = imports.stream()
.filter(imp -> path.equals(imp.getPath())
Expand Down