Introduce Z-Time for Jackson
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AssignmentModulContactDto.java b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AssignmentModulContactDto.java
index f2a48dc..777423e 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AssignmentModulContactDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AssignmentModulContactDto.java
@@ -14,6 +14,7 @@
*/
package org.eclipse.openk.contactbasedata.viewmodel;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@@ -31,9 +32,16 @@
private UUID contactUuid;
private String modulName;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
private Date assignmentDate;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
private Date expiringDate;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
private Date deletionLockUntil;
+
private String assignmentNote;
}
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/controller/AssignmentModulContactControllerTest.java b/src/test/java/org/eclipse/openk/contactbasedata/controller/AssignmentModulContactControllerTest.java
index 197b0c7..7852c76 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/controller/AssignmentModulContactControllerTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/controller/AssignmentModulContactControllerTest.java
@@ -30,6 +30,7 @@
import org.springframework.test.web.servlet.MockMvc;
import java.sql.Date;
+import java.time.Instant;
import java.util.List;
import java.util.UUID;
@@ -78,10 +79,10 @@
AssignmentModulContactDto assignmentDto = MockDataHelper.mockAssignmentModulContactDto();
assignmentDto.setUuid(UUID.fromString("394dce82-41af-11ea-b77f-2e728ce88125"));
assignmentDto.setContactUuid(UUID.fromString("5b164ab2-41af-11ea-b77f-2e728ce88125"));
- assignmentDto.setAssignmentDate(Date.valueOf("2020-12-24"));
+ assignmentDto.setAssignmentDate(Date.from(Instant.parse("2020-12-23T23:00:00Z")));
assignmentDto.setAssignmentNote("nur für Tests");
- assignmentDto.setDeletionLockUntil(Date.valueOf("2021-12-24"));
- assignmentDto.setExpiringDate(Date.valueOf("2022-12-24"));
+ assignmentDto.setDeletionLockUntil(Date.from(Instant.parse("2021-12-23T23:00:00Z")));
+ assignmentDto.setExpiringDate(Date.from(Instant.parse("2022-12-23T23:00:00Z")));
assignmentDto.setModulName("Störinfos");
when(assignmentService.insertAssignment(any(UUID.class), any(AssignmentModulContactDto.class)))
@@ -92,10 +93,10 @@
.content(new ObjectMapper().writeValueAsString(assignmentDto)))
.andExpect(jsonPath("$.id", Matchers.is("394dce82-41af-11ea-b77f-2e728ce88125")))
.andExpect(jsonPath("$.contactId", Matchers.is("5b164ab2-41af-11ea-b77f-2e728ce88125" )))
- .andExpect(jsonPath("$.assignmentDate", Matchers.is("2020-12-24" )))
+ .andExpect(jsonPath("$.assignmentDate", Matchers.is("2020-12-23T23:00:00Z" )))
.andExpect(jsonPath("$.assignmentNote", Matchers.is("nur für Tests" )))
- .andExpect(jsonPath("$.deletionLockUntil", Matchers.is("2021-12-24" )))
- .andExpect(jsonPath("$.expiringDate", Matchers.is("2022-12-24" )))
+ .andExpect(jsonPath("$.deletionLockUntil", Matchers.is("2021-12-23T23:00:00Z" )))
+ .andExpect(jsonPath("$.expiringDate", Matchers.is("2022-12-23T23:00:00Z" )))
.andExpect(jsonPath("$.modulName", Matchers.is("Störinfos" )));
}
