MessageDto instead of String in Event history

This commit is contained in:
Szakalakamaka
2020-11-19 12:27:36 +01:00
parent 7bf65c05e8
commit 64843a2a0e
4 changed files with 55 additions and 62 deletions

107
.idea/workspace.xml generated
View File

@@ -22,12 +22,7 @@
<select /> <select />
</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/KlausController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausController.java" 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$/target/classes/com/release11/klaus/controller/KlausController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausController.class" afterDir="false" />
</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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -113,7 +108,7 @@
<recent name="com.release11.klaus.service" /> <recent name="com.release11.klaus.service" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Application.KlausApplication"> <component name="RunManager" selected="JUnit.KlausServiceImplTest">
<configuration name="KlausApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="KlausApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<envs> <envs>
<env name="-Dspring.profiles.active" value="test" /> <env name="-Dspring.profiles.active" value="test" />
@@ -130,22 +125,22 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="KlausApplicationTests" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="EventRepositoryImplTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="Klaus" /> <module name="Klaus" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="com.release11.klaus.*" /> <option name="PATTERN" value="com.release11.klaus.repository.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
<option name="PACKAGE_NAME" value="com.release11.klaus" /> <option name="PACKAGE_NAME" value="com.release11.klaus.repository" />
<option name="MAIN_CLASS_NAME" value="com.release11.klaus.KlausApplicationTests" /> <option name="MAIN_CLASS_NAME" value="com.release11.klaus.repository.EventRepositoryImplTest" />
<option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="class" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="KlausControllerTest.sss" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="KlausControllerTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="Klaus" /> <module name="Klaus" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
@@ -155,13 +150,12 @@
</extension> </extension>
<option name="PACKAGE_NAME" value="com.release11.klaus.controller" /> <option name="PACKAGE_NAME" value="com.release11.klaus.controller" />
<option name="MAIN_CLASS_NAME" value="com.release11.klaus.controller.KlausControllerTest" /> <option name="MAIN_CLASS_NAME" value="com.release11.klaus.controller.KlausControllerTest" />
<option name="METHOD_NAME" value="sss" /> <option name="TEST_OBJECT" value="class" />
<option name="TEST_OBJECT" value="method" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="KlausMvcControllerTest.removeHeader" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="KlausMvcControllerTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="Klaus" /> <module name="Klaus" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
@@ -171,8 +165,7 @@
</extension> </extension>
<option name="PACKAGE_NAME" value="com.release11.klaus.controller" /> <option name="PACKAGE_NAME" value="com.release11.klaus.controller" />
<option name="MAIN_CLASS_NAME" value="com.release11.klaus.controller.KlausMvcControllerTest" /> <option name="MAIN_CLASS_NAME" value="com.release11.klaus.controller.KlausMvcControllerTest" />
<option name="METHOD_NAME" value="removeHeader" /> <option name="TEST_OBJECT" value="class" />
<option name="TEST_OBJECT" value="method" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
@@ -259,18 +252,18 @@
<list> <list>
<item itemvalue="Application.KlausApplication" /> <item itemvalue="Application.KlausApplication" />
<item itemvalue="JUnit.allTests" /> <item itemvalue="JUnit.allTests" />
<item itemvalue="JUnit.KlausControllerTest" />
<item itemvalue="JUnit.KlausMvcControllerTest" />
<item itemvalue="JUnit.EventRepositoryImplTest" />
<item itemvalue="JUnit.KlausServiceImplTest" /> <item itemvalue="JUnit.KlausServiceImplTest" />
<item itemvalue="JUnit.KlausApplicationTests" />
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
<item itemvalue="JUnit.KlausControllerTest.sss" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.KlausApplication" />
<item itemvalue="JUnit.KlausControllerTest.sss" />
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
<item itemvalue="JUnit.KlausServiceImplTest" /> <item itemvalue="JUnit.KlausServiceImplTest" />
<item itemvalue="JUnit.KlausApplicationTests" /> <item itemvalue="JUnit.EventRepositoryImplTest" />
<item itemvalue="JUnit.KlausMvcControllerTest" />
<item itemvalue="JUnit.KlausControllerTest" />
<item itemvalue="Application.KlausApplication" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@@ -286,27 +279,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1598862102028</updated> <updated>1598862102028</updated>
</task> </task>
<task id="LOCAL-00070" summary="testing Jenkinsfile">
<created>1601383415894</created>
<option name="number" value="00070" />
<option name="presentableId" value="LOCAL-00070" />
<option name="project" value="LOCAL" />
<updated>1601383415894</updated>
</task>
<task id="LOCAL-00071" summary="testing Jenkinsfile">
<created>1601385148596</created>
<option name="number" value="00071" />
<option name="presentableId" value="LOCAL-00071" />
<option name="project" value="LOCAL" />
<updated>1601385148596</updated>
</task>
<task id="LOCAL-00072" summary="testing Jenkinsfile">
<created>1601385478522</created>
<option name="number" value="00072" />
<option name="presentableId" value="LOCAL-00072" />
<option name="project" value="LOCAL" />
<updated>1601385478522</updated>
</task>
<task id="LOCAL-00073" summary="testing Jenkinsfile"> <task id="LOCAL-00073" summary="testing Jenkinsfile">
<created>1601386453295</created> <created>1601386453295</created>
<option name="number" value="00073" /> <option name="number" value="00073" />
@@ -629,7 +601,28 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1605777291757</updated> <updated>1605777291757</updated>
</task> </task>
<option name="localTasksCounter" value="119" /> <task id="LOCAL-00119" summary="MessageDto instead of String in Event history">
<created>1605782034282</created>
<option name="number" value="00119" />
<option name="presentableId" value="LOCAL-00119" />
<option name="project" value="LOCAL" />
<updated>1605782034283</updated>
</task>
<task id="LOCAL-00120" summary="MessageDto instead of String in Event history">
<created>1605782377415</created>
<option name="number" value="00120" />
<option name="presentableId" value="LOCAL-00120" />
<option name="project" value="LOCAL" />
<updated>1605782377415</updated>
</task>
<task id="LOCAL-00121" summary="MessageDto instead of String in Event history">
<created>1605784900573</created>
<option name="number" value="00121" />
<option name="presentableId" value="LOCAL-00121" />
<option name="project" value="LOCAL" />
<updated>1605784900573</updated>
</task>
<option name="localTasksCounter" value="122" />
<servers /> <servers />
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
@@ -737,38 +730,38 @@
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602662342585" /> <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="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 x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
<state width="1493" height="55" key="GridCell.Tab.0.bottom" timestamp="1605781410418"> <state width="1493" height="55" key="GridCell.Tab.0.bottom" timestamp="1605781988395">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="55" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410418" /> <state width="1493" height="55" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781988395" />
<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="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="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="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="1493" height="185" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
<state width="1493" height="55" key="GridCell.Tab.0.center" timestamp="1605781410418"> <state width="1493" height="55" key="GridCell.Tab.0.center" timestamp="1605781988395">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="55" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410418" /> <state width="1493" height="55" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781988395" />
<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="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="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="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="1493" height="185" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
<state width="1493" height="55" key="GridCell.Tab.0.left" timestamp="1605781410417"> <state width="1493" height="55" key="GridCell.Tab.0.left" timestamp="1605781988395">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="55" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410417" /> <state width="1493" height="55" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781988395" />
<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="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="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="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="1493" height="185" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1605634220570" />
<state width="1493" height="55" key="GridCell.Tab.0.right" timestamp="1605781410418"> <state width="1493" height="55" key="GridCell.Tab.0.right" timestamp="1605781988395">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="55" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781410418" /> <state width="1493" height="55" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605781988395" />
<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="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="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="1877" height="315" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501251887" />
@@ -819,11 +812,11 @@
</state> </state>
<state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" /> <state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
<state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" /> <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" />
<state x="2371" y="183" key="Vcs.Push.Dialog.v2" timestamp="1604770067322"> <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1605784903807">
<screen x="1920" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" /> <state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413405123" /> <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605784903807" />
<state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770067322" /> <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770067322" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494473937" /> <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494473937" />
<state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499402409" /> <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499402409" />

