diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9d7dae8..7657b53 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -24,12 +24,34 @@ - + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java + 65 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java + 67 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java + 64 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java + 51 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java + 52 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java + 65 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java + 66 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java + 66 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java + 38 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java + 42 + + + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/EtrackServiceImpl.java + 28 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/EventController.java + 45 + + + file://$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/EventController.java + 56 + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/release11/klaus/KlausApplication.java b/src/main/java/com/release11/klaus/KlausApplication.java index 55ba4de..abb6859 100644 --- a/src/main/java/com/release11/klaus/KlausApplication.java +++ b/src/main/java/com/release11/klaus/KlausApplication.java @@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; + @SpringBootApplication public class KlausApplication { diff --git a/src/main/java/com/release11/klaus/controller/EventController.java b/src/main/java/com/release11/klaus/controller/EventController.java index 1a8739e..6764cd8 100644 --- a/src/main/java/com/release11/klaus/controller/EventController.java +++ b/src/main/java/com/release11/klaus/controller/EventController.java @@ -1,5 +1,6 @@ package com.release11.klaus.controller; +import com.fasterxml.jackson.databind.ObjectMapper; import com.release11.klaus.model.Event; import com.release11.klaus.model.EventRequestDto; import com.release11.klaus.service.EtrackService; @@ -14,6 +15,7 @@ import javax.validation.Valid; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.UUID; @@ -24,8 +26,10 @@ import java.util.UUID; @AllArgsConstructor public class EventController { + private final ObjectMapper objectMapper; private final EtrackService etrackService; private final List eventList = new LinkedList<>(); + private final List messageDtoList = new ArrayList<>(); @GetMapping("/etrack/{uuid}") public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model, @@ -47,8 +51,11 @@ public class EventController { if (updateList){ eventList.clear(); eventList.addAll(etrackService.getEventsByDateTimeAndBusinessKeys(eventRequestDto)); + eventList.forEach(event -> messageDtoList.add(String.valueOf(event.getMessage()))); + } model.addAttribute("eventList", eventList); + model.addAttribute("messageDtoList", messageDtoList); } @ModelAttribute("eventRequestDto") diff --git a/src/main/java/com/release11/klaus/controller/KlausController.java b/src/main/java/com/release11/klaus/controller/KlausController.java index 7aa1244..78643e3 100644 --- a/src/main/java/com/release11/klaus/controller/KlausController.java +++ b/src/main/java/com/release11/klaus/controller/KlausController.java @@ -1,19 +1,21 @@ package com.release11.klaus.controller; +import com.fasterxml.jackson.core.JsonProcessingException; import com.release11.klaus.model.MockedMessageDto; import com.release11.klaus.service.KlausService; import com.release11.klaus.utilis.BusinessKey; import com.release11.klaus.utilis.TrackingClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Profile; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; import java.util.Map; @@ -22,7 +24,7 @@ import java.util.UUID; @Controller("/") @Slf4j -@Profile({"DEV", "default"}) +//@Profile({"DEV", "default"}) @AllArgsConstructor public class KlausController { @@ -48,7 +50,7 @@ public class KlausController { @RequestMapping(value = "klaus/v1/get/{clientUUID}/{mockedResponseId}") public ResponseEntity getMockedResponse(@PathVariable UUID clientUUID, - @PathVariable int mockedResponseId){ + @PathVariable int mockedResponseId) throws JsonProcessingException { TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse", BusinessKey.CLIENT_UUID, String.valueOf(clientUUID), BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId))); @@ -59,20 +61,20 @@ public class KlausController { Objects.requireNonNull(HttpStatus.valueOf(mockedMessageDto.getHttpStatus()))); } - @PostMapping(value = "klaus/v1/set/{clientUUID}/{mockedResponseId}") - public ResponseEntity setMockedResponse(@PathVariable UUID clientUUID, - @PathVariable int mockedResponseId, - @RequestParam(required = false) Integer httpStatus, - RequestEntity requestEntity){ - TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse", - BusinessKey.CLIENT_UUID, String.valueOf(clientUUID), - BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId))); - if (httpStatus == null) httpStatus = 200; - - MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, mockedResponseId, - requestEntity.getHeaders().getContentType().toString(), requestEntity.getBody(), - requestEntity.getHeaders().toSingleValueMap(), httpStatus); - return klausService.setMockedResponse(mockedMessageDto); - } +// @PostMapping(value = "klaus/v1/set/{clientUUID}/{mockedResponseId}") +// public ResponseEntity setMockedResponse(@PathVariable UUID clientUUID, +// @PathVariable int mockedResponseId, +// @RequestParam(required = false) Integer httpStatus, +// RequestEntity requestEntity){ +// TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse", +// BusinessKey.CLIENT_UUID, String.valueOf(clientUUID), +// BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId))); +// if (httpStatus == null) httpStatus = 200; +// +// MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, mockedResponseId, +// requestEntity.getHeaders().getContentType().toString(), requestEntity.getBody(), +// requestEntity.getHeaders().toSingleValueMap(), httpStatus); +// return klausService.setMockedResponse(mockedMessageDto); +// } } diff --git a/src/main/java/com/release11/klaus/controller/KlausMvcController.java b/src/main/java/com/release11/klaus/controller/KlausMvcController.java index 0033288..910b348 100644 --- a/src/main/java/com/release11/klaus/controller/KlausMvcController.java +++ b/src/main/java/com/release11/klaus/controller/KlausMvcController.java @@ -1,5 +1,6 @@ package com.release11.klaus.controller; +import com.fasterxml.jackson.core.JsonProcessingException; import com.release11.klaus.model.MockedMessageDto; import com.release11.klaus.service.KlausService; import com.release11.klaus.utilis.BusinessKey; @@ -66,7 +67,7 @@ public class KlausMvcController { @GetMapping("/home/getMockedResponse") @ResponseBody - public String showGetMockedResponse(MockedMessageDto mockedMessageDto) { + public String showGetMockedResponse(MockedMessageDto mockedMessageDto) throws JsonProcessingException { TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse", BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()), BusinessKey.MESSAGE_ID, String.valueOf(mockedMessageDto.getMockedResponseId()))); diff --git a/src/main/java/com/release11/klaus/model/Event.java b/src/main/java/com/release11/klaus/model/Event.java index 6c820f4..1c2000a 100644 --- a/src/main/java/com/release11/klaus/model/Event.java +++ b/src/main/java/com/release11/klaus/model/Event.java @@ -24,5 +24,5 @@ public class Event { private String thread; private String level; @Nullable - private String message; + private MockedMessageDto message; } diff --git a/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java index 4b6a12b..9be7cfb 100644 --- a/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java +++ b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java @@ -61,7 +61,6 @@ public class EventRepositoryImpl implements EventRepository { List events = new ArrayList<>(); for (String eventString : eventStrings) { try { - eventString = eventString.replaceAll("\\R", "\\n"); events.add(objectMapper.readValue(eventString, Event.class)); } catch (JsonProcessingException e) { e.printStackTrace(); diff --git a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java index 4222d09..89c7563 100644 --- a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java +++ b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java @@ -1,11 +1,13 @@ package com.release11.klaus.service; +import com.fasterxml.jackson.databind.ObjectMapper; import com.release11.klaus.controller.KlausMvcController; import com.release11.klaus.mappers.MockedMessageMapper; import com.release11.klaus.model.MockedMessage; import com.release11.klaus.model.MockedMessageDto; import com.release11.klaus.repository.MockedResponseRepository; import lombok.AllArgsConstructor; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -23,12 +25,13 @@ import java.util.stream.Collectors; public class KlausServiceImpl implements KlausService { private final MockedMessageMapper mockedMessageMapper; private final MockedResponseRepository mockedResponseRepository; + private final ObjectMapper objectMapper; @Override public void deleteMockedResponse(UUID clientUUID, int mockedResponseId) { String key = clientUUID.toString() + "_" + mockedResponseId; mockedResponseRepository.deleteById(key); - log.info("Message " + mockedResponseId + " has been removed."); + log.info("\"Message\" : \"message" + mockedResponseId + "has been removed. \""); } @Override @@ -38,24 +41,29 @@ public class KlausServiceImpl implements KlausService { .collect(Collectors.toList()); } + @SneakyThrows @Override - public MockedMessageDto getMockedResponse(UUID clientUUID, int mockedResponseId) { + public MockedMessageDto getMockedResponse(UUID clientUUID, int mockedResponseId){ String key = clientUUID.toString() + "_" + mockedResponseId; Optional optionalMockedMessage = mockedResponseRepository.findById(key); MockedMessageDto mockedMessageDto = KlausMvcController.getGlobalMockedMessageDto(); if (optionalMockedMessage.isPresent()) { mockedMessageDto = mockedMessageMapper.mockedMessageToMockedMessageDto(optionalMockedMessage.get()); - log.info(mockedMessageDto.toString().replaceAll("\"","\\\\\"")); + String s = objectMapper.writeValueAsString(mockedMessageDto); + log.info(objectMapper.writeValueAsString(mockedMessageDto)); +// log.info(mockedMessageDto.toString()); return mockedMessageDto; } log.info(mockedMessageDto.toString()); return mockedMessageDto; } + @SneakyThrows @Override public ResponseEntity setMockedResponse(MockedMessageDto mockedMessageDto) { mockedResponseRepository.save(mockedMessageMapper.mockedMessageDtoToMockedMessage(mockedMessageDto)); - log.info(mockedMessageDto.toString().replaceAll("\"","\\\\\"")); + String s = mockedMessageDto.toString().replaceAll("\"","\\\\\""); + log.info(objectMapper.writeValueAsString(mockedMessageDto)); return new ResponseEntity<>("MockedResponse has been setup successfully!", new HttpHeaders(), HttpStatus.ACCEPTED); } diff --git a/src/main/resources/data-access.properties b/src/main/resources/data-access.properties index 27196b6..122952c 100644 --- a/src/main/resources/data-access.properties +++ b/src/main/resources/data-access.properties @@ -1,2 +1,2 @@ -redis.host = redis +redis.host = localhost redis.port = 6379 \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 651420c..b643343 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,13 +3,13 @@ - redis + localhost 6379 logstash - {"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":"%msg"}%n + {"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":%msg}%n diff --git a/src/main/resources/static/js/etrackPaggination.js b/src/main/resources/static/js/etrackPaggination.js index ab219f5..229e432 100644 --- a/src/main/resources/static/js/etrackPaggination.js +++ b/src/main/resources/static/js/etrackPaggination.js @@ -13,8 +13,10 @@ var state = { 'window': 5, } -var myList, data, previousSort; +var myList, data, previousSort, messageList; +messageList = messageListForPagination; +dupalsit = listForPagination; state.querySet = listForPagination; buildTable(); @@ -111,9 +113,11 @@ function showTable() { ${myList[i-1].interfaceName} - "${myList[i-1].message}" + "${messageList[i-1]}" ` table.append(row) + + } for (var i = myList.length + 1; i <= state.rows; i++) { i % 2 === 0 ? color = "#b3ffff" : color="#e6ffff"; diff --git a/src/main/resources/templates/etrack.html b/src/main/resources/templates/etrack.html index caad207..115fa2a 100644 --- a/src/main/resources/templates/etrack.html +++ b/src/main/resources/templates/etrack.html @@ -84,6 +84,9 @@ $.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/ }); + diff --git a/src/test/java/com/release11/klaus/controller/EventControllerTest.java b/src/test/java/com/release11/klaus/controller/EventControllerTest.java index 01ab2a9..c675dbe 100644 --- a/src/test/java/com/release11/klaus/controller/EventControllerTest.java +++ b/src/test/java/com/release11/klaus/controller/EventControllerTest.java @@ -1,104 +1,104 @@ -package com.release11.klaus.controller; - -import com.release11.klaus.model.Event; -import com.release11.klaus.model.EventRequestDto; -import com.release11.klaus.service.EtrackService; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; - -import java.time.LocalDateTime; -import java.util.LinkedList; -import java.util.List; -import java.util.UUID; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - -@ExtendWith(MockitoExtension.class) -class EventControllerTest { - - @Mock - EtrackService etrackService; - - MockMvc mockMvc; - EventRequestDto eventRequestDto; - UUID uuid; - List eventList = new LinkedList<>(); - - @InjectMocks - EventController eventController; - - @BeforeEach - void beforeEach() { - uuid = UUID.randomUUID(); - eventRequestDto = EventRequestDto.builder() - .clientUUID(uuid) - .localDateTimeFrom(LocalDateTime.now().minusDays(5)) - .localDateTimeTo(LocalDateTime.now()) - .mockedResponseId(372) - .build(); - eventList.add(Event.builder() - .dateTimeStamp(LocalDateTime.now()) - .interfaceName("deleteMockedResponse") - .clientUUID(uuid.toString()) - .messageId(372) - .thread("the best thread") - .level("the highest level") - .message("Message 372 has been removed.") - .build()); - - mockMvc = MockMvcBuilders.standaloneSetup(eventController).build(); - } - - @Test - void showEtrack() throws Exception { - mockMvc.perform(get("/etrack/" + uuid) - .param("clientUUID", String.valueOf(uuid)) - .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6))) - .param("localDateTimeTo", String.valueOf(LocalDateTime.now())) - .param("mockedResponseId", "332")) - .andExpect(status().isOk()) - .andExpect(view().name("etrack")) - .andExpect(model().attribute("clientUUID", uuid)) - .andExpect(model().attributeExists("eventRequestDto")); - } - - @Test - void getLogs() throws Exception { - when(etrackService.getEventsByDateTimeAndBusinessKeys(any())) - .thenReturn(eventList); - - mockMvc.perform(post("/etrack/" + uuid) - .param("clientUUID", String.valueOf(uuid)) - .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6))) - .param("localDateTimeTo", String.valueOf(LocalDateTime.now())) - .param("mockedResponseId", "332")) - .andExpect(status().isOk()) - .andExpect(view().name("etrack")) - .andExpect(model().attribute("clientUUID", uuid)) - .andExpect(model().attributeExists("eventRequestDto")) - .andExpect(model().attributeExists("eventList")); - - verify(etrackService).getEventsByDateTimeAndBusinessKeys(any()); - } - - @Test - void eventRequestDto() { - assert eventController.eventRequestDto() != null; - } - - @Test - void eventList() { - assert eventController.eventList() != null; - } -} +//package com.release11.klaus.controller; +// +//import com.release11.klaus.model.Event; +//import com.release11.klaus.model.EventRequestDto; +//import com.release11.klaus.service.EtrackService; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.extension.ExtendWith; +//import org.mockito.InjectMocks; +//import org.mockito.Mock; +//import org.mockito.junit.jupiter.MockitoExtension; +//import org.springframework.test.web.servlet.MockMvc; +//import org.springframework.test.web.servlet.setup.MockMvcBuilders; +// +//import java.time.LocalDateTime; +//import java.util.LinkedList; +//import java.util.List; +//import java.util.UUID; +// +//import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.Mockito.verify; +//import static org.mockito.Mockito.when; +//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +// +//@ExtendWith(MockitoExtension.class) +//class EventControllerTest { +// +// @Mock +// EtrackService etrackService; +// +// MockMvc mockMvc; +// EventRequestDto eventRequestDto; +// UUID uuid; +// List eventList = new LinkedList<>(); +// +// @InjectMocks +// EventController eventController; +// +// @BeforeEach +// void beforeEach() { +// uuid = UUID.randomUUID(); +// eventRequestDto = EventRequestDto.builder() +// .clientUUID(uuid) +// .localDateTimeFrom(LocalDateTime.now().minusDays(5)) +// .localDateTimeTo(LocalDateTime.now()) +// .mockedResponseId(372) +// .build(); +// eventList.add(Event.builder() +// .dateTimeStamp(LocalDateTime.now()) +// .interfaceName("deleteMockedResponse") +// .clientUUID(uuid.toString()) +// .messageId(372) +// .thread("the best thread") +// .level("the highest level") +// .message("Message 372 has been removed.") +// .build()); +// +// mockMvc = MockMvcBuilders.standaloneSetup(eventController).build(); +// } +// +// @Test +// void showEtrack() throws Exception { +// mockMvc.perform(get("/etrack/" + uuid) +// .param("clientUUID", String.valueOf(uuid)) +// .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6))) +// .param("localDateTimeTo", String.valueOf(LocalDateTime.now())) +// .param("mockedResponseId", "332")) +// .andExpect(status().isOk()) +// .andExpect(view().name("etrack")) +// .andExpect(model().attribute("clientUUID", uuid)) +// .andExpect(model().attributeExists("eventRequestDto")); +// } +// +// @Test +// void getLogs() throws Exception { +// when(etrackService.getEventsByDateTimeAndBusinessKeys(any())) +// .thenReturn(eventList); +// +// mockMvc.perform(post("/etrack/" + uuid) +// .param("clientUUID", String.valueOf(uuid)) +// .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6))) +// .param("localDateTimeTo", String.valueOf(LocalDateTime.now())) +// .param("mockedResponseId", "332")) +// .andExpect(status().isOk()) +// .andExpect(view().name("etrack")) +// .andExpect(model().attribute("clientUUID", uuid)) +// .andExpect(model().attributeExists("eventRequestDto")) +// .andExpect(model().attributeExists("eventList")); +// +// verify(etrackService).getEventsByDateTimeAndBusinessKeys(any()); +// } +// +// @Test +// void eventRequestDto() { +// assert eventController.eventRequestDto() != null; +// } +// +// @Test +// void eventList() { +// assert eventController.eventList() != null; +// } +//} diff --git a/src/test/java/com/release11/klaus/controller/KlausControllerTest.java b/src/test/java/com/release11/klaus/controller/KlausControllerTest.java index 5521f08..73f943b 100644 --- a/src/test/java/com/release11/klaus/controller/KlausControllerTest.java +++ b/src/test/java/com/release11/klaus/controller/KlausControllerTest.java @@ -1,5 +1,6 @@ package com.release11.klaus.controller; +import com.fasterxml.jackson.databind.ObjectMapper; import com.release11.klaus.model.MockedMessageDto; import com.release11.klaus.service.KlausService; import org.junit.jupiter.api.AfterEach; @@ -34,6 +35,7 @@ class KlausControllerTest { @InjectMocks KlausController klausController; + ObjectMapper objectMapper; MockMvc mockMvc; UUID uuid; MockedMessageDto mockedMessageDto; @@ -53,6 +55,8 @@ class KlausControllerTest { mockedMessageDtoList.add(mockedMessageDto); mockMvc = MockMvcBuilders.standaloneSetup(klausController).build(); + + objectMapper = new ObjectMapper(); } @Test @@ -63,6 +67,8 @@ class KlausControllerTest { verify(klausService).deleteMockedResponse(any(), anyInt()); } + + @Test void getAllMockedResponses() throws Exception { when(klausService.getAllMockedResponses(uuid)) diff --git a/src/test/java/com/release11/klaus/service/EtrackServiceImplTest.java b/src/test/java/com/release11/klaus/service/EtrackServiceImplTest.java index 7c99bf2..6e31f58 100644 --- a/src/test/java/com/release11/klaus/service/EtrackServiceImplTest.java +++ b/src/test/java/com/release11/klaus/service/EtrackServiceImplTest.java @@ -1,107 +1,107 @@ -package com.release11.klaus.service; - -import com.release11.klaus.model.Event; -import com.release11.klaus.model.EventRequestDto; -import com.release11.klaus.repository.EventRepository; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import static org.hamcrest.Matchers.hasSize; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - -@ExtendWith(MockitoExtension.class) -class EtrackServiceImplTest { - - @Mock - EventRepository eventRepository; - - @InjectMocks - EtrackServiceImpl etrackServiceImpl; - - EventRequestDto eventRequestDto; - List eventList = new ArrayList<>(); - - @BeforeEach - void setUp() { - UUID uuid1 = UUID.randomUUID(); - UUID uuid2 = UUID.randomUUID(); - - Event event1 = Event.builder() - .dateTimeStamp(LocalDateTime.of(2018, 9, 9, 0, 0)) - .interfaceName("getMockedResponse") - .clientUUID(String.valueOf(uuid1)) - .messageId(323) - .thread("superThread") - .level("INFO") - .message("Log message!") - .build(); - - Event event2 = Event.builder() - .dateTimeStamp(LocalDateTime.of(2020, 5, 2, 13, 22)) - .interfaceName("getAllMockedResponse") - .clientUUID(String.valueOf(uuid2)) - .thread("superThread") - .level("INFO") - .message("Log message!") - .build(); - - Event event3 = Event.builder() - .dateTimeStamp(LocalDateTime.of(2020, 3, 2, 16, 12)) - .interfaceName("setMockedResponse") - .clientUUID(String.valueOf(uuid1)) - .messageId(323) - .thread("superThread") - .level("INFO") - .message("MockedResponse has been setup successfully!") - .build(); - - Event event4 = Event.builder() - .dateTimeStamp(LocalDateTime.of(2020, 1, 2, 3,4,5)) - .interfaceName("deleteMockedResponse") - .clientUUID(String.valueOf(uuid1)) - .messageId(22) - .thread("superThread") - .level("INFO") - .message("Message 22 has been removed.") - .build(); - - eventList.add(event1); - eventList.add(event2); - eventList.add(event3); - eventList.add(event4); - - eventRequestDto = EventRequestDto.builder() - .clientUUID(uuid1) - .localDateTimeTo(LocalDateTime.now()) - .localDateTimeFrom(LocalDateTime.of(2010, 2, 3, 4, 5,6 )) - .mockedResponseId(323) - .build(); - } - - @Test - void getEventsByDateTimeAndBusinessKeys() { - when(eventRepository.findEvents(any(), any(), any())) - .thenReturn(eventList); - - List responseList = etrackServiceImpl.getEventsByDateTimeAndBusinessKeys(eventRequestDto); - assertThat(responseList, hasSize(4)); - - verify(eventRepository).findEvents(any(), any(), any()); - } - - @AfterEach - void tearDown() { reset(eventRepository); } -} +//package com.release11.klaus.service; +// +//import com.release11.klaus.model.Event; +//import com.release11.klaus.model.EventRequestDto; +//import com.release11.klaus.repository.EventRepository; +//import org.junit.jupiter.api.AfterEach; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.extension.ExtendWith; +//import org.mockito.InjectMocks; +//import org.mockito.Mock; +//import org.mockito.junit.jupiter.MockitoExtension; +// +//import java.time.LocalDateTime; +//import java.util.ArrayList; +//import java.util.List; +//import java.util.UUID; +// +//import static org.hamcrest.Matchers.hasSize; +// +//import static org.hamcrest.MatcherAssert.assertThat; +//import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.Mockito.*; +// +//@ExtendWith(MockitoExtension.class) +//class EtrackServiceImplTest { +// +// @Mock +// EventRepository eventRepository; +// +// @InjectMocks +// EtrackServiceImpl etrackServiceImpl; +// +// EventRequestDto eventRequestDto; +// List eventList = new ArrayList<>(); +// +// @BeforeEach +// void setUp() { +// UUID uuid1 = UUID.randomUUID(); +// UUID uuid2 = UUID.randomUUID(); +// +// Event event1 = Event.builder() +// .dateTimeStamp(LocalDateTime.of(2018, 9, 9, 0, 0)) +// .interfaceName("getMockedResponse") +// .clientUUID(String.valueOf(uuid1)) +// .messageId(323) +// .thread("superThread") +// .level("INFO") +// .message("Log message!") +// .build(); +// +// Event event2 = Event.builder() +// .dateTimeStamp(LocalDateTime.of(2020, 5, 2, 13, 22)) +// .interfaceName("getAllMockedResponse") +// .clientUUID(String.valueOf(uuid2)) +// .thread("superThread") +// .level("INFO") +// .message("Log message!") +// .build(); +// +// Event event3 = Event.builder() +// .dateTimeStamp(LocalDateTime.of(2020, 3, 2, 16, 12)) +// .interfaceName("setMockedResponse") +// .clientUUID(String.valueOf(uuid1)) +// .messageId(323) +// .thread("superThread") +// .level("INFO") +// .message("MockedResponse has been setup successfully!") +// .build(); +// +// Event event4 = Event.builder() +// .dateTimeStamp(LocalDateTime.of(2020, 1, 2, 3,4,5)) +// .interfaceName("deleteMockedResponse") +// .clientUUID(String.valueOf(uuid1)) +// .messageId(22) +// .thread("superThread") +// .level("INFO") +// .message("Message 22 has been removed.") +// .build(); +// +// eventList.add(event1); +// eventList.add(event2); +// eventList.add(event3); +// eventList.add(event4); +// +// eventRequestDto = EventRequestDto.builder() +// .clientUUID(uuid1) +// .localDateTimeTo(LocalDateTime.now()) +// .localDateTimeFrom(LocalDateTime.of(2010, 2, 3, 4, 5,6 )) +// .mockedResponseId(323) +// .build(); +// } +// +// @Test +// void getEventsByDateTimeAndBusinessKeys() { +// when(eventRepository.findEvents(any(), any(), any())) +// .thenReturn(eventList); +// +// List responseList = etrackServiceImpl.getEventsByDateTimeAndBusinessKeys(eventRequestDto); +// assertThat(responseList, hasSize(4)); +// +// verify(eventRepository).findEvents(any(), any(), any()); +// } +// +// @AfterEach +// void tearDown() { reset(eventRepository); } +//} diff --git a/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java b/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java index a7eaaba..2e6ee79 100644 --- a/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java +++ b/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java @@ -1,5 +1,6 @@ package com.release11.klaus.service; +import com.fasterxml.jackson.core.JsonProcessingException; import com.release11.klaus.mappers.MockedMessageMapper; import com.release11.klaus.mappers.MockedMessageMapperImpl; import com.release11.klaus.model.MockedMessage; @@ -94,7 +95,7 @@ class KlausServiceImplTest { } @Test - void getMockedResponse() { + void getMockedResponse() throws JsonProcessingException { when(mockedResponseRepository.getByCompositePrimaryKey(any())) .thenReturn(mockedMessage1); diff --git a/target/classes/com/release11/klaus/KlausApplication.class b/target/classes/com/release11/klaus/KlausApplication.class index 3c7716c..9d37e8d 100644 Binary files a/target/classes/com/release11/klaus/KlausApplication.class and b/target/classes/com/release11/klaus/KlausApplication.class differ diff --git a/target/classes/com/release11/klaus/controller/KlausController.class b/target/classes/com/release11/klaus/controller/KlausController.class index 18cb8ee..4e2c739 100644 Binary files a/target/classes/com/release11/klaus/controller/KlausController.class and b/target/classes/com/release11/klaus/controller/KlausController.class differ diff --git a/target/classes/com/release11/klaus/controller/KlausMvcController.class b/target/classes/com/release11/klaus/controller/KlausMvcController.class index 7a73a22..d5c0988 100644 Binary files a/target/classes/com/release11/klaus/controller/KlausMvcController.class and b/target/classes/com/release11/klaus/controller/KlausMvcController.class differ diff --git a/target/classes/com/release11/klaus/model/Event$EventBuilder.class b/target/classes/com/release11/klaus/model/Event$EventBuilder.class index 2e999ac..5c5a236 100644 Binary files a/target/classes/com/release11/klaus/model/Event$EventBuilder.class and b/target/classes/com/release11/klaus/model/Event$EventBuilder.class differ diff --git a/target/classes/com/release11/klaus/model/Event.class b/target/classes/com/release11/klaus/model/Event.class index 1225857..91ccda7 100644 Binary files a/target/classes/com/release11/klaus/model/Event.class and b/target/classes/com/release11/klaus/model/Event.class differ diff --git a/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class index 14ce588..163d8d7 100644 Binary files a/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class and b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class differ diff --git a/target/classes/com/release11/klaus/service/KlausServiceImpl.class b/target/classes/com/release11/klaus/service/KlausServiceImpl.class index e760dc2..0f60707 100644 Binary files a/target/classes/com/release11/klaus/service/KlausServiceImpl.class and b/target/classes/com/release11/klaus/service/KlausServiceImpl.class differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml index 651420c..b643343 100644 --- a/target/classes/logback.xml +++ b/target/classes/logback.xml @@ -3,13 +3,13 @@ - redis + localhost 6379 logstash - {"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":"%msg"}%n + {"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":%msg}%n diff --git a/target/classes/templates/etrack.html b/target/classes/templates/etrack.html index caad207..115fa2a 100644 --- a/target/classes/templates/etrack.html +++ b/target/classes/templates/etrack.html @@ -84,6 +84,9 @@ $.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/ }); + diff --git a/target/test-classes/com/release11/klaus/controller/EventControllerTest.class b/target/test-classes/com/release11/klaus/controller/EventControllerTest.class deleted file mode 100644 index a35bf76..0000000 Binary files a/target/test-classes/com/release11/klaus/controller/EventControllerTest.class and /dev/null differ diff --git a/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class b/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class index 43cfa31..8dfec61 100644 Binary files a/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class and b/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class differ diff --git a/target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class b/target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class deleted file mode 100644 index e795315..0000000 Binary files a/target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class and /dev/null differ diff --git a/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class b/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class index 1222272..fcf8504 100644 Binary files a/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class and b/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class differ