From 0a9922b8fef4331e048c6a5e35094365600154ee Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 9 Mar 2020 16:12:17 +0100 Subject: [PATCH 1/4] Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts. --- .../controller/SwaggerAPIControllerExample.java | 2 +- .../mops/gruppen2/repository/EventRepository.java | 1 - .../gruppen2/service/SerializationService.java | 6 ++++++ .../service/SerializationServiceTest.java | 15 ++++++++++----- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java index 5caa747..140c5c9 100644 --- a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java +++ b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java @@ -53,7 +53,7 @@ public class SwaggerAPIControllerExample { return "Product saved successfully"; } - /*@GetMapping("/json") //just for testing + @GetMapping("/json") public void json() { AddUserEvent aEvent = new AddUserEvent( 1, diff --git a/src/main/java/mops/gruppen2/repository/EventRepository.java b/src/main/java/mops/gruppen2/repository/EventRepository.java index 4352a97..c4b1249 100644 --- a/src/main/java/mops/gruppen2/repository/EventRepository.java +++ b/src/main/java/mops/gruppen2/repository/EventRepository.java @@ -1,7 +1,6 @@ package mops.gruppen2.repository; import mops.gruppen2.domain.EventDTO; -import mops.gruppen2.domain.event.Event; import org.springframework.data.repository.CrudRepository; public interface EventRepository extends CrudRepository { diff --git a/src/main/java/mops/gruppen2/service/SerializationService.java b/src/main/java/mops/gruppen2/service/SerializationService.java index c20af44..dd79d5c 100644 --- a/src/main/java/mops/gruppen2/service/SerializationService.java +++ b/src/main/java/mops/gruppen2/service/SerializationService.java @@ -41,4 +41,10 @@ public class SerializationService { } } + + public Event deserializeEvent(String json) throws JsonProcessingException { + ObjectMapper mapper = new ObjectMapper(); + Event event = mapper.readValue(json, Event.class); + return event; + } } diff --git a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java index 21c4555..83ca5eb 100644 --- a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java +++ b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java @@ -1,7 +1,6 @@ package mops.gruppen2.service; import com.fasterxml.jackson.core.JsonProcessingException; -import mops.gruppen2.domain.event.AddUserEvent; import mops.gruppen2.domain.event.Event; import mops.gruppen2.repository.EventRepository; import org.junit.jupiter.api.BeforeEach; @@ -14,10 +13,9 @@ import static org.junit.jupiter.api.Assertions.*; class SerializationServiceTest { EventRepository eventRepository; - Event event; @BeforeEach - public void setUp(){ + public void setUp() { } @@ -28,7 +26,7 @@ class SerializationServiceTest { @Test void serializeEventTest() { - event = new Event(1,1,"1"); + Event event = new Event(1,1,"1"); SerializationService serializationService = new SerializationService(eventRepository); try { assertThat(serializationService.serializeEvent(event)).isEqualTo("{\"Event\":{\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}}"); @@ -37,5 +35,12 @@ class SerializationServiceTest { } } + @Test + void deserializeAddUserEvent() { + SerializationService serializationService = new SerializationService(); -} \ No newline at end of file + Event event = EventBuilder.randomAddUserEvent(); + + } + +} From b4719af264c660fe6bf4fa63ef01c749252a4aee Mon Sep 17 00:00:00 2001 From: tomvahl Date: Mon, 9 Mar 2020 16:45:57 +0100 Subject: [PATCH 2/4] change SerializationServiceTest --- .../controller/SwaggerAPIControllerExample.java | 2 +- .../mops/gruppen2/domain/event/DeleteUserEvent.java | 2 -- .../gruppen2/service/SerializationServiceTest.java | 10 +++++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java index 140c5c9..f4f52a4 100644 --- a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java +++ b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java @@ -52,7 +52,7 @@ public class SwaggerAPIControllerExample { return "Product saved successfully"; } - +/* @GetMapping("/json") public void json() { AddUserEvent aEvent = new AddUserEvent( diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java index 3d47903..79b112b 100644 --- a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java @@ -6,8 +6,6 @@ import lombok.*; * Entfernt ein einzelnes Mitglied einer Gruppe. */ @Getter -@AllArgsConstructor -@NoArgsConstructor public class DeleteUserEvent extends Event { public DeleteUserEvent(long event_id, long group_id, String user_id) { diff --git a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java index 83ca5eb..ac355be 100644 --- a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java +++ b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java @@ -1,6 +1,8 @@ package mops.gruppen2.service; import com.fasterxml.jackson.core.JsonProcessingException; +import mops.gruppen2.builder.EventBuilder; +import mops.gruppen2.domain.event.AddUserEvent; import mops.gruppen2.domain.event.Event; import mops.gruppen2.repository.EventRepository; import org.junit.jupiter.api.BeforeEach; @@ -9,13 +11,15 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mock; class SerializationServiceTest { EventRepository eventRepository; + Event event; @BeforeEach - public void setUp() { + public void setUp(){ } @@ -37,10 +41,10 @@ class SerializationServiceTest { @Test void deserializeAddUserEvent() { - SerializationService serializationService = new SerializationService(); + SerializationService serializationService = new SerializationService(mock(EventRepository.class)); Event event = EventBuilder.randomAddUserEvent(); } -} +} \ No newline at end of file From a40ef0396d348b8ac56c6005146360db15cd8d10 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 9 Mar 2020 16:47:46 +0100 Subject: [PATCH 3/4] Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts. --- .../controller/SwaggerAPIControllerExample.java | 4 ++-- .../gruppen2/service/SerializationService.java | 7 ++----- .../service/SerializationServiceTest.java | 15 +++++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java index f4f52a4..7f3888b 100644 --- a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java +++ b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java @@ -52,8 +52,8 @@ public class SwaggerAPIControllerExample { return "Product saved successfully"; } -/* - @GetMapping("/json") + + /*@GetMapping("/json") public void json() { AddUserEvent aEvent = new AddUserEvent( 1, diff --git a/src/main/java/mops/gruppen2/service/SerializationService.java b/src/main/java/mops/gruppen2/service/SerializationService.java index dd79d5c..790070f 100644 --- a/src/main/java/mops/gruppen2/service/SerializationService.java +++ b/src/main/java/mops/gruppen2/service/SerializationService.java @@ -24,9 +24,7 @@ public class SerializationService { public String serializeEvent(Event event) throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writeValueAsString(event); - log.info(json); - return json; + return mapper.writeValueAsString(event); } public void saveEvent(Event event){ @@ -44,7 +42,6 @@ public class SerializationService { public Event deserializeEvent(String json) throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); - Event event = mapper.readValue(json, Event.class); - return event; + return mapper.readValue(json, Event.class); } } diff --git a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java index ac355be..2501d0b 100644 --- a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java +++ b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java @@ -1,8 +1,6 @@ package mops.gruppen2.service; import com.fasterxml.jackson.core.JsonProcessingException; -import mops.gruppen2.builder.EventBuilder; -import mops.gruppen2.domain.event.AddUserEvent; import mops.gruppen2.domain.event.Event; import mops.gruppen2.repository.EventRepository; import org.junit.jupiter.api.BeforeEach; @@ -11,15 +9,13 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mock; class SerializationServiceTest { EventRepository eventRepository; - Event event; @BeforeEach - public void setUp(){ + public void setUp() { } @@ -40,11 +36,14 @@ class SerializationServiceTest { } @Test - void deserializeAddUserEvent() { + void deserializeAddUserEvent() throws JsonProcessingException { SerializationService serializationService = new SerializationService(mock(EventRepository.class)); - Event event = EventBuilder.randomAddUserEvent(); + String json = "{\"type\":\"Event\",\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}"; + Event event = serializationService.deserializeEvent(json); + + assertThat(event).isInstanceOf(Event.class); } -} \ No newline at end of file +} From 1eeda87c7f6e7b5b2134ccd3068ec5bf41fe5fb8 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 9 Mar 2020 16:48:54 +0100 Subject: [PATCH 4/4] Change Lombok annotations to enable Jackson deserializing --- .../java/mops/gruppen2/service/SerializationServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java index 2501d0b..a246058 100644 --- a/src/test/java/mops/gruppen2/service/SerializationServiceTest.java +++ b/src/test/java/mops/gruppen2/service/SerializationServiceTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mock; class SerializationServiceTest {