From 923e62bf3ee9ea572a02b79a9cfe540f96840689 Mon Sep 17 00:00:00 2001 From: Jj! Date: Mon, 11 Oct 2021 16:25:22 -0500 Subject: [PATCH] [SHIBUI-2165] updated precision for json datetime --- .../tier/shibboleth/admin/ui/domain/AbstractAuditable.java | 4 ++-- .../controller/UsersControllerIntegrationTests.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java index edf805056..89560f04f 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java @@ -42,13 +42,13 @@ public abstract class AbstractAuditable implements Auditable { @CreationTimestamp @CreatedDate @Column(nullable = false, updatable = false, columnDefinition = "DATETIME(9)") - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS") private LocalDateTime createdDate; @UpdateTimestamp @LastModifiedDate @Column(nullable = false, columnDefinition = "DATETIME(9)") - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS") private LocalDateTime modifiedDate; @Column(name = "created_by") diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy index 84f6cb33c..a87bcc819 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy @@ -317,7 +317,7 @@ class UsersControllerIntegrationTests extends AbstractBaseDataJpaTest { @Bean ObjectMapper objectMapper() { JavaTimeModule module = new JavaTimeModule() - LocalDateTimeDeserializer localDateTimeDeserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS")) + LocalDateTimeDeserializer localDateTimeDeserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS")) module.addDeserializer(LocalDateTime.class, localDateTimeDeserializer) return Jackson2ObjectMapperBuilder.json().modules(module).featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).build()