Graph traversing fix value null

Goblin-Ecosystem · May 7, 2024 · 5079845 · 5079845
1 parent a3b4083
commit 5079845
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/cifre/sap/su/goblinWeaver/api/controllers/GraphController.java b/src/main/java/com/cifre/sap/su/goblinWeaver/api/controllers/GraphController.java
@@ -48,6 +48,7 @@ public JSONObject traversingGraph(@RequestBody GraphTraversingQuery graphTravers
             // (lib:a)-[versions]->(release:a1)-[:dependency]->(lib:b)-[versions]->(release:b1)
             for(String releaseGav : new HashSet<>(releasesToTreat)) {
                 InternGraph releaseGraph = GraphDatabaseSingleton.getInstance().getReleaseWithLibAndDependencies(releaseGav);
+                releaseGraph.clearValueNodes();
                 resultGraph.mergeGraph(releaseGraph);
                 visitedReleases.add(releaseGav);
                 releasesToTreat.addAll(releaseGraph.getGraphNodes().stream().filter(ReleaseNode.class::isInstance).map(NodeObject::getId).collect(Collectors.toSet()));
@@ -80,9 +81,6 @@ public JSONObject traversingGraph(@RequestBody GraphTraversingQuery graphTravers
             }
             releasesToTreat.removeAll(visitedReleases);
         }
-
-
-
         Weaver.weaveGraph(resultGraph, graphTraversingQuery.getAddedValues());
         return resultGraph.getJsonGraph();
     }

diff --git a/src/main/java/com/cifre/sap/su/goblinWeaver/graphEntities/InternGraph.java b/src/main/java/com/cifre/sap/su/goblinWeaver/graphEntities/InternGraph.java
@@ -10,7 +10,7 @@
 public class InternGraph {
     private final Set<NodeObject> graphNodes = new HashSet<>();
     private final Set<EdgeObject> graphEdges = new HashSet<>();
-    private final Set<ValueObject> graphValues = new HashSet<>();
+    private Set<ValueObject> graphValues = new HashSet<>();
 
     public InternGraph() {
     }
@@ -54,6 +54,10 @@ public void mergeGraph(InternGraph graph){
         this.graphValues.addAll(graph.getGraphValues());
     }
 
+    public void clearValueNodes(){
+        this.graphValues = new HashSet<>();
+    }
+
     private void addObjectsToJSONArray(Set<? extends GraphObject> objects, String key, JSONObject graphJSON) {
         if (!objects.isEmpty()) {
             JSONArray array = new JSONArray();