diff --git a/Klaus.iml b/Klaus.iml index c442e82..cf2e5bc 100644 --- a/Klaus.iml +++ b/Klaus.iml @@ -34,6 +34,16 @@ + + + + + + + + + + @@ -48,6 +58,7 @@ + @@ -93,20 +104,27 @@ - - - + + + + + + + + + + + + + + + + - - - - - - - + - - + + \ No newline at end of file diff --git a/src/main/java/com/release11/klaus/controller/MainController.java b/src/main/java/com/release11/klaus/controller/MainController.java new file mode 100644 index 0000000..a9a0134 --- /dev/null +++ b/src/main/java/com/release11/klaus/controller/MainController.java @@ -0,0 +1,27 @@ +package com.release11.klaus.controller; + +import lombok.SneakyThrows; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +/** + * Class responsible for returning homepage html + * @author Gabriel Modzelewski + */ +@Controller +@RequestMapping("/") +public class MainController { + /** + * Default path to get the homepage + * @return the view of homepage + */ + @SneakyThrows + @GetMapping + public ModelAndView showHome(){ + ModelAndView mov = new ModelAndView(); + mov.setViewName("html/mock"); + return mov; + } +} diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java index 5a04b10..794d173 100644 --- a/src/main/java/com/release11/klaus/controller/MockController.java +++ b/src/main/java/com/release11/klaus/controller/MockController.java @@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import java.time.LocalDateTime; import java.util.*; @@ -21,23 +20,13 @@ import java.util.*; * @author Gabriel Modzelewski */ @Slf4j -@Controller -@RequestMapping(path = "/") +@RestController +@RequestMapping(path = "/api/mock") @AllArgsConstructor public class MockController { private final KlausService klausService; - /** - * Default path to get the homepage - * @return the view of homepage - */ - @SneakyThrows - @GetMapping - public ModelAndView showHome(){ - ModelAndView mov = new ModelAndView(); - mov.setViewName("html/mock"); - return mov; - } + /** * Updates queried message with given set of data @@ -45,8 +34,7 @@ public class MockController { * @return confirmation and 200 OK */ @SneakyThrows - @ResponseBody - @PutMapping("/mock/json") + @PutMapping("/") public ResponseEntity updateMessage(@RequestBody String body){ ObjectMapper mapper = new ObjectMapper(); MockedMessageDto message = mapper.readValue(body, MockedMessageDto.class); @@ -59,8 +47,7 @@ public class MockController { * @param uuidValue the key-uuid of given set of messages * @return responds with 200 OK and list of {@link MockedMessageDto} */ - @ResponseBody - @GetMapping({"/mock/json", "/mock/json/{uuidValue}"}) + @GetMapping({"/", "/{uuidValue}"}) public List getListOfMessages(@PathVariable(required = false) String uuidValue){ UUID clientUUID; if(uuidValue == null || uuidValue.equals("")) clientUUID = UUID.randomUUID(); @@ -80,8 +67,7 @@ public class MockController { * @param uuidValue the key-uuid of given set of messages * @return confirmation response with 200 OK */ - @ResponseBody - @PostMapping("/mock/json/{uuidValue}") + @PostMapping("/{uuidValue}") public ResponseEntity addNewMessage(@PathVariable String uuidValue){ UUID clientUUID = UUID.fromString(uuidValue); List messages = klausService.getAllMockedResponses(clientUUID); @@ -95,8 +81,7 @@ public class MockController { * @param idValue unique id of given message * @return after deletion the confirmation is send with status 200 OK */ - @ResponseBody - @DeleteMapping("/mock/json/{uuidValue}/{idValue}") + @DeleteMapping("/{uuidValue}/{idValue}") public ResponseEntity removeMessage(@PathVariable String uuidValue, @PathVariable String idValue){ UUID clientUUID = UUID.fromString(uuidValue); @@ -163,7 +148,7 @@ public class MockController { * @param mockedResponseId unique id of given message * @return */ - @GetMapping(value = "/klaus/v1/get/{clientUUID}/{mockedResponseId}") + @GetMapping(value = "/r/{clientUUID}/{mockedResponseId}") public ResponseEntity getMockedResponse(RequestEntity requestEntity, @PathVariable UUID clientUUID, @PathVariable int mockedResponseId) { diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index b3dd6e8..7e6465f 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -38,7 +38,7 @@ $('#btn-addRow').click(function(){addRow()}); $('#btn-save').click(getUpdate); function getData(){ - $.getJSON(host + '/mock/json/'+clientUUID, function(data) { + $.getJSON(host + '/api/mock/'+clientUUID, function(data) { json = data; checkUuid(); console.log(JSON.stringify(json)); @@ -155,7 +155,7 @@ function updateData(){ savedModalDisplay(); } $.ajax({ - url: host + '/mock/json', + url: host + '/api/mock', type: 'PUT', data: JSON.stringify(updatedJson, null, 2), contentType: "application/json", @@ -174,7 +174,7 @@ function callAddMessage(){ function addMessage(){ $.ajax({ - url: host + '/mock/json/'+clientUUID, + url: host + '/api/mock/'+clientUUID, type: 'POST', }).done(dataRefresh); } @@ -192,7 +192,7 @@ function callRemoveMessage(id){ function removeMessage(id){ var jsonObject = findJsonById(id); $.ajax({ - url: host + '/mock/json/'+clientUUID + '/' + id, + url: host + '/api/mock/'+clientUUID + '/' + id, type: 'DELETE', }).done(dataRefresh); } @@ -225,7 +225,7 @@ function fillStaticFields(uuid, id, mediaType, body, httpStatus){ } function createLink(uuid, id){ - var link = host + '/klaus/v1/get/'+uuid+'/'+id; + var link = host + '/api/mock/r/'+uuid+'/'+id; return link; } diff --git a/src/main/resources/static/js/historyloader.js b/src/main/resources/static/js/historyloader.js index fb3b555..3107624 100644 --- a/src/main/resources/static/js/historyloader.js +++ b/src/main/resources/static/js/historyloader.js @@ -33,8 +33,6 @@ const startSearch = function(){ } $('#btn-searchHistory').click(startSearch); -$('#historyFilterSwitch').click(filterSwitch); - function loadHistory(dateFrom, dateTo){ console.log('Request send for history data') var eventRequest = { diff --git a/target/classes/com/release11/klaus/config/SpringFoxConfig.class b/target/classes/com/release11/klaus/config/SpringFoxConfig.class index 0579ec3..0eaf023 100644 Binary files a/target/classes/com/release11/klaus/config/SpringFoxConfig.class and b/target/classes/com/release11/klaus/config/SpringFoxConfig.class differ diff --git a/target/classes/com/release11/klaus/controller/MainController.class b/target/classes/com/release11/klaus/controller/MainController.class new file mode 100644 index 0000000..af210f4 Binary files /dev/null and b/target/classes/com/release11/klaus/controller/MainController.class differ diff --git a/target/classes/com/release11/klaus/controller/MockController.class b/target/classes/com/release11/klaus/controller/MockController.class index c6e5234..0eb3c3e 100644 Binary files a/target/classes/com/release11/klaus/controller/MockController.class and b/target/classes/com/release11/klaus/controller/MockController.class differ diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js index b3dd6e8..7e6465f 100644 --- a/target/classes/static/js/datatransfer.js +++ b/target/classes/static/js/datatransfer.js @@ -38,7 +38,7 @@ $('#btn-addRow').click(function(){addRow()}); $('#btn-save').click(getUpdate); function getData(){ - $.getJSON(host + '/mock/json/'+clientUUID, function(data) { + $.getJSON(host + '/api/mock/'+clientUUID, function(data) { json = data; checkUuid(); console.log(JSON.stringify(json)); @@ -155,7 +155,7 @@ function updateData(){ savedModalDisplay(); } $.ajax({ - url: host + '/mock/json', + url: host + '/api/mock', type: 'PUT', data: JSON.stringify(updatedJson, null, 2), contentType: "application/json", @@ -174,7 +174,7 @@ function callAddMessage(){ function addMessage(){ $.ajax({ - url: host + '/mock/json/'+clientUUID, + url: host + '/api/mock/'+clientUUID, type: 'POST', }).done(dataRefresh); } @@ -192,7 +192,7 @@ function callRemoveMessage(id){ function removeMessage(id){ var jsonObject = findJsonById(id); $.ajax({ - url: host + '/mock/json/'+clientUUID + '/' + id, + url: host + '/api/mock/'+clientUUID + '/' + id, type: 'DELETE', }).done(dataRefresh); } @@ -225,7 +225,7 @@ function fillStaticFields(uuid, id, mediaType, body, httpStatus){ } function createLink(uuid, id){ - var link = host + '/klaus/v1/get/'+uuid+'/'+id; + var link = host + '/api/mock/r/'+uuid+'/'+id; return link; } diff --git a/target/classes/static/js/historyloader.js b/target/classes/static/js/historyloader.js index fb3b555..3107624 100644 --- a/target/classes/static/js/historyloader.js +++ b/target/classes/static/js/historyloader.js @@ -33,8 +33,6 @@ const startSearch = function(){ } $('#btn-searchHistory').click(startSearch); -$('#historyFilterSwitch').click(filterSwitch); - function loadHistory(dateFrom, dateTo){ console.log('Request send for history data') var eventRequest = { diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java index e373326..7101367 100644 --- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java +++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2021-03-26T12:24:03+0100", + date = "2021-03-26T15:18:37+0100", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)" ) @Component diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 9ee6e58..8eb334d 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,30 +1,29 @@ com\release11\klaus\mappers\MockedMessageMapperImpl.class com\release11\klaus\model\Event$EventBuilder.class com\release11\klaus\model\Event.class -com\release11\klaus\controller\KlausController.class com\release11\klaus\service\KlausServiceImpl.class com\release11\klaus\KlausApplication.class com\release11\klaus\repository\MockedResponseRepository.class com\release11\klaus\repository\EventRepositoryImpl.class com\release11\klaus\mappers\MockedMessageMapper.class +com\release11\klaus\controller\MockController.class com\release11\klaus\service\KlausService.class com\release11\klaus\service\EtrackService.class com\release11\klaus\model\MockedMessageDto.class -com\release11\klaus\config\LocalDiscovery.class com\release11\klaus\model\constraints\HttpCodeValidation.class com\release11\klaus\utilis\RedisAppender.class com\release11\klaus\model\MockedMessageDto$MockedMessageDtoBuilder.class com\release11\klaus\config\RedisConfig.class com\release11\klaus\model\MockedMessage.class com\release11\klaus\controller\MvcExceptionHandler.class +com\release11\klaus\config\SpringFoxConfig.class com\release11\klaus\model\EventRequestDto$EventRequestDtoBuilder.class com\release11\klaus\model\EventRequestDto.class com\release11\klaus\utilis\BusinessKey.class com\release11\klaus\controller\EventController.class com\release11\klaus\utilis\TrackingClient.class -com\release11\klaus\config\SwaggerConfig.class com\release11\klaus\service\EtrackServiceImpl.class com\release11\klaus\controller\MainController.class -com\release11\klaus\controller\KlausMvcController.class com\release11\klaus\repository\EventRepository.class com\release11\klaus\model\constraints\HttpCode.class +com\release11\klaus\utilis\ObjectConfig.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 1119936..d892369 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,26 +1,25 @@ -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\MainController.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\Event.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepository.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\EventRequestDto.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\MvcExceptionHandler.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\LocalDiscovery.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\EventController.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\RedisAppender.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCode.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepositoryImpl.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\KlausController.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\KlausApplication.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\mappers\MockedMessageMapper.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\MockedMessage.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\RedisConfig.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\SwaggerConfig.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\EtrackServiceImpl.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\KlausService.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\TrackingClient.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\KlausMvcController.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\KlausServiceImpl.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\MockedMessageDto.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\EtrackService.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\BusinessKey.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\config\RedisConfig.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\KlausService.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\TrackingClient.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\Event.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\MainController.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\repository\EventRepository.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\config\SpringFoxConfig.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\EtrackService.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\KlausServiceImpl.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\MockController.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\EventController.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\MockedMessage.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\EventRequestDto.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\EtrackServiceImpl.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\mappers\MockedMessageMapper.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\MockedMessageDto.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\MvcExceptionHandler.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\RedisAppender.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\constraints\HttpCode.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\BusinessKey.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\KlausApplication.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\repository\EventRepositoryImpl.java +C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\ObjectConfig.java