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

MessageDto instead of String in Event history

Browse Source
This commit is contained in:
Szakalakamaka
2020-11-19 11:33:54 +01:00
parent 52893c2888
commit 1a77fda308
5 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
.idea/workspace.xml generated
View File

@@ -24,22 +24,9 @@
<component name="ChangeListManager">
<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/EventController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/EventController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/model/Event.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/model/Event.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/static/js/etrackPaggination.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/etrackPaggination.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/etrack.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/etrack.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/EventController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/EventController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/model/Event$EventBuilder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/model/Event$EventBuilder.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/model/Event.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/model/Event.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/service/KlausServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/service/KlausServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/logback.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/static/js/etrackPaggination.js" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/js/etrackPaggination.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -299,13 +286,6 @@
<option name="presentableId" value="Default" />
<updated>1598862102028</updated>
</task>
<task id="LOCAL-00069" summary="moving docker to a separate package">
<created>1601381175986</created>
<option name="number" value="00069" />
<option name="presentableId" value="LOCAL-00069" />
<option name="project" value="LOCAL" />
<updated>1601381175986</updated>
</task>
<task id="LOCAL-00070" summary="testing Jenkinsfile">
<created>1601383415894</created>
<option name="number" value="00070" />
@@ -642,7 +622,14 @@
<option name="project" value="LOCAL" />
<updated>1605708181861</updated>
</task>
<option name="localTasksCounter" value="118" />
<task id="LOCAL-00118" summary="MessageDto instead of String in Event history">
<created>1605777291756</created>
<option name="number" value="00118" />
<option name="presentableId" value="LOCAL-00118" />
<option name="project" value="LOCAL" />
<updated>1605777291757</updated>
</task>
<option name="localTasksCounter" value="119" />
<servers />
</component>
<component name="UnknownFeatures">
@@ -750,68 +737,68 @@
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602662342585" />
<state x="2606" y="235" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501503902" />
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
<state width="1877" height="267" key="GridCell.Tab.0.bottom" timestamp="1605721034181">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1493" height="55" key="GridCell.Tab.0.bottom" timestamp="1605781410418">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="99" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605701721838" />
<state width="1877" height="267" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721034181" />
<state width="1493" height="55" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410418" />
<state width="1877" height="267" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684342" />
<state width="1493" height="89" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604916507124" />
<state width="1877" height="315" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501251887" />
<state width="1493" height="185" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
<state width="1877" height="267" key="GridCell.Tab.0.center" timestamp="1605721034181">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1493" height="55" key="GridCell.Tab.0.center" timestamp="1605781410418">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="99" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605701721838" />
<state width="1877" height="267" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721034181" />
<state width="1493" height="55" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410418" />
<state width="1877" height="267" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684342" />
<state width="1493" height="89" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604916507123" />
<state width="1877" height="315" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501251887" />
<state width="1493" height="185" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
<state width="1877" height="267" key="GridCell.Tab.0.left" timestamp="1605721034181">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1493" height="55" key="GridCell.Tab.0.left" timestamp="1605781410417">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="99" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605701721838" />
<state width="1877" height="267" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721034181" />
<state width="1493" height="55" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410417" />
<state width="1877" height="267" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684342" />
<state width="1493" height="89" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604916507123" />
<state width="1877" height="315" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501251887" />
<state width="1493" height="185" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1605634220570" />
<state width="1877" height="267" key="GridCell.Tab.0.right" timestamp="1605721034181">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1493" height="55" key="GridCell.Tab.0.right" timestamp="1605781410418">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="99" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605701721838" />
<state width="1877" height="267" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721034181" />
<state width="1493" height="55" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410418" />
<state width="1877" height="267" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684342" />
<state width="1493" height="89" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604916507123" />
<state width="1877" height="315" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501251887" />
<state width="1493" height="185" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
<state width="1877" height="267" key="GridCell.Tab.1.bottom" timestamp="1605721061519">
<state width="1877" height="267" key="GridCell.Tab.1.bottom" timestamp="1605721684343">
<screen x="1920" y="0" width="1920" height="1040" />
</state>
<state width="1493" height="67" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605699975611" />
<state width="1877" height="267" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721061519" />
<state width="1877" height="267" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684343" />
<state width="1877" height="297" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602672852817" />
<state width="1493" height="252" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1605633861934" />
<state width="1877" height="267" key="GridCell.Tab.1.center" timestamp="1605721061519">
<state width="1877" height="267" key="GridCell.Tab.1.center" timestamp="1605721684343">
<screen x="1920" y="0" width="1920" height="1040" />
</state>
<state width="1493" height="67" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605699975610" />
<state width="1877" height="267" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721061519" />
<state width="1877" height="267" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684343" />
<state width="1877" height="297" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602672852817" />
<state width="1493" height="252" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1605633861934" />
<state width="1877" height="267" key="GridCell.Tab.1.left" timestamp="1605721061519">
<state width="1877" height="267" key="GridCell.Tab.1.left" timestamp="1605721684342">
<screen x="1920" y="0" width="1920" height="1040" />
</state>
<state width="1493" height="67" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605699975610" />
<state width="1877" height="267" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721061519" />
<state width="1877" height="267" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684342" />
<state width="1877" height="297" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602672852817" />
<state width="1493" height="252" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1605633861934" />
<state width="1877" height="267" key="GridCell.Tab.1.right" timestamp="1605721061519">
<state width="1877" height="267" key="GridCell.Tab.1.right" timestamp="1605721684343">
<screen x="1920" y="0" width="1920" height="1040" />
</state>
<state width="1493" height="67" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605699975611" />
<state width="1877" height="267" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721061519" />
<state width="1877" height="267" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605721684343" />
<state width="1877" height="297" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602672852817" />
<state width="1493" height="252" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1605633861934" />
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1598862685882">
@@ -897,7 +884,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausController.java</url>
<line>61</line>
<line>57</line>
<option name="timeStamp" value="36" />
</line-breakpoint>
</breakpoints>

