diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7db65c9..d6ef91c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -23,49 +23,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -668,7 +633,6 @@ @@ -708,9 +673,10 @@ - - + + + @@ -745,39 +711,39 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -827,11 +793,11 @@ - - + + - + diff --git a/src/main/java/com/release11/klaus/controller/KlausMvcController.java b/src/main/java/com/release11/klaus/controller/KlausMvcController.java index 6f40884..0033288 100644 --- a/src/main/java/com/release11/klaus/controller/KlausMvcController.java +++ b/src/main/java/com/release11/klaus/controller/KlausMvcController.java @@ -120,9 +120,7 @@ public class KlausMvcController { return UUID.randomUUID(); } - public void getModelMockedMessageDto(Model model, MockedMessageDto mockedMessageDto) { - System.out.println(mockedMessageDto); - System.out.println(globalMockedMessageDto); + private void getModelMockedMessageDto(Model model, MockedMessageDto mockedMessageDto) { if (mockedMessageDto.getMockedResponseId() == null){ Map headers = new HashMap<>(); headers.put("Keep-Alive", "timeout=60"); @@ -163,4 +161,8 @@ public class KlausMvcController { getModelMockedMessageDto(model, mockedMessageDto); } + public static MockedMessageDto getGlobalMockedMessageDto() { + return globalMockedMessageDto; + } + } \ No newline at end of file diff --git a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java index ad6be86..4222d09 100644 --- a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java +++ b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java @@ -1,5 +1,6 @@ package com.release11.klaus.service; +import com.release11.klaus.controller.KlausMvcController; import com.release11.klaus.mappers.MockedMessageMapper; import com.release11.klaus.model.MockedMessage; import com.release11.klaus.model.MockedMessageDto; @@ -41,10 +42,10 @@ public class KlausServiceImpl implements KlausService { public MockedMessageDto getMockedResponse(UUID clientUUID, int mockedResponseId) { String key = clientUUID.toString() + "_" + mockedResponseId; Optional optionalMockedMessage = mockedResponseRepository.findById(key); - MockedMessageDto mockedMessageDto = new MockedMessageDto(); + MockedMessageDto mockedMessageDto = KlausMvcController.getGlobalMockedMessageDto(); if (optionalMockedMessage.isPresent()) { mockedMessageDto = mockedMessageMapper.mockedMessageToMockedMessageDto(optionalMockedMessage.get()); - log.info(mockedMessageDto.toString().replaceAll("\"","\\\"")); + log.info(mockedMessageDto.toString().replaceAll("\"","\\\\\"")); return mockedMessageDto; } log.info(mockedMessageDto.toString()); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index eca6395..651420c 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,7 +3,7 @@ - localhost + redis 6379 logstash diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 6e49b0f..d5232c4 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -18,33 +18,58 @@
-

With this tool you can create mockups for http requests and use them for integration tests of your system.

-
-
- +

With this tool you can create mockups for http requests and use them for integration tests of + your system.

+

-

In order to set mockup response please fill the form below:

+

You can test the mocked message using the url or the button below:

+ + + + +
+

+ http://[[${localhost}]]:8097/klaus/v1/get/[[${mockedMessageDto.clientUUID}]]/[[${mockedMessageDto.mockedResponseId}]]

+ 		+
+ + + +
+
+
+ + +

In order to set or update mockup response please fill the form below and save + your message:

- - - + + + - + - @@ -53,30 +78,35 @@ - + - + - - + + + @@ -97,60 +127,57 @@

-
Mocked response id:Id - Error - Media type:
Mocked response body: Body Error + Body Error +
Mocked response http code status: HttpStatus Error + + HttpStatus Error
Header value
- +
- +
Media type:Mocked response id:Id + Error +
-
- - -

-
-

Mock has been saved


-
- - - - - - - - - - - - -
-

#

- 		-

MessageId

- 		-

Media Type

- 		-

Http Status

-
-
-
-
-
+
-
+
+

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.

+
+ + + + + + + + + + + + +
+

#

+ 		+

MessageId

+ 		+

Media Type

+ 		+

Http Status

+
+
+
+
+
+
-
If you are keen to use the mocking service with bigger amount of messages or automate the process by inserting - high amount of random messages please consider using the tools below: +
If you are keen to use the mocking service with bigger amount of messages or automate the process by + inserting + high amount of random messages please consider using swagger or send batch requests on the urls below: -
http://[[${localhost}]]:8097/swagger-ui.html +
http://[[${localhost}]]:8097/swagger-ui.html

http://[[${localhost}]]:8097/klaus/v1/delete/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
http://[[${localhost}]]:8097/klaus/v1/set/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}?httpStatus={httpStatus} @@ -160,14 +187,15 @@
- - + + diff --git a/target/classes/bootstrap-PROD.yml b/target/classes/bootstrap-PROD.yml new file mode 100644 index 0000000..c9a2696 --- /dev/null +++ b/target/classes/bootstrap-PROD.yml @@ -0,0 +1,25 @@ +spring: + profiles: + active: PROD + application: + name: klaus + cloud: + spring: + cloud: + config: + fail-fast: false + uri: http://s5000xvn.zipper.release11.com:8888 + retry: + max-attempts: 20 + max-interval: 15000 + initial-interval: 10000 +server: + port: 8097 + +eureka: + client: + enabled: true + register-with-eureka: true + fetch-registry: true + serviceUrl: + defaultZone: http://netflix:eureka@eureka:8761/eureka diff --git a/target/classes/bootstrap.yml b/target/classes/bootstrap.yml new file mode 100644 index 0000000..b6615a6 --- /dev/null +++ b/target/classes/bootstrap.yml @@ -0,0 +1,24 @@ +spring: +# profiles: +# active: DEV + application: + name: klaus + cloud: + spring: + cloud: + config: + uri: http://s5000xvn.zipper.release11.com:8888 + retry: + max-attempts: 20 + max-interval: 15000 + initial-interval: 10000 +server: + port: 8097 + +eureka: + client: + enabled: true + register-with-eureka: true + fetch-registry: true + serviceUrl: + defaultZone: http://netflix:eureka@localhost:8761/eureka diff --git a/target/classes/com/release11/klaus/controller/KlausMvcController.class b/target/classes/com/release11/klaus/controller/KlausMvcController.class index 16043db..7a73a22 100644 Binary files a/target/classes/com/release11/klaus/controller/KlausMvcController.class and b/target/classes/com/release11/klaus/controller/KlausMvcController.class differ diff --git a/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class index 09147d8..14ce588 100644 Binary files a/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class and b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class differ diff --git a/target/classes/com/release11/klaus/service/KlausServiceImpl.class b/target/classes/com/release11/klaus/service/KlausServiceImpl.class index 6452916..e760dc2 100644 Binary files a/target/classes/com/release11/klaus/service/KlausServiceImpl.class and b/target/classes/com/release11/klaus/service/KlausServiceImpl.class differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml index eca6395..651420c 100644 --- a/target/classes/logback.xml +++ b/target/classes/logback.xml @@ -3,7 +3,7 @@ - localhost + redis 6379 logstash diff --git a/target/classes/templates/index.html b/target/classes/templates/index.html index 6e49b0f..d5232c4 100644 --- a/target/classes/templates/index.html +++ b/target/classes/templates/index.html @@ -18,33 +18,58 @@
-

With this tool you can create mockups for http requests and use them for integration tests of your system.

-
-
- +

With this tool you can create mockups for http requests and use them for integration tests of + your system.

+

-

In order to set mockup response please fill the form below:

+

You can test the mocked message using the url or the button below:

+ + + + +
+

+ http://[[${localhost}]]:8097/klaus/v1/get/[[${mockedMessageDto.clientUUID}]]/[[${mockedMessageDto.mockedResponseId}]]

+ 		+
+ + + +
+
+
+ + +

In order to set or update mockup response please fill the form below and save + your message:

- - - + + + - + - @@ -53,30 +78,35 @@ - + - + - - + + + @@ -97,60 +127,57 @@

-
Mocked response id:Id - Error - Media type:
Mocked response body: Body Error + Body Error +
Mocked response http code status: HttpStatus Error + + HttpStatus Error
Header value
- +
- +
Media type:Mocked response id:Id + Error +
-
- - -

-
-

Mock has been saved


-
- - - - - - - - - - - - -
-

#

- 		-

MessageId

- 		-

Media Type

- 		-

Http Status

-
-
-
-
-
+
-
+
+

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.

+
+ + + + + + + + + + + + +
+

#

+ 		+

MessageId

+ 		+

Media Type

+ 		+

Http Status

+
+
+
+
+
+
-
If you are keen to use the mocking service with bigger amount of messages or automate the process by inserting - high amount of random messages please consider using the tools below: +
If you are keen to use the mocking service with bigger amount of messages or automate the process by + inserting + high amount of random messages please consider using swagger or send batch requests on the urls below: -
http://[[${localhost}]]:8097/swagger-ui.html +
http://[[${localhost}]]:8097/swagger-ui.html

http://[[${localhost}]]:8097/klaus/v1/delete/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
http://[[${localhost}]]:8097/klaus/v1/set/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}?httpStatus={httpStatus} @@ -160,14 +187,15 @@
- - + + diff --git a/target/classes/templates/temp.html b/target/classes/templates/temp.html new file mode 100644 index 0000000..ba95957 --- /dev/null +++ b/target/classes/templates/temp.html @@ -0,0 +1,100 @@ + + + + + Title + + + + +
+ +
+ +
+
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et + commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. + Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec + lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est + euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec + fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, + consequat quis, neque

+
+
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et + commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. + Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec + lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est + euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec + fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, + consequat quis, neque

+
+
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et + commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. + Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec + lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est + euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec + fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, + consequat quis, neque

+
+
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et + commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. + Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec + lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est + euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec + fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, + consequat quis, neque

+
+
+
+
+ +
+ + + +