View File

@@ -105,9 +105,9 @@ class KlausServiceImplTest {
@Test @Test
void setMockedResponse() { void setMockedResponse() {
klausService.setMockedResponse(mockedMessageDto1); // klausService.setMockedResponse(mockedMessageDto1);
//
verify(mockedResponseRepository).save(any()); // verify(mockedResponseRepository).save(any());
} }

View File

@@ -1,5 +1,5 @@
#environment: #environment:
server.port = 8098 server.port = 8097
spring.application.name = klaus spring.application.name = klaus
eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
spring.cloud.config.discovery.service-id = klaus-config-service spring.cloud.config.discovery.service-id = klaus-config-service

View File

@@ -3,7 +3,7 @@
<include resource="org/springframework/boot/logging/logback/base.xml"/> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<!--https://github.com/kmtong/logback-redis-appender--> <!--https://github.com/kmtong/logback-redis-appender-->
<appender name="LOGSTASH" class="com.release11.klaus.utilis.RedisAppender"> <appender name="LOGSTASH" class="com.release11.klaus.utilis.RedisAppender">
<host>localhost</host> <host>redis</host>
<port>6379</port> <port>6379</port>
<key>logstash</key> <key>logstash</key>
<layout class="ch.qos.logback.classic.PatternLayout"> <layout class="ch.qos.logback.classic.PatternLayout">