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

T157 Multiple messages loaded

Browse Source
This commit is contained in:
Gabriel Modzelewski
2021-01-29 16:34:40 +01:00
parent 902e30db12
commit ec9711416f
4 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -21,7 +21,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment=""> <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/static/css/main.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/main.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
</list> </list>
@@ -307,7 +307,7 @@
<workItem from="1611659140629" duration="2109000" /> <workItem from="1611659140629" duration="2109000" />
<workItem from="1611757446709" duration="6743000" /> <workItem from="1611757446709" duration="6743000" />
<workItem from="1611826821050" duration="10679000" /> <workItem from="1611826821050" duration="10679000" />
<workItem from="1611915874625" duration="9546000" /> <workItem from="1611915874625" duration="12081000" />
</task> </task>
<task id="LOCAL-00077" summary="testing jenkins docker"> <task id="LOCAL-00077" summary="testing jenkins docker">
<created>1601453886631</created> <created>1601453886631</created>

44
src/main/java/com/release11/klaus/controller/KlausMvcController.java
View File

@@ -123,6 +123,9 @@ public class KlausMvcController {
return "mock"; return "mock";
} }
//TODO: Remove multiplication.
//TODO: Add default message as template to resources
@GetMapping({"/mock/json", "/mock/json/{uuid}"}) @GetMapping({"/mock/json", "/mock/json/{uuid}"})
@ResponseBody @ResponseBody
public List<MockedMessageDto> getJsonList(final MockedMessageDto mockedMessageDto, final Model model, public List<MockedMessageDto> getJsonList(final MockedMessageDto mockedMessageDto, final Model model,
@@ -149,6 +152,44 @@ public class KlausMvcController {
.httpStatus(200) .httpStatus(200)
.build(); .build();
messages.add(msg); 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("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<note>\n" +
" <to>Tove</to>\n" +
" <from>Jani</from>\n" +
" <heading>Reminder</heading>\n" +
" <body>Don't forget me this weekend!</body>\n" +
"</note>")
.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("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<note>\n" +
" <to>Tove</to>\n" +
" <from>Jani</from>\n" +
" <heading>Reminder</heading>\n" +
" <body>Don't forget me this weekend!</body>\n" +
"</note>")
.httpHeaders(headers)
.httpStatus(500)
.build();
messages.add(msg);
} }
return messages; return messages;
} }
@@ -164,6 +205,9 @@ public class KlausMvcController {
return UUID.randomUUID(); return UUID.randomUUID();
} }
//TODO: Remove
@Deprecated
private void getModelMockedMessageDto(Model model, MockedMessageDto mockedMessageDto) { private void getModelMockedMessageDto(Model model, MockedMessageDto mockedMessageDto) {
if (mockedMessageDto.getMockedResponseId() == null){ if (mockedMessageDto.getMockedResponseId() == null){
Map<String, String> headers = new HashMap<>(); Map<String, String> headers = new HashMap<>();

16
src/main/resources/static/js/datatransfer.js
View File

@@ -1,7 +1,8 @@
var json;
function getData(uuid){ function getData(uuid){
$.getJSON('http://localhost:8097/mock/json', function(json) { $.getJSON('http://localhost:8097/mock/json', function(data) {
fillMessageList(json); json = data;
fillMessageList();
initializeMock(json, 0) initializeMock(json, 0)
}); });
} }
@@ -60,13 +61,16 @@ function generateHeaderTable(headers){
return innerHTML; return innerHTML;
} }
function fillMessageList(json){ function fillMessageList(){
var innerHTML = generateMessageTileHtml(json[0].mockedResponseId, json[0].httpStatus, json[0].mediaType); var innerHTML = '';
for(let i=0; i<json.length; i++){
innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType);
}
$("#listItems").append(innerHTML); $("#listItems").append(innerHTML);
} }
function generateMessageTileHtml(id, httpStatus, mediaType){ function generateMessageTileHtml(id, httpStatus, mediaType){
var innerHTML = '<div class="menuItem">' + var innerHTML = '<div class="menuItem" id="item' + id + '">' +
'<table><tr><td>Id: '+ id +'</td></tr>' + '<table><tr><td>Id: '+ id +'</td></tr>' +
// '<tr><td>Content-type: '+mediaType+'</td></tr>' + // '<tr><td>Content-type: '+mediaType+'</td></tr>' +
'<tr><td>Http-status: '+ httpStatus +'</td></tr>' + '<tr><td>Http-status: '+ httpStatus +'</td></tr>' +

4
src/main/resources/templates/mock.html
View File

@@ -16,9 +16,7 @@
<div id="selectMenu"> <div id="selectMenu">
<div id="selectMenuContent" style="display: none;"> <div id="selectMenuContent" style="display: none;">
<div id="selectMenuHead" class="articleHead">List</div> <div id="selectMenuHead" class="articleHead">List</div>
<div id="listItems"> <div id="listItems"></div>
<div class="menuItemSelected">Item</div>
</div>
<div id="iconPlus" class="menuItem"><i class="icon-plus"></i></div> <div id="iconPlus" class="menuItem"><i class="icon-plus"></i></div>
</div> </div>