R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MessageDto instead of String in Event history

Browse Source
This commit is contained in:
Szakalakamaka
2020-11-19 10:14:51 +01:00
parent 56baf9641e
commit 52893c2888
18 changed files with 84 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/release11/klaus/controller/EventController.java
View File

@@ -14,7 +14,6 @@ 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;
@@ -27,7 +26,6 @@ public class EventController {
private final EtrackService etrackService;
private final List<Event> eventList = new LinkedList<>();
private final List<String> messageDtoList = new ArrayList<>();
@GetMapping("/etrack/{uuid}")
public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model,
@@ -49,11 +47,8 @@ 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")

23
src/main/java/com/release11/klaus/controller/KlausController.java
View File

@@ -55,15 +55,20 @@ public class KlausController {
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - request",
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
// MockedMessageDto.builder()
// .httpHeaders(requestEntity.getHeaders().toSingleValueMap())
// .httpStatus(requestEntity.)
// .messageBody()
// .mediaType()
// .mockedResponseId(mockedResponseId)
// .clientUUID(clientUUID)
// .build();
// log.info(objectMapper.writeValueAsString(mockedMessageDto));
String s = requestEntity.toString();
String s2 = String.valueOf(requestEntity).replaceAll("\"", "\\\\\"");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:\"gzip,deflate\", host:\"localhost:8098\", connection:\"Keep-Alive\", user-agent:\"Apache-HttpClient/4.5.5 (Java/12.0.1)\"]>");
log.info(requestEntity.toString().replaceAll("\"", "\\\\\""));
// log.info(requestEntity.toString().replaceAll("\"", "\\\\\""));
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - response",
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));

2
src/main/java/com/release11/klaus/model/Event.java
View File

@@ -24,5 +24,5 @@ public class Event {
private String thread;
private String level;
@Nullable
private MockedMessageDto message;
private String message;
}

7
src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java
View File

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.release11.klaus.model.Event;
import com.release11.klaus.utilis.BusinessKey;
import lombok.AllArgsConstructor;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.springframework.stereotype.Repository;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
@@ -61,8 +63,11 @@ public class EventRepositoryImpl implements EventRepository {
List<Event> events = new ArrayList<>();
for (String eventString : eventStrings) {
try {
eventString = eventString.replaceAll("\\R", "");
events.add(objectMapper.readValue(eventString, Event.class));
} catch (JsonProcessingException e) {
JSONObject jsonObject = new JSONObject(eventString);
} catch (JsonProcessingException | JSONException e) {
e.printStackTrace();
}
}

14
src/main/java/com/release11/klaus/service/KlausServiceImpl.java
View File

@@ -30,10 +30,8 @@ public class KlausServiceImpl implements KlausService {
@Override
public void deleteMockedResponse(UUID clientUUID, int mockedResponseId) {
String key = clientUUID.toString() + "_" + mockedResponseId;
MockedMessage mockedMessage =
mockedResponseRepository.getByCompositePrimaryKey(clientUUID.toString() + "_" + mockedResponseId);
mockedResponseRepository.deleteById(key);
log.info(String.valueOf(mockedMessageMapper.mockedMessageToMockedMessageDto(mockedMessage)));
log.info("Message " + mockedResponseId + " has been removed.");
}
@Override
@@ -51,18 +49,22 @@ public class KlausServiceImpl implements KlausService {
MockedMessageDto mockedMessageDto = KlausMvcController.getGlobalMockedMessageDto();
if (optionalMockedMessage.isPresent()) {
mockedMessageDto = mockedMessageMapper.mockedMessageToMockedMessageDto(optionalMockedMessage.get());
log.info(objectMapper.writeValueAsString(mockedMessageDto));
log.info(mockedMessageDto.toString().replaceAll("\"", "\\\\\""));
return mockedMessageDto;
}
log.info(mockedMessageDto.toString());
log.info(mockedMessageDto.toString().replaceAll("\"", "\\\\\""));
return mockedMessageDto;
}
@SneakyThrows
@Override
public ResponseEntity<String> setMockedResponse(MockedMessageDto mockedMessageDto) {
mockedResponseRepository.save(mockedMessageMapper.mockedMessageDtoToMockedMessage(mockedMessageDto));
log.info(objectMapper.writeValueAsString(mockedMessageDto));
String s = objectMapper.writeValueAsString(mockedMessageDto);
String s1 = mockedMessageDto.toString();
String s2 = String.valueOf(mockedMessageDto);
log.info(mockedMessageDto.toString().replaceAll("\"", "\\\\\""));
return new ResponseEntity<>("MockedResponse has been setup successfully!", new HttpHeaders(),
HttpStatus.ACCEPTED);
}