read tree node to prevent an infinite loop

JaneliaSciComp · Jan 9, 2023 · 958dd34 · 958dd34
1 parent b808c50
commit 958dd34
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...psearch-api/src/main/java/org/janelia/colormipsearch/model/json/FileDataDeserializer.java b/...psearch-api/src/main/java/org/janelia/colormipsearch/model/json/FileDataDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
 
 import org.janelia.colormipsearch.model.FileData;
 
@@ -17,7 +18,15 @@ public FileData deserialize(JsonParser p, DeserializationContext ctxt) throws IO
         } else if (p.getCurrentToken() == JsonToken.VALUE_STRING) {
             return FileData.fromString(p.getValueAsString());
         } else if (p.getCurrentToken() == JsonToken.START_OBJECT) {
-            return p.readValueAs(FileData.class);
+            JsonNode n = p.readValueAsTree();
+            JsonNode dataTypeNode = n.findValue("dataType");
+            JsonNode fileNameNode = n.findValue("fileName");
+            JsonNode entryNameNode = n.findValue("entryName");
+            return FileData.fromComponents(
+                    dataTypeNode != null ? FileData.FileDataType.valueOf(dataTypeNode.asText()) : FileData.FileDataType.file,
+                    fileNameNode != null ? fileNameNode.asText() : null,
+                    entryNameNode != null ? entryNameNode.asText() : null
+            );
         } else {
             return null;
         }