T248 T245 /mock/json path changed to /api/mock; mapping '/' moved to MainController

Klaus.iml

@@ -34,6 +34,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.1.RELEASE" level="project" />
@@ -48,6 +58,7 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" level="project" />
@@ -93,20 +104,27 @@
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.4.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.11" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.11" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
   </component>
 </module>

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;
+    }
+}

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
+@RestController
-@RequestMapping(path = "/")
+@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("/")
-    @PutMapping("/mock/json")
     public ResponseEntity<String> 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({"/", "/{uuidValue}"})
-    @GetMapping({"/mock/json", "/mock/json/{uuidValue}"})
     public List<MockedMessageDto> 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("/{uuidValue}")
-    @PostMapping("/mock/json/{uuidValue}")
     public ResponseEntity<String> addNewMessage(@PathVariable String uuidValue){
         UUID clientUUID = UUID.fromString(uuidValue);
         List<MockedMessageDto> 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("/{uuidValue}/{idValue}")
-    @DeleteMapping("/mock/json/{uuidValue}/{idValue}")
     public ResponseEntity<String> 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<String> requestEntity,
                                             @PathVariable UUID clientUUID,
                                             @PathVariable int mockedResponseId) {

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;
 }
 

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 = {

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;
 }
 

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 = {

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

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

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
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\config\RedisConfig.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\Event.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\KlausService.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\TrackingClient.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepository.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\Event.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\EventRequestDto.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\MainController.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\MvcExceptionHandler.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\repository\EventRepository.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\LocalDiscovery.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\config\SpringFoxConfig.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\EventController.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\EtrackService.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\RedisAppender.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\KlausServiceImpl.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\MockController.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCode.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\EventController.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepositoryImpl.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\MockedMessage.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\KlausController.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\EventRequestDto.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\KlausApplication.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\mappers\MockedMessageMapper.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\MockedMessage.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\service\EtrackServiceImpl.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\RedisConfig.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\mappers\MockedMessageMapper.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\SwaggerConfig.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\MockedMessageDto.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\EtrackServiceImpl.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\controller\MvcExceptionHandler.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\KlausService.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\RedisAppender.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\TrackingClient.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\model\constraints\HttpCode.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\KlausMvcController.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\BusinessKey.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\KlausServiceImpl.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\KlausApplication.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\MockedMessageDto.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\repository\EventRepositoryImpl.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\service\EtrackService.java
+C:\Users\Gabriel Modzelewski\.phabricator\mockedservices\src\main\java\com\release11\klaus\utilis\ObjectConfig.java
-D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\BusinessKey.java