Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.backend into KON-43-Synchronisation-Interne-Personen-mit-LDAP
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 777423e..dcb3118 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AssignmentModulContactDto.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/viewmodel/AssignmentModulContactDto.java
@@ -33,13 +33,13 @@
private String modulName;
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private Date assignmentDate;
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private Date expiringDate;
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'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 7852c76..0729da2 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/controller/AssignmentModulContactControllerTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/controller/AssignmentModulContactControllerTest.java
@@ -93,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-23T23:00:00Z" )))
+ .andExpect(jsonPath("$.assignmentDate", Matchers.is("2020-12-23T23:00:00.000Z" )))
.andExpect(jsonPath("$.assignmentNote", Matchers.is("nur für Tests" )))
- .andExpect(jsonPath("$.deletionLockUntil", Matchers.is("2021-12-23T23:00:00Z" )))
- .andExpect(jsonPath("$.expiringDate", Matchers.is("2022-12-23T23:00:00Z" )))
+ .andExpect(jsonPath("$.deletionLockUntil", Matchers.is("2021-12-23T23:00:00.000Z" )))
+ .andExpect(jsonPath("$.expiringDate", Matchers.is("2022-12-23T23:00:00.000Z" )))
.andExpect(jsonPath("$.modulName", Matchers.is("Störinfos" )));
}
