From 183906dc97231088de0e48a956081c39bc776c87 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 9 May 2024 00:10:46 +0200 Subject: [PATCH] [FIX] correct format of json timestamp --- src/org/kar/archidata/model/GenericToken.java | 2 ++ src/org/kar/archidata/model/User.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/org/kar/archidata/model/GenericToken.java b/src/org/kar/archidata/model/GenericToken.java index fb976ef..38d88bb 100644 --- a/src/org/kar/archidata/model/GenericToken.java +++ b/src/org/kar/archidata/model/GenericToken.java @@ -4,6 +4,7 @@ import java.sql.Timestamp; import org.kar.archidata.annotation.DataIfNotExists; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.persistence.Column; @@ -18,6 +19,7 @@ public class GenericToken extends GenericDataSoftDelete { @Column(nullable = false, length = 0) public String name; @Column(nullable = false) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") public Timestamp endValidityTime = null; @Column(nullable = false, length = 0) public String token; diff --git a/src/org/kar/archidata/model/User.java b/src/org/kar/archidata/model/User.java index 9c6ecd3..74e710a 100644 --- a/src/org/kar/archidata/model/User.java +++ b/src/org/kar/archidata/model/User.java @@ -19,6 +19,7 @@ import java.util.List; import org.kar.archidata.annotation.DataIfNotExists; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.persistence.Column; @@ -34,6 +35,7 @@ public class User extends GenericDataSoftDelete { @Column(length = 128) public String login = null; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") public Timestamp lastConnection = null; @DefaultValue("'0'") @Column(nullable = false)