Merged in bugfix/shibui-1699 (pull request #605)

SHIBUI-1699 Approved-by: Dmitriy Kopylenko Approved-by: Bill Smith
TIER · Aug 30, 2022 · 6c29611 · 6c29611
2 parents 1d81472 + e77c642
commit 6c29611
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/versioning/Version.java
@@ -26,9 +26,9 @@ public class Version implements Serializable {
 
     private String creator;
 
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
     private ZonedDateTime date;
 
     private static final long serialVersionUID = 3429591830989243421L;
 
-}
+}
diff --git a/...net2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy b/...net2/tier/shibboleth/admin/ui/domain/versioning/VersionJsonSerializationBasicTests.groovy
@@ -27,7 +27,7 @@ class VersionJsonSerializationBasicTests extends Specification {
             {
                 "id": "2",
                 "creator": "kramer",
-                "date": "2019-05-20T15:00:00.574Z"                                
+                "date": "2019-05-20T15:00:00.574000"                                
             }
         """
         def expectedJsonMap = jsonSlurper.parseText(expectedJson)
@@ -40,4 +40,4 @@ class VersionJsonSerializationBasicTests extends Specification {
         deSerializedJsonMap.id == expectedJsonMap.id
         deSerializedJsonMap.creator == expectedJsonMap.creator
     }
-}
+}