diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java index 8d595478..70720551 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentVersionService.java @@ -1,7 +1,7 @@ package org.raddatz.familienarchiv.service; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.raddatz.familienarchiv.dto.DocumentVersionSummary; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java index 992cf6d4..cb75cfd0 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentVersionServiceTest.java @@ -1,7 +1,6 @@ package org.raddatz.familienarchiv.service; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import tools.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -41,8 +40,7 @@ class DocumentVersionServiceTest { @BeforeEach void setUp() { - ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule()); - versionService = new DocumentVersionService(versionRepository, userService, mapper); + versionService = new DocumentVersionService(versionRepository, userService, new ObjectMapper()); } @BeforeEach @@ -128,7 +126,7 @@ class DocumentVersionServiceTest { authenticateAs("user1"); when(userService.findByUsername("user1")).thenReturn(stubUser("user1")); - ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule()); + ObjectMapper mapper = new ObjectMapper(); Document oldDoc = Document.builder().id(UUID.randomUUID()).title("Alt").build(); String oldSnapshot = mapper.writeValueAsString(oldDoc); @@ -158,7 +156,7 @@ class DocumentVersionServiceTest { authenticateAs("user1"); when(userService.findByUsername("user1")).thenReturn(stubUser("user1")); - ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule()); + ObjectMapper mapper = new ObjectMapper(); UUID docId = UUID.randomUUID(); Document oldDoc = Document.builder().id(docId).title("Same").location("Berlin").build(); String oldSnapshot = mapper.writeValueAsString(oldDoc); @@ -185,7 +183,7 @@ class DocumentVersionServiceTest { authenticateAs("user1"); when(userService.findByUsername("user1")).thenReturn(stubUser("user1")); - ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule()); + ObjectMapper mapper = new ObjectMapper(); UUID docId = UUID.randomUUID(); Person oldSender = Person.builder().id(UUID.randomUUID()).firstName("A").lastName("B").build(); Document oldDoc = Document.builder().id(docId).title("T").sender(oldSender).build(); @@ -213,7 +211,7 @@ class DocumentVersionServiceTest { authenticateAs("user1"); when(userService.findByUsername("user1")).thenReturn(stubUser("user1")); - ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule()); + ObjectMapper mapper = new ObjectMapper(); UUID docId = UUID.randomUUID(); Person receiver1 = Person.builder().id(UUID.randomUUID()).firstName("A").lastName("B").build(); Document oldDoc = Document.builder().id(docId).title("T").receivers(Set.of(receiver1)).build(); @@ -240,7 +238,7 @@ class DocumentVersionServiceTest { authenticateAs("user1"); when(userService.findByUsername("user1")).thenReturn(stubUser("user1")); - ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule()); + ObjectMapper mapper = new ObjectMapper(); UUID docId = UUID.randomUUID(); Tag tag = Tag.builder().id(UUID.randomUUID()).name("Familie").build(); Document oldDoc = Document.builder().id(docId).title("T").tags(Set.of(tag)).build();