fixed: repeating an import adds the nodes and edges from the last imp…

…ort to the new one
bigbasti · Mar 9, 2018 · 6a01897 · 6a01897
1 parent aa4c45c
commit 6a01897
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/coria-import-caida/src/main/java/com/bigbasti/coria/aslinks/ASLinksEdgeImporter.java b/coria-import-caida/src/main/java/com/bigbasti/coria/aslinks/ASLinksEdgeImporter.java
@@ -64,8 +64,8 @@ public void parseInformation(Object data, Map<String, Object> params) throws For
 
         logger.debug("data format accepted - begin parsing");
 
-        this.importedNodes = new ArrayList<>();
-        this.importedEdges = new ArrayList<>();
+        cleanSession();
+
         parseAsLinks(strData);
 
         logger.debug("parsing finished, parsed " + importedEdges.size() + " edges");
@@ -148,6 +148,11 @@ public ImportType getImportType() {
         return ImportType.NODES_AND_EDGES;
     }
 
+    private void cleanSession(){
+        this.importedEdges = new ArrayList<>();
+        this.importedNodes = new ArrayList<>();
+    }
+
     @Override
     public String toString() {
         return "ASLinksEdgeImporter{" +

diff --git a/...-import-caida/src/main/java/com/bigbasti/coria/aslinks/ASLinksEdgeResolveGeoImporter.java b/...-import-caida/src/main/java/com/bigbasti/coria/aslinks/ASLinksEdgeResolveGeoImporter.java
@@ -89,6 +89,8 @@ public Map<String, String> getAdditionalFields() {
     public void parseInformation(Object data, Map<String, Object> params) throws FormatNotSupportedException {
         logger.debug("starting import of data");
 
+        cleanSession();
+
         checkIfAdditionalParamsSadisfied(params);
 
         String strData = "";
@@ -355,6 +357,11 @@ private String getStringFromData(Object data) throws FormatNotSupportedException
         return strData;
     }
 
+    private void cleanSession(){
+        this.importedEdges = new ArrayList<>();
+        this.importedNodes = new ArrayList<>();
+    }
+
     @Override
     public String toString() {
         return "ASLinksEdgeResolveGeoImporter{" +

diff --git a/coria-import-caida/src/main/java/com/bigbasti/coria/aslinks/ASLinksEdgeResolveImporter.java b/coria-import-caida/src/main/java/com/bigbasti/coria/aslinks/ASLinksEdgeResolveImporter.java
@@ -89,6 +89,7 @@ public ImportType getImportType() {
 
     public void parseInformation(Object data, Map<String, Object> params) throws FormatNotSupportedException {
         logger.debug("starting import of data");
+        cleanSession();
         checkIfAdditionalParamsSadisfied(params);
 
         String strData = "";
@@ -230,6 +231,11 @@ private String getStringFromData(Object data) throws FormatNotSupportedException
         return strData;
     }
 
+    private void cleanSession(){
+        this.importedEdges = new ArrayList<>();
+        this.importedNodes = new ArrayList<>();
+    }
+
     @Override
     public String toString() {
         return "ASLinksEdgeResolveImporter{" +

diff --git a/coria-import-misc/src/main/java/com/bigbasti/coria/misc/CoriaDataSetImporter.java b/coria-import-misc/src/main/java/com/bigbasti/coria/misc/CoriaDataSetImporter.java
@@ -74,6 +74,8 @@ public ImportType getImportType() {
     public void parseInformation(Object data, Map<String, Object> params) throws FormatNotSupportedException {
         logger.debug("starting import of data");
 
+        cleanSession();
+
         String strData = getStringFromData(data);
 
         logger.debug("data format accepted - begin parsing");
@@ -127,6 +129,11 @@ private String getStringFromData(Object data) throws FormatNotSupportedException
         return strData;
     }
 
+    private void cleanSession(){
+        this.importedEdges = new ArrayList<>();
+        this.importedNodes = new ArrayList<>();
+    }
+
     @Override
     public String toString() {
         return "CoriaDataSetImporter{" +

diff --git a/coria-import-misc/src/main/java/com/bigbasti/coria/misc/StandardTabImporter.java b/coria-import-misc/src/main/java/com/bigbasti/coria/misc/StandardTabImporter.java
@@ -78,6 +78,7 @@ public ImportType getImportType() {
 
     public void parseInformation(Object data, Map<String, Object> params) throws FormatNotSupportedException {
         logger.debug("starting import of data");
+        cleanSession();
 
         String strData = getStringFromData(data);
 
@@ -145,6 +146,11 @@ private String getStringFromData(Object data) throws FormatNotSupportedException
         return strData;
     }
 
+    private void cleanSession(){
+        this.importedEdges = new ArrayList<>();
+        this.importedNodes = new ArrayList<>();
+    }
+
     @Override
     public String toString() {
         return "StandardTabImporter{" +