From ec9711416fe313d0d71512b9db572e9daa69fb89 Mon Sep 17 00:00:00 2001 From: modzeleg Date: Fri, 29 Jan 2021 16:34:40 +0100 Subject: [PATCH] T157 Multiple messages loaded --- .idea/workspace.xml | 4 +- .../klaus/controller/KlausMvcController.java | 44 +++++++++++++++++++ src/main/resources/static/js/datatransfer.js | 16 ++++--- src/main/resources/templates/mock.html | 4 +- 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3584462..fcb9231 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -21,7 +21,7 @@ - + @@ -307,7 +307,7 @@ - + 1601453886631 diff --git a/src/main/java/com/release11/klaus/controller/KlausMvcController.java b/src/main/java/com/release11/klaus/controller/KlausMvcController.java index 6aa6890..ab56e4a 100644 --- a/src/main/java/com/release11/klaus/controller/KlausMvcController.java +++ b/src/main/java/com/release11/klaus/controller/KlausMvcController.java @@ -123,6 +123,9 @@ public class KlausMvcController { return "mock"; } + + //TODO: Remove multiplication. + //TODO: Add default message as template to resources @GetMapping({"/mock/json", "/mock/json/{uuid}"}) @ResponseBody public List getJsonList(final MockedMessageDto mockedMessageDto, final Model model, @@ -149,6 +152,44 @@ public class KlausMvcController { .httpStatus(200) .build(); messages.add(msg); + headers = new HashMap<>(); + headers.put("Keep-Alive", "timeout=60"); + headers.put("Connection", "keep-alive"); + headers.put("Date", LocalDateTime.now().toString()); + msg = MockedMessageDto.builder() + .clientUUID(uuid) + .mockedResponseId(2) + .mediaType(MediaType.APPLICATION_XML_VALUE) + .messageBody("\n" + + "\n" + + " Tove\n" + + " Jani\n" + + " Reminder\n" + + " Don't forget me this weekend!\n" + + "") + .httpHeaders(headers) + .httpStatus(404) + .build(); + messages.add(msg); + headers = new HashMap<>(); + headers.put("Keep-Alive", "timeout=60"); + headers.put("Connection", "keep-alive"); + headers.put("Date", LocalDateTime.now().toString()); + msg = MockedMessageDto.builder() + .clientUUID(uuid) + .mockedResponseId(3) + .mediaType(MediaType.APPLICATION_XML_VALUE) + .messageBody("\n" + + "\n" + + " Tove\n" + + " Jani\n" + + " Reminder\n" + + " Don't forget me this weekend!\n" + + "") + .httpHeaders(headers) + .httpStatus(500) + .build(); + messages.add(msg); } return messages; } @@ -164,6 +205,9 @@ public class KlausMvcController { return UUID.randomUUID(); } + + //TODO: Remove + @Deprecated private void getModelMockedMessageDto(Model model, MockedMessageDto mockedMessageDto) { if (mockedMessageDto.getMockedResponseId() == null){ Map headers = new HashMap<>(); diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index 3b4c9fa..493a944 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -1,7 +1,8 @@ - +var json; function getData(uuid){ - $.getJSON('http://localhost:8097/mock/json', function(json) { - fillMessageList(json); + $.getJSON('http://localhost:8097/mock/json', function(data) { + json = data; + fillMessageList(); initializeMock(json, 0) }); } @@ -60,13 +61,16 @@ function generateHeaderTable(headers){ return innerHTML; } -function fillMessageList(json){ - var innerHTML = generateMessageTileHtml(json[0].mockedResponseId, json[0].httpStatus, json[0].mediaType); +function fillMessageList(){ + var innerHTML = ''; + for(let i=0; i' + '' + // '' + '' + diff --git a/src/main/resources/templates/mock.html b/src/main/resources/templates/mock.html index 446a00a..84acb29 100644 --- a/src/main/resources/templates/mock.html +++ b/src/main/resources/templates/mock.html @@ -16,9 +16,7 @@
Id: '+ id +'
Content-type: '+mediaType+'
Http-status: '+ httpStatus +'