Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Deserialize java.time.Instant objects that are represented as JSON objects (#16321)

Browse Source 
Deserialize java.time.Instant objects that are represented as JSON objects; e.g {"nano": 790000000,"epochSecond": 1641498664}
This commit is contained in:
Chris Maeda 2022-09-15 00:11:23 -04:00 committed by GitHub
parent 05d9db6e81
commit 0351b0e9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/server/appsmith-interfaces/src/main/java/com/appsmith/external/converters/GsonISOStringToInstantConverter.java vendored
View File

@ -3,6 +3,7 @@ package com.appsmith.external.converters;
import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive; import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializationContext;
@ -33,6 +34,33 @@ public class GsonISOStringToInstantConverter implements JsonSerializer<Instant>,
// do nothing, let's try to parse with Instant.parse assuming it's in ISO format // do nothing, let's try to parse with Instant.parse assuming it's in ISO format
} }
} }
// In other versions of Appsmith, we have observed Instants saved as JSON objects. E.g.
// "deletedAt": {
// "nano": 790000000,
// "epochSecond": 1641498664
// }
if (jsonElement.isJsonObject()) {
JsonObject timeObject = jsonElement.getAsJsonObject();
JsonElement epochSecondElt = timeObject.get("epochSecond");
JsonElement nanoElt = timeObject.get("nano");
Long epochSecond = (epochSecondElt != null ? epochSecondElt.getAsLong() : null);
Long nano = (nanoElt != null ? nanoElt.getAsLong() : null);
if (epochSecond != null)
{
if (nano != null)
{
Instant val = Instant.ofEpochSecond(epochSecond, nano);
return val;
}
else
{
Instant val = Instant.ofEpochSecond(epochSecond);
return val;
}
}
}
return Instant.parse(jsonElement.getAsString()); return Instant.parse(jsonElement.getAsString());
} }