slim json

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

Author: rahlk

build.gradle

@@ -78,7 +78,7 @@ dependencies {
 
     implementation 'org.apache.logging.log4j:log4j-api:2.18.0'
     implementation 'org.apache.logging.log4j:log4j-core:2.18.0'
-    def walaVersion = '1.6.6'
+    def walaVersion = '1.6.7'
 
     compileOnly 'org.projectlombok:lombok:1.18.30'
     annotationProcessor 'org.projectlombok:lombok:1.18.30'

gradle.properties

@@ -1 +1 @@
-version=1.0.1
+version=1.1.0

src/main/java/com/ibm/cldk/SystemDependencyGraph.java

@@ -71,12 +71,13 @@ private static JSONExporter<Pair<String, Callable>, AbstractGraphEdge> getGraphE
         JSONExporter<Pair<String, Callable>, AbstractGraphEdge> exporter = new JSONExporter<>(
                 pair -> {
                     Map <String, String> vertex = new HashMap<>();
-                    vertex.put("class_interface_declarations", pair.getLeft());
-                    vertex.put("callable", gson.toJson(pair.getRight()));
+                    vertex.put("type_declaration", pair.getLeft());
+                    vertex.put("file_path", pair.getRight().getFilePath());
+                    vertex.put("signature", pair.getRight().getSignature());
+                    vertex.put("callable_declaration", pair.getRight().getDeclaration());
                     return gson.toJson(vertex);
                 }
         );
-//        exporter.setVertexAttributeProvider(v -> v.getRight().getAttributes());
         exporter.setEdgeAttributeProvider(AbstractGraphEdge::getAttributes);
         return exporter;
     }

src/main/java/com/ibm/cldk/entities/Callable.java

@@ -6,6 +6,7 @@
 
 @Data
 public class Callable {
+    private String filePath;
     private String signature;
     private String comment;
     private List<String> annotations;