15
src/main/java/com/release11/klaus/controller/KlausController.java
View File

@@ -55,20 +55,7 @@ public class KlausController {
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - request",
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
String s = requestEntity.toString();
String s2 = String.valueOf(requestEntity).replaceAll("\"", "\\\\\"");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:");
log.info("<GET http://localhost:8098/klaus/v1/get/c82c47a8-c4c3-4e1b-91a4-f06c1fdd7066/1,[accept-encoding:\"gzip,deflate\", host:\"localhost:8098\", connection:\"Keep-Alive\", user-agent:\"Apache-HttpClient/4.5.5 (Java/12.0.1)\"]>");
log.info(requestEntity.toString().replaceAll("\"", "\\\\\""));
// log.info(requestEntity.toString().replaceAll("\"", "\\\\\""));
log.info(requestEntity.toString().replaceAll("\"", "\\\\\"").substring(1));
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - response",
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));

2
src/main/resources/static/js/etrackPaggination.js
View File

@@ -111,7 +111,7 @@ function showTable() {
<td>${myList[i-1].interfaceName}</td>
</tr>
<tr bgcolor="${color}" id="etrack-tr-${j}-body" name="tr-body" hidden>
<td colspan="4">"${JSON.stringify(myList[i-1])}"</td>
<td colspan="4">"${JSON.stringify(myList[i-1].message)}"</td>
</tr>`
table.append(row)

BIN
target/classes/com/release11/klaus/controller/KlausController.class
View File

Binary file not shown.

2
target/classes/static/js/etrackPaggination.js
View File

@@ -111,7 +111,7 @@ function showTable() {
<td>${myList[i-1].interfaceName}</td>
</tr>
<tr bgcolor="${color}" id="etrack-tr-${j}-body" name="tr-body" hidden>
<td colspan="4">"${JSON.stringify(myList[i-1])}"</td>
<td colspan="4">"${JSON.stringify(myList[i-1].message)}"</td>
</tr>`
table.append(row)