christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts.

Browse Source
This commit is contained in:
Christoph
2020-03-09 16:47:46 +01:00
parent b4719af264
commit a40ef0396d
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java
View File

@ -52,8 +52,8 @@ public class SwaggerAPIControllerExample {
return "Product saved successfully";
}
/*
@GetMapping("/json")
/*@GetMapping("/json")
public void json() {
AddUserEvent aEvent = new AddUserEvent(
1,

7
src/main/java/mops/gruppen2/service/SerializationService.java
View File

@ -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);
}
}

11
src/test/java/mops/gruppen2/service/SerializationServiceTest.java
View File

@ -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,12 +9,10 @@ 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() {
@ -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);
}
}