From 1cc7c62ac439716da0376f11f6d27319c32058e1 Mon Sep 17 00:00:00 2001 From: Kevin Birk Date: Thu, 2 May 2024 10:27:18 -0400 Subject: [PATCH] Fix stack overflow (#3501) Co-authored-by: kbirk --- packages/client/hmi-client/src/types/Types.ts | 2 -- .../hmiserver/models/simulationservice/CiemssStatusUpdate.java | 2 ++ .../hmiserver/models/simulationservice/ScimlStatusUpdate.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts index b5593e5bbb..faa61a9d73 100644 --- a/packages/client/hmi-client/src/types/Types.ts +++ b/packages/client/hmi-client/src/types/Types.ts @@ -688,7 +688,6 @@ export interface CiemssStatusUpdate { loss: number; progress: number; jobId: string; - dataToPersist: any; } export interface EnsembleCalibrationCiemssRequest { @@ -727,7 +726,6 @@ export interface ScimlStatusUpdate { id: string; solData: { [index: string]: any }; timesteps: number[]; - dataToPersist: any; } export interface SimulationRequest { diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java index 3e094f5edd..35409b26c2 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java @@ -1,6 +1,7 @@ package software.uncharted.terarium.hmiserver.models.simulationservice; import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; @@ -16,6 +17,7 @@ public class CiemssStatusUpdate { @JsonAlias("job_id") private String jobId; + @JsonIgnore public JsonNode getDataToPersist() { final ObjectMapper mapper = new ObjectMapper(); return mapper.valueToTree(this); diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/ScimlStatusUpdate.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/ScimlStatusUpdate.java index e46f8be7ed..ede6587b2b 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/ScimlStatusUpdate.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/ScimlStatusUpdate.java @@ -1,6 +1,7 @@ package software.uncharted.terarium.hmiserver.models.simulationservice; import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -32,6 +33,7 @@ public class ScimlStatusUpdate { // List of timesteps private List timesteps; + @JsonIgnore public JsonNode getDataToPersist() { final ObjectMapper mapper = new ObjectMapper(); final JsonNode jsonNode = mapper.valueToTree(this);