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

T127 mock services path changed to /mock

Browse Source
This commit is contained in:
gmod11
2021-01-08 17:38:59 +01:00
parent b3d8045d2a
commit 804b2ec3ae
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -20,7 +20,10 @@
</component> </component>
<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$/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/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
import java.util.*; import java.util.*;
/** /**
* Sending GET request to path /home sets up a new UUID ex. 58b9709d-358b-4713-8fbc-6acf89e81418 * Sending GET request to path /mock sets up a new UUID ex. 58b9709d-358b-4713-8fbc-6acf89e81418
* UUID is something like session id type which contains references to each saved message * UUID is something like session id type which contains references to each saved message
* Next saved massage shares UUID but its id is a +1 ex. * Next saved massage shares UUID but its id is a +1 ex.
* 58b9709d-358b-4713-8fbc-6acf89e81418/1; 58b9709d-358b-4713-8fbc-6acf89e81418/2 etc. * 58b9709d-358b-4713-8fbc-6acf89e81418/1; 58b9709d-358b-4713-8fbc-6acf89e81418/2 etc.
@@ -36,7 +36,7 @@ public class KlausMvcController {
private final Set<MockedMessageDto> globalMockedMessageDtoList = new HashSet<>(); private final Set<MockedMessageDto> globalMockedMessageDtoList = new HashSet<>();
@SneakyThrows @SneakyThrows
@GetMapping({"/home", "/home/{uuid}"}) @GetMapping({"/mock", "/mock/{uuid}"})
public String showHome(final MockedMessageDto mockedMessageDto, final Model model, public String showHome(final MockedMessageDto mockedMessageDto, final Model model,
@RequestParam(required = false) UUID clientUUID, @RequestParam(required = false) UUID clientUUID,
@PathVariable(required = false) UUID uuid) { @PathVariable(required = false) UUID uuid) {
@@ -47,7 +47,7 @@ public class KlausMvcController {
return "index"; return "index";
} }
@PostMapping("/home/{uuid}") @PostMapping("/mock/{uuid}")
public String showHomePost(@Valid MockedMessageDto mockedMessageDto, BindingResult bindingResult, Model model) { public String showHomePost(@Valid MockedMessageDto mockedMessageDto, BindingResult bindingResult, Model model) {
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse", TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse",
BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()), BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
@@ -63,7 +63,7 @@ public class KlausMvcController {
return "index"; return "index";
} }
@PostMapping(value="/home/{uuid}", params={"newMessage"}) @PostMapping(value="/mock/{uuid}", params={"newMessage"})
public String newMessage(Model model, @RequestParam UUID clientUUID) { public String newMessage(Model model, @RequestParam UUID clientUUID) {
MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, new LinkedHashMap<>()); MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, new LinkedHashMap<>());
populateModelVars(model, mockedMessageDto, true); populateModelVars(model, mockedMessageDto, true);
@@ -71,7 +71,7 @@ public class KlausMvcController {
return "index"; return "index";
} }
@GetMapping("/home/getMockedResponse") @GetMapping("/mock/getMockedResponse")
@ResponseBody @ResponseBody
public String showGetMockedResponse(MockedMessageDto mockedMessageDto) throws JsonProcessingException { public String showGetMockedResponse(MockedMessageDto mockedMessageDto) throws JsonProcessingException {
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse", TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
@@ -81,7 +81,7 @@ public class KlausMvcController {
mockedMessageDto.getMockedResponseId()).toString(); mockedMessageDto.getMockedResponseId()).toString();
} }
@PostMapping(value = "/home/{uuid}", params = {"addHeader"} ) @PostMapping(value = "/mock/{uuid}", params = {"addHeader"} )
public String addHeader(MockedMessageDto mockedMessageDto, @RequestParam String headerKey, public String addHeader(MockedMessageDto mockedMessageDto, @RequestParam String headerKey,
@RequestParam String headerValue, final Model model) { @RequestParam String headerValue, final Model model) {
populateModelVars(model, mockedMessageDto,false); populateModelVars(model, mockedMessageDto,false);
@@ -89,14 +89,14 @@ public class KlausMvcController {
return "index"; return "index";
} }
@PostMapping(value="/home/{uuid}", params={"removeHeader"}) @PostMapping(value="/mock/{uuid}", params={"removeHeader"})
public String removeHeader(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) { public String removeHeader(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
populateModelVars(model, mockedMessageDto,false); populateModelVars(model, mockedMessageDto,false);
mockedMessageDto.getHttpHeaders().remove(req.getParameter("removeHeader")); mockedMessageDto.getHttpHeaders().remove(req.getParameter("removeHeader"));
return "index"; return "index";
} }
@PostMapping(value="/home/{uuid}", params={"updateMessage"}) @PostMapping(value="/mock/{uuid}", params={"updateMessage"})
public String updateMessage(final HttpServletRequest req, MockedMessageDto mockedMessageDto, final Model model) { public String updateMessage(final HttpServletRequest req, MockedMessageDto mockedMessageDto, final Model model) {
populateModelVars(model, mockedMessageDto, false); populateModelVars(model, mockedMessageDto, false);
model.addAttribute("mockedMessageDto", klausService.getMockedResponse(mockedMessageDto.getClientUUID(), model.addAttribute("mockedMessageDto", klausService.getMockedResponse(mockedMessageDto.getClientUUID(),
@@ -105,7 +105,7 @@ public class KlausMvcController {
return "index"; return "index";
} }
@PostMapping(value="/home/{uuid}", params={"removeMessage"}) @PostMapping(value="/mock/{uuid}", params={"removeMessage"})
public String removeMessage(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) { public String removeMessage(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "deleteMockedResponse", TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "deleteMockedResponse",
BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()), BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),

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

@@ -35,7 +35,7 @@
<table> <table>
<p>In order to change mockup response settings please fill the form below and save.</p> <p>In order to change mockup response settings please fill the form below and save.</p>
<form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}" <form action="#" th:action="@{/mock/__${mockedMessageDto.clientUUID}__}"
th:object="${mockedMessageDto}" method="post"> th:object="${mockedMessageDto}" method="post">
<input type="text" th:field="*{clientUUID}" hidden/> <input type="text" th:field="*{clientUUID}" hidden/>
<tr> <tr>
@@ -160,7 +160,7 @@
<div id="list-wrapper" style="display: none;"> <div id="list-wrapper" style="display: none;">
<p>Here you can see the interactive list of all your mocked messages. You can call all of them. Use <p>Here you can see the interactive list of all your mocked messages. You can call all of them. Use
the buttons to sort the list and also update or delete messages.</p> the buttons to sort the list and also update or delete messages.</p>
<form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}" <form action="#" th:action="@{/mock/__${mockedMessageDto.clientUUID}__}"
th:object="${mockedMessageDto}" method="post"> th:object="${mockedMessageDto}" method="post">
<table> <table>
<thead> <thead>

18
src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
View File

@@ -59,7 +59,7 @@ class KlausMvcControllerTest {
when(klausService.getAllMockedResponses(any())) when(klausService.getAllMockedResponses(any()))
.thenReturn(mockedMessageDtoList); .thenReturn(mockedMessageDtoList);
mockMvc.perform(get("/home/" + uuid)) mockMvc.perform(get("/mock/" + uuid))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(view().name("index")) .andExpect(view().name("index"))
.andExpect(model().attributeExists("mockedMessageDtoList")); .andExpect(model().attributeExists("mockedMessageDtoList"));
@@ -69,7 +69,7 @@ class KlausMvcControllerTest {
@Test @Test
void showHomePost() throws Exception { void showHomePost() throws Exception {
mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6") .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("mockedResponseId", "323") .param("mockedResponseId", "323")
.param("mediaType", "application/json") .param("mediaType", "application/json")
@@ -84,7 +84,7 @@ class KlausMvcControllerTest {
@Test @Test
void showHomePostNotValid() throws Exception { void showHomePostNotValid() throws Exception {
// mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
// .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
// .param("mockedResponseId", "aaaa") // .param("mockedResponseId", "aaaa")
// .param("mediaType", "application/json") // .param("mediaType", "application/json")
@@ -101,7 +101,7 @@ class KlausMvcControllerTest {
when(klausService.getAllMockedResponses(any())) when(klausService.getAllMockedResponses(any()))
.thenReturn(mockedMessageDtoList); .thenReturn(mockedMessageDtoList);
mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("newMessage", "newMessage") .param("newMessage", "newMessage")
.param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")) .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
.andExpect(status().isOk()) .andExpect(status().isOk())
@@ -116,7 +116,7 @@ class KlausMvcControllerTest {
when(klausService.getMockedResponse(any(), anyInt())) when(klausService.getMockedResponse(any(), anyInt()))
.thenReturn(mockedMessageDto); .thenReturn(mockedMessageDto);
mockMvc.perform(get("/home/getMockedResponse") mockMvc.perform(get("/mock/getMockedResponse")
.param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6") .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("mockedResponseId", "323") .param("mockedResponseId", "323")
.param("mediaType", "application/json") .param("mediaType", "application/json")
@@ -132,7 +132,7 @@ class KlausMvcControllerTest {
// when(klausService.getAllMockedResponses(any())) // when(klausService.getAllMockedResponses(any()))
// .thenReturn(mockedMessageDtoList); // .thenReturn(mockedMessageDtoList);
// //
// mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
// .param("addHeader", "addHeader") // .param("addHeader", "addHeader")
// .param("headerKey", "myKey") // .param("headerKey", "myKey")
// .param("headerValue", "myValue") // .param("headerValue", "myValue")
@@ -149,7 +149,7 @@ class KlausMvcControllerTest {
// when(klausService.getAllMockedResponses(any())) // when(klausService.getAllMockedResponses(any()))
// .thenReturn(mockedMessageDtoList); // .thenReturn(mockedMessageDtoList);
// //
// mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
// .param("removeHeader", "removeHeader") // .param("removeHeader", "removeHeader")
// .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")) // .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
// .andExpect(status().isOk()) // .andExpect(status().isOk())
@@ -166,7 +166,7 @@ class KlausMvcControllerTest {
when(klausService.getMockedResponse(any(), anyInt())). when(klausService.getMockedResponse(any(), anyInt())).
thenReturn(mockedMessageDto); thenReturn(mockedMessageDto);
mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("updateMessage", "323")) .param("updateMessage", "323"))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(view().name("index")) .andExpect(view().name("index"))
@@ -182,7 +182,7 @@ class KlausMvcControllerTest {
when(klausService.getAllMockedResponses(any())) when(klausService.getAllMockedResponses(any()))
.thenReturn(mockedMessageDtoList); .thenReturn(mockedMessageDtoList);
mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("removeMessage", "323")) .param("removeMessage", "323"))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(view().name("index")) .andExpect(view().name("index"))