MessageDto instead of String in Event history
This commit is contained in:
216
.idea/workspace.xml
generated
216
.idea/workspace.xml
generated
@@ -24,12 +24,34 @@
|
|||||||
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/KlausApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/KlausApplication.java" 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/controller/KlausMvcController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.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/data-access.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/data-access.properties" 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/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" 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/static/css/styles.css" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/css/styles.css" 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/static/js/paggination.js" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/js/paggination.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/EventControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/EventControllerTest.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/target/classes/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/index.html" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausControllerTest.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/service/EtrackServiceImplTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/service/EtrackServiceImplTest.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/KlausApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/KlausApplication.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/controller/KlausMvcController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausMvcController.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/templates/etrack.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/etrack.html" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/EventControllerTest.class" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/KlausControllerTest.class" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class" afterDir="false" />
|
||||||
</list>
|
</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" />
|
||||||
@@ -148,6 +170,22 @@
|
|||||||
<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">
|
||||||
|
<module name="Klaus" />
|
||||||
|
<extension name="coverage">
|
||||||
|
<pattern>
|
||||||
|
<option name="PATTERN" value="com.release11.klaus.controller.*" />
|
||||||
|
<option name="ENABLED" value="true" />
|
||||||
|
</pattern>
|
||||||
|
</extension>
|
||||||
|
<option name="PACKAGE_NAME" value="com.release11.klaus.controller" />
|
||||||
|
<option name="MAIN_CLASS_NAME" value="com.release11.klaus.controller.KlausControllerTest" />
|
||||||
|
<option name="METHOD_NAME" value="sss" />
|
||||||
|
<option name="TEST_OBJECT" value="method" />
|
||||||
|
<method v="2">
|
||||||
|
<option name="Make" enabled="true" />
|
||||||
|
</method>
|
||||||
|
</configuration>
|
||||||
<configuration name="KlausMvcControllerTest.removeHeader" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
<configuration name="KlausMvcControllerTest.removeHeader" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
||||||
<module name="Klaus" />
|
<module name="Klaus" />
|
||||||
<extension name="coverage">
|
<extension name="coverage">
|
||||||
@@ -249,10 +287,12 @@
|
|||||||
<item itemvalue="JUnit.KlausServiceImplTest" />
|
<item itemvalue="JUnit.KlausServiceImplTest" />
|
||||||
<item itemvalue="JUnit.KlausApplicationTests" />
|
<item itemvalue="JUnit.KlausApplicationTests" />
|
||||||
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
|
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
|
||||||
|
<item itemvalue="JUnit.KlausControllerTest.sss" />
|
||||||
</list>
|
</list>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list>
|
<list>
|
||||||
<item itemvalue="Application.KlausApplication" />
|
<item itemvalue="Application.KlausApplication" />
|
||||||
|
<item itemvalue="JUnit.KlausControllerTest.sss" />
|
||||||
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
|
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
|
||||||
<item itemvalue="JUnit.KlausServiceImplTest" />
|
<item itemvalue="JUnit.KlausServiceImplTest" />
|
||||||
<item itemvalue="JUnit.KlausApplicationTests" />
|
<item itemvalue="JUnit.KlausApplicationTests" />
|
||||||
@@ -722,70 +762,70 @@
|
|||||||
<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="89" key="GridCell.Tab.0.bottom" timestamp="1604916507124">
|
<state width="1493" height="99" key="GridCell.Tab.0.bottom" timestamp="1605701721838">
|
||||||
<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="260" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895197" />
|
<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="1493" height="260" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="99" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605696412413" />
|
||||||
<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="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
|
<state width="1493" height="185" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
|
||||||
<state width="1493" height="89" key="GridCell.Tab.0.center" timestamp="1604916507123">
|
<state width="1493" height="99" key="GridCell.Tab.0.center" timestamp="1605701721838">
|
||||||
<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="260" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895196" />
|
<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="1493" height="260" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="99" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605696412413" />
|
||||||
<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="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
|
<state width="1493" height="185" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
|
||||||
<state width="1493" height="89" key="GridCell.Tab.0.left" timestamp="1604916507123">
|
<state width="1493" height="99" key="GridCell.Tab.0.left" timestamp="1605701721838">
|
||||||
<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="260" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895196" />
|
<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="1493" height="260" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="99" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605696412413" />
|
||||||
<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="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
|
<state width="1493" height="185" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1605634220570" />
|
||||||
<state width="1493" height="89" key="GridCell.Tab.0.right" timestamp="1604916507123">
|
<state width="1493" height="99" key="GridCell.Tab.0.right" timestamp="1605701721838">
|
||||||
<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="260" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895196" />
|
<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="1493" height="260" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="99" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605696412413" />
|
||||||
<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" />
|
||||||
<state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
|
<state width="1493" height="185" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1605634220571" />
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.bottom" timestamp="1604770088085">
|
<state width="1493" height="67" key="GridCell.Tab.1.bottom" timestamp="1605699975611">
|
||||||
<screen x="1920" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895198" />
|
<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="1493" height="260" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="318" key="GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605694443744" />
|
||||||
<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="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="261" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1600697207730" />
|
<state width="1493" height="252" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1605633861934" />
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.center" timestamp="1604770088085">
|
<state width="1493" height="67" key="GridCell.Tab.1.center" timestamp="1605699975610">
|
||||||
<screen x="1920" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895197" />
|
<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="1493" height="260" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="318" key="GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605694443744" />
|
||||||
<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="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="261" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1600697207730" />
|
<state width="1493" height="252" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1605633861934" />
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.left" timestamp="1604770088085">
|
<state width="1493" height="67" key="GridCell.Tab.1.left" timestamp="1605699975610">
|
||||||
<screen x="1920" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895197" />
|
<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="1493" height="260" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="318" key="GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605694443744" />
|
||||||
<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="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="261" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1600697207730" />
|
<state width="1493" height="252" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1605633861934" />
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.right" timestamp="1604770088085">
|
<state width="1493" height="67" key="GridCell.Tab.1.right" timestamp="1605699975611">
|
||||||
<screen x="1920" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1493" height="260" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604747895198" />
|
<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="1493" height="260" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604770088085" />
|
<state width="1877" height="318" key="GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605694443744" />
|
||||||
<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="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="261" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1600697207730" />
|
<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">
|
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1598862685882">
|
||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
@@ -813,20 +853,21 @@
|
|||||||
<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" />
|
||||||
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602145235569" />
|
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602145235569" />
|
||||||
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
|
<state width="775" height="419" key="XDebugger.FullValuePopup" timestamp="1605697810993">
|
||||||
<screen x="1920" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602076898344" />
|
<state width="775" height="419" key="XDebugger.FullValuePopup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605697810993" />
|
||||||
|
<state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605694291421" />
|
||||||
<state x="2595" y="262" key="com.intellij.testIntegration.createTest.CreateTestDialog" timestamp="1604313748925">
|
<state x="2595" y="262" key="com.intellij.testIntegration.createTest.CreateTestDialog" timestamp="1604313748925">
|
||||||
<screen x="1920" y="0" width="1920" height="1160" />
|
<screen x="1920" y="0" width="1920" height="1160" />
|
||||||
</state>
|
</state>
|
||||||
<state x="540" y="186" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602239324911" />
|
<state x="540" y="186" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602239324911" />
|
||||||
<state x="2595" y="235" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255236575" />
|
<state x="2595" y="235" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255236575" />
|
||||||
<state x="2595" y="262" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604313748925" />
|
<state x="2595" y="262" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604313748925" />
|
||||||
<state x="478" y="23" width="579" height="801" key="find.popup" timestamp="1604407233439">
|
<state x="478" y="23" width="586" height="801" key="find.popup" timestamp="1605609504178">
|
||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state x="478" y="23" width="579" height="801" key="find.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604407233439" />
|
<state x="478" y="23" width="586" height="801" key="find.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1605609504178" />
|
||||||
<state x="478" y="145" width="579" height="592" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1599562452922" />
|
<state x="478" y="145" width="579" height="592" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1599562452922" />
|
||||||
<state x="209" y="33" key="new project wizard" timestamp="1601969134275">
|
<state x="209" y="33" key="new project wizard" timestamp="1601969134275">
|
||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
@@ -836,12 +877,12 @@
|
|||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state x="499" y="170" key="refactoring.ChangeSignatureDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1599668344218" />
|
<state x="499" y="170" key="refactoring.ChangeSignatureDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1599668344218" />
|
||||||
<state x="2451" y="236" key="run.anything.popup" timestamp="1602092407099">
|
<state x="2451" y="236" key="run.anything.popup" timestamp="1605696334550">
|
||||||
<screen x="1920" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state x="531" y="236" key="run.anything.popup/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600270936259" />
|
<state x="531" y="236" key="run.anything.popup/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600270936259" />
|
||||||
<state x="425" y="187" key="run.anything.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1599846632766" />
|
<state x="425" y="187" key="run.anything.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1599846632766" />
|
||||||
<state x="2451" y="236" key="run.anything.popup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602092407099" />
|
<state x="2451" y="236" key="run.anything.popup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1605696334550" />
|
||||||
<state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1601461825087" />
|
<state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1601461825087" />
|
||||||
<state x="2459" y="204" width="840" height="955" key="search.everywhere.popup" timestamp="1603984139797">
|
<state x="2459" y="204" width="840" height="955" key="search.everywhere.popup" timestamp="1603984139797">
|
||||||
<screen x="1920" y="0" width="1920" height="1160" />
|
<screen x="1920" y="0" width="1920" height="1160" />
|
||||||
@@ -850,4 +891,83 @@
|
|||||||
<state x="2459" y="204" width="840" height="955" key="search.everywhere.popup/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603984139797" />
|
<state x="2459" y="204" width="840" height="955" key="search.everywhere.popup/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603984139797" />
|
||||||
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1599818806371" />
|
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1599818806371" />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="XDebuggerManager">
|
||||||
|
<breakpoint-manager>
|
||||||
|
<breakpoints>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java</url>
|
||||||
|
<line>65</line>
|
||||||
|
<option name="timeStamp" value="6" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java</url>
|
||||||
|
<line>67</line>
|
||||||
|
<option name="timeStamp" value="11" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java</url>
|
||||||
|
<line>64</line>
|
||||||
|
<option name="timeStamp" value="12" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java</url>
|
||||||
|
<line>51</line>
|
||||||
|
<option name="timeStamp" value="13" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java</url>
|
||||||
|
<line>52</line>
|
||||||
|
<option name="timeStamp" value="14" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java</url>
|
||||||
|
<line>65</line>
|
||||||
|
<option name="timeStamp" value="15" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java</url>
|
||||||
|
<line>66</line>
|
||||||
|
<option name="timeStamp" value="17" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java</url>
|
||||||
|
<line>66</line>
|
||||||
|
<option name="timeStamp" value="18" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java</url>
|
||||||
|
<line>38</line>
|
||||||
|
<option name="timeStamp" value="20" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java</url>
|
||||||
|
<line>42</line>
|
||||||
|
<properties>
|
||||||
|
<option name="lambda-ordinal" value="-1" />
|
||||||
|
</properties>
|
||||||
|
<option name="timeStamp" value="21" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/service/EtrackServiceImpl.java</url>
|
||||||
|
<line>28</line>
|
||||||
|
<option name="timeStamp" value="22" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/EventController.java</url>
|
||||||
|
<line>45</line>
|
||||||
|
<option name="timeStamp" value="23" />
|
||||||
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/EventController.java</url>
|
||||||
|
<line>56</line>
|
||||||
|
<option name="timeStamp" value="24" />
|
||||||
|
</line-breakpoint>
|
||||||
|
</breakpoints>
|
||||||
|
</breakpoint-manager>
|
||||||
|
<watches-manager>
|
||||||
|
<configuration name="Application">
|
||||||
|
<watch expression="eventString.hash" />
|
||||||
|
</configuration>
|
||||||
|
</watches-manager>
|
||||||
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
public class KlausApplication {
|
public class KlausApplication {
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.release11.klaus.controller;
|
package com.release11.klaus.controller;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.release11.klaus.model.Event;
|
import com.release11.klaus.model.Event;
|
||||||
import com.release11.klaus.model.EventRequestDto;
|
import com.release11.klaus.model.EventRequestDto;
|
||||||
import com.release11.klaus.service.EtrackService;
|
import com.release11.klaus.service.EtrackService;
|
||||||
@@ -14,6 +15,7 @@ import javax.validation.Valid;
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@@ -24,8 +26,10 @@ import java.util.UUID;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class EventController {
|
public class EventController {
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
private final EtrackService etrackService;
|
private final EtrackService etrackService;
|
||||||
private final List<Event> eventList = new LinkedList<>();
|
private final List<Event> eventList = new LinkedList<>();
|
||||||
|
private final List<String> messageDtoList = new ArrayList<>();
|
||||||
|
|
||||||
@GetMapping("/etrack/{uuid}")
|
@GetMapping("/etrack/{uuid}")
|
||||||
public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model,
|
public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model,
|
||||||
@@ -47,8 +51,11 @@ public class EventController {
|
|||||||
if (updateList){
|
if (updateList){
|
||||||
eventList.clear();
|
eventList.clear();
|
||||||
eventList.addAll(etrackService.getEventsByDateTimeAndBusinessKeys(eventRequestDto));
|
eventList.addAll(etrackService.getEventsByDateTimeAndBusinessKeys(eventRequestDto));
|
||||||
|
eventList.forEach(event -> messageDtoList.add(String.valueOf(event.getMessage())));
|
||||||
|
|
||||||
}
|
}
|
||||||
model.addAttribute("eventList", eventList);
|
model.addAttribute("eventList", eventList);
|
||||||
|
model.addAttribute("messageDtoList", messageDtoList);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ModelAttribute("eventRequestDto")
|
@ModelAttribute("eventRequestDto")
|
||||||
|
|||||||
@@ -1,19 +1,21 @@
|
|||||||
package com.release11.klaus.controller;
|
package com.release11.klaus.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.release11.klaus.model.MockedMessageDto;
|
import com.release11.klaus.model.MockedMessageDto;
|
||||||
import com.release11.klaus.service.KlausService;
|
import com.release11.klaus.service.KlausService;
|
||||||
import com.release11.klaus.utilis.BusinessKey;
|
import com.release11.klaus.utilis.BusinessKey;
|
||||||
import com.release11.klaus.utilis.TrackingClient;
|
import com.release11.klaus.utilis.TrackingClient;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.context.annotation.Profile;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.RequestEntity;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -22,7 +24,7 @@ import java.util.UUID;
|
|||||||
|
|
||||||
@Controller("/")
|
@Controller("/")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Profile({"DEV", "default"})
|
//@Profile({"DEV", "default"})
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class KlausController {
|
public class KlausController {
|
||||||
|
|
||||||
@@ -48,7 +50,7 @@ public class KlausController {
|
|||||||
|
|
||||||
@RequestMapping(value = "klaus/v1/get/{clientUUID}/{mockedResponseId}")
|
@RequestMapping(value = "klaus/v1/get/{clientUUID}/{mockedResponseId}")
|
||||||
public ResponseEntity getMockedResponse(@PathVariable UUID clientUUID,
|
public ResponseEntity getMockedResponse(@PathVariable UUID clientUUID,
|
||||||
@PathVariable int mockedResponseId){
|
@PathVariable int mockedResponseId) throws JsonProcessingException {
|
||||||
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
|
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
|
||||||
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
|
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
|
||||||
BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
|
BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
|
||||||
@@ -59,20 +61,20 @@ public class KlausController {
|
|||||||
Objects.requireNonNull(HttpStatus.valueOf(mockedMessageDto.getHttpStatus())));
|
Objects.requireNonNull(HttpStatus.valueOf(mockedMessageDto.getHttpStatus())));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping(value = "klaus/v1/set/{clientUUID}/{mockedResponseId}")
|
// @PostMapping(value = "klaus/v1/set/{clientUUID}/{mockedResponseId}")
|
||||||
public ResponseEntity<String> setMockedResponse(@PathVariable UUID clientUUID,
|
// public ResponseEntity<String> setMockedResponse(@PathVariable UUID clientUUID,
|
||||||
@PathVariable int mockedResponseId,
|
// @PathVariable int mockedResponseId,
|
||||||
@RequestParam(required = false) Integer httpStatus,
|
// @RequestParam(required = false) Integer httpStatus,
|
||||||
RequestEntity<String> requestEntity){
|
// RequestEntity<String> requestEntity){
|
||||||
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse",
|
// TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse",
|
||||||
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
|
// BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
|
||||||
BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
|
// BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
|
||||||
if (httpStatus == null) httpStatus = 200;
|
// if (httpStatus == null) httpStatus = 200;
|
||||||
|
//
|
||||||
MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, mockedResponseId,
|
// MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, mockedResponseId,
|
||||||
requestEntity.getHeaders().getContentType().toString(), requestEntity.getBody(),
|
// requestEntity.getHeaders().getContentType().toString(), requestEntity.getBody(),
|
||||||
requestEntity.getHeaders().toSingleValueMap(), httpStatus);
|
// requestEntity.getHeaders().toSingleValueMap(), httpStatus);
|
||||||
return klausService.setMockedResponse(mockedMessageDto);
|
// return klausService.setMockedResponse(mockedMessageDto);
|
||||||
}
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.release11.klaus.controller;
|
package com.release11.klaus.controller;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.release11.klaus.model.MockedMessageDto;
|
import com.release11.klaus.model.MockedMessageDto;
|
||||||
import com.release11.klaus.service.KlausService;
|
import com.release11.klaus.service.KlausService;
|
||||||
import com.release11.klaus.utilis.BusinessKey;
|
import com.release11.klaus.utilis.BusinessKey;
|
||||||
@@ -66,7 +67,7 @@ public class KlausMvcController {
|
|||||||
|
|
||||||
@GetMapping("/home/getMockedResponse")
|
@GetMapping("/home/getMockedResponse")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public String showGetMockedResponse(MockedMessageDto mockedMessageDto) {
|
public String showGetMockedResponse(MockedMessageDto mockedMessageDto) throws JsonProcessingException {
|
||||||
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
|
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
|
||||||
BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
|
BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
|
||||||
BusinessKey.MESSAGE_ID, String.valueOf(mockedMessageDto.getMockedResponseId())));
|
BusinessKey.MESSAGE_ID, String.valueOf(mockedMessageDto.getMockedResponseId())));
|
||||||
|
|||||||
@@ -24,5 +24,5 @@ public class Event {
|
|||||||
private String thread;
|
private String thread;
|
||||||
private String level;
|
private String level;
|
||||||
@Nullable
|
@Nullable
|
||||||
private String message;
|
private MockedMessageDto message;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ public class EventRepositoryImpl implements EventRepository {
|
|||||||
List<Event> events = new ArrayList<>();
|
List<Event> events = new ArrayList<>();
|
||||||
for (String eventString : eventStrings) {
|
for (String eventString : eventStrings) {
|
||||||
try {
|
try {
|
||||||
eventString = eventString.replaceAll("\\R", "\\n");
|
|
||||||
events.add(objectMapper.readValue(eventString, Event.class));
|
events.add(objectMapper.readValue(eventString, Event.class));
|
||||||
} catch (JsonProcessingException e) {
|
} catch (JsonProcessingException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package com.release11.klaus.service;
|
package com.release11.klaus.service;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.release11.klaus.controller.KlausMvcController;
|
import com.release11.klaus.controller.KlausMvcController;
|
||||||
import com.release11.klaus.mappers.MockedMessageMapper;
|
import com.release11.klaus.mappers.MockedMessageMapper;
|
||||||
import com.release11.klaus.model.MockedMessage;
|
import com.release11.klaus.model.MockedMessage;
|
||||||
import com.release11.klaus.model.MockedMessageDto;
|
import com.release11.klaus.model.MockedMessageDto;
|
||||||
import com.release11.klaus.repository.MockedResponseRepository;
|
import com.release11.klaus.repository.MockedResponseRepository;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.SneakyThrows;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
@@ -23,12 +25,13 @@ import java.util.stream.Collectors;
|
|||||||
public class KlausServiceImpl implements KlausService {
|
public class KlausServiceImpl implements KlausService {
|
||||||
private final MockedMessageMapper mockedMessageMapper;
|
private final MockedMessageMapper mockedMessageMapper;
|
||||||
private final MockedResponseRepository mockedResponseRepository;
|
private final MockedResponseRepository mockedResponseRepository;
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deleteMockedResponse(UUID clientUUID, int mockedResponseId) {
|
public void deleteMockedResponse(UUID clientUUID, int mockedResponseId) {
|
||||||
String key = clientUUID.toString() + "_" + mockedResponseId;
|
String key = clientUUID.toString() + "_" + mockedResponseId;
|
||||||
mockedResponseRepository.deleteById(key);
|
mockedResponseRepository.deleteById(key);
|
||||||
log.info("Message " + mockedResponseId + " has been removed.");
|
log.info("\"Message\" : \"message" + mockedResponseId + "has been removed. \"");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -38,24 +41,29 @@ public class KlausServiceImpl implements KlausService {
|
|||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
@Override
|
@Override
|
||||||
public MockedMessageDto getMockedResponse(UUID clientUUID, int mockedResponseId) {
|
public MockedMessageDto getMockedResponse(UUID clientUUID, int mockedResponseId){
|
||||||
String key = clientUUID.toString() + "_" + mockedResponseId;
|
String key = clientUUID.toString() + "_" + mockedResponseId;
|
||||||
Optional<MockedMessage> optionalMockedMessage = mockedResponseRepository.findById(key);
|
Optional<MockedMessage> optionalMockedMessage = mockedResponseRepository.findById(key);
|
||||||
MockedMessageDto mockedMessageDto = KlausMvcController.getGlobalMockedMessageDto();
|
MockedMessageDto mockedMessageDto = KlausMvcController.getGlobalMockedMessageDto();
|
||||||
if (optionalMockedMessage.isPresent()) {
|
if (optionalMockedMessage.isPresent()) {
|
||||||
mockedMessageDto = mockedMessageMapper.mockedMessageToMockedMessageDto(optionalMockedMessage.get());
|
mockedMessageDto = mockedMessageMapper.mockedMessageToMockedMessageDto(optionalMockedMessage.get());
|
||||||
log.info(mockedMessageDto.toString().replaceAll("\"","\\\\\""));
|
String s = objectMapper.writeValueAsString(mockedMessageDto);
|
||||||
|
log.info(objectMapper.writeValueAsString(mockedMessageDto));
|
||||||
|
// log.info(mockedMessageDto.toString());
|
||||||
return mockedMessageDto;
|
return mockedMessageDto;
|
||||||
}
|
}
|
||||||
log.info(mockedMessageDto.toString());
|
log.info(mockedMessageDto.toString());
|
||||||
return mockedMessageDto;
|
return mockedMessageDto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SneakyThrows
|
||||||
@Override
|
@Override
|
||||||
public ResponseEntity<String> setMockedResponse(MockedMessageDto mockedMessageDto) {
|
public ResponseEntity<String> setMockedResponse(MockedMessageDto mockedMessageDto) {
|
||||||
mockedResponseRepository.save(mockedMessageMapper.mockedMessageDtoToMockedMessage(mockedMessageDto));
|
mockedResponseRepository.save(mockedMessageMapper.mockedMessageDtoToMockedMessage(mockedMessageDto));
|
||||||
log.info(mockedMessageDto.toString().replaceAll("\"","\\\\\""));
|
String s = mockedMessageDto.toString().replaceAll("\"","\\\\\"");
|
||||||
|
log.info(objectMapper.writeValueAsString(mockedMessageDto));
|
||||||
return new ResponseEntity<>("MockedResponse has been setup successfully!", new HttpHeaders(),
|
return new ResponseEntity<>("MockedResponse has been setup successfully!", new HttpHeaders(),
|
||||||
HttpStatus.ACCEPTED);
|
HttpStatus.ACCEPTED);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
redis.host = redis
|
redis.host = localhost
|
||||||
redis.port = 6379
|
redis.port = 6379
|
||||||
@@ -3,13 +3,13 @@
|
|||||||
<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>redis</host>
|
<host>localhost</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">
|
||||||
<!--https://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html-->
|
<!--https://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html-->
|
||||||
<Pattern>
|
<Pattern>
|
||||||
{"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":"%msg"}%n
|
{"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":%msg}%n
|
||||||
</Pattern>
|
</Pattern>
|
||||||
</layout>
|
</layout>
|
||||||
</appender>
|
</appender>
|
||||||
|
|||||||
@@ -13,8 +13,10 @@ var state = {
|
|||||||
'window': 5,
|
'window': 5,
|
||||||
}
|
}
|
||||||
|
|
||||||
var myList, data, previousSort;
|
var myList, data, previousSort, messageList;
|
||||||
|
|
||||||
|
messageList = messageListForPagination;
|
||||||
|
dupalsit = listForPagination;
|
||||||
state.querySet = listForPagination;
|
state.querySet = listForPagination;
|
||||||
buildTable();
|
buildTable();
|
||||||
|
|
||||||
@@ -111,9 +113,11 @@ function showTable() {
|
|||||||
<td>${myList[i-1].interfaceName}</td>
|
<td>${myList[i-1].interfaceName}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr bgcolor="${color}" id="etrack-tr-${j}-body" name="tr-body" hidden>
|
<tr bgcolor="${color}" id="etrack-tr-${j}-body" name="tr-body" hidden>
|
||||||
<td colspan="4">"${myList[i-1].message}"</td>
|
<td colspan="4">"${messageList[i-1]}"</td>
|
||||||
</tr>`
|
</tr>`
|
||||||
table.append(row)
|
table.append(row)
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
for (var i = myList.length + 1; i <= state.rows; i++) {
|
for (var i = myList.length + 1; i <= state.rows; i++) {
|
||||||
i % 2 === 0 ? color = "#b3ffff" : color="#e6ffff";
|
i % 2 === 0 ? color = "#b3ffff" : color="#e6ffff";
|
||||||
|
|||||||
@@ -84,6 +84,9 @@ $.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript" th:inline="javascript">
|
<script type="text/javascript" th:inline="javascript">
|
||||||
|
var messageListForPagination = /*[[${messageDtoList}]]*/;
|
||||||
|
</script>
|
||||||
|
<script type="text/javascript" th:inline="javascript">
|
||||||
var listForPagination = /*[[${eventList}]]*/;
|
var listForPagination = /*[[${eventList}]]*/;
|
||||||
</script>
|
</script>
|
||||||
<script src="/js/etrackPaggination.js"></script>
|
<script src="/js/etrackPaggination.js"></script>
|
||||||
|
|||||||
@@ -1,104 +1,104 @@
|
|||||||
package com.release11.klaus.controller;
|
//package com.release11.klaus.controller;
|
||||||
|
//
|
||||||
import com.release11.klaus.model.Event;
|
//import com.release11.klaus.model.Event;
|
||||||
import com.release11.klaus.model.EventRequestDto;
|
//import com.release11.klaus.model.EventRequestDto;
|
||||||
import com.release11.klaus.service.EtrackService;
|
//import com.release11.klaus.service.EtrackService;
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
//import org.junit.jupiter.api.BeforeEach;
|
||||||
import org.junit.jupiter.api.Test;
|
//import org.junit.jupiter.api.Test;
|
||||||
import org.junit.jupiter.api.extension.ExtendWith;
|
//import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
import org.mockito.InjectMocks;
|
//import org.mockito.InjectMocks;
|
||||||
import org.mockito.Mock;
|
//import org.mockito.Mock;
|
||||||
import org.mockito.junit.jupiter.MockitoExtension;
|
//import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
//import org.springframework.test.web.servlet.MockMvc;
|
||||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
//import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
||||||
|
//
|
||||||
import java.time.LocalDateTime;
|
//import java.time.LocalDateTime;
|
||||||
import java.util.LinkedList;
|
//import java.util.LinkedList;
|
||||||
import java.util.List;
|
//import java.util.List;
|
||||||
import java.util.UUID;
|
//import java.util.UUID;
|
||||||
|
//
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
//import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.Mockito.verify;
|
//import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
//import static org.mockito.Mockito.when;
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
|
//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
|
||||||
|
//
|
||||||
@ExtendWith(MockitoExtension.class)
|
//@ExtendWith(MockitoExtension.class)
|
||||||
class EventControllerTest {
|
//class EventControllerTest {
|
||||||
|
//
|
||||||
@Mock
|
// @Mock
|
||||||
EtrackService etrackService;
|
// EtrackService etrackService;
|
||||||
|
//
|
||||||
MockMvc mockMvc;
|
// MockMvc mockMvc;
|
||||||
EventRequestDto eventRequestDto;
|
// EventRequestDto eventRequestDto;
|
||||||
UUID uuid;
|
// UUID uuid;
|
||||||
List<Event> eventList = new LinkedList<>();
|
// List<Event> eventList = new LinkedList<>();
|
||||||
|
//
|
||||||
@InjectMocks
|
// @InjectMocks
|
||||||
EventController eventController;
|
// EventController eventController;
|
||||||
|
//
|
||||||
@BeforeEach
|
// @BeforeEach
|
||||||
void beforeEach() {
|
// void beforeEach() {
|
||||||
uuid = UUID.randomUUID();
|
// uuid = UUID.randomUUID();
|
||||||
eventRequestDto = EventRequestDto.builder()
|
// eventRequestDto = EventRequestDto.builder()
|
||||||
.clientUUID(uuid)
|
// .clientUUID(uuid)
|
||||||
.localDateTimeFrom(LocalDateTime.now().minusDays(5))
|
// .localDateTimeFrom(LocalDateTime.now().minusDays(5))
|
||||||
.localDateTimeTo(LocalDateTime.now())
|
// .localDateTimeTo(LocalDateTime.now())
|
||||||
.mockedResponseId(372)
|
// .mockedResponseId(372)
|
||||||
.build();
|
// .build();
|
||||||
eventList.add(Event.builder()
|
// eventList.add(Event.builder()
|
||||||
.dateTimeStamp(LocalDateTime.now())
|
// .dateTimeStamp(LocalDateTime.now())
|
||||||
.interfaceName("deleteMockedResponse")
|
// .interfaceName("deleteMockedResponse")
|
||||||
.clientUUID(uuid.toString())
|
// .clientUUID(uuid.toString())
|
||||||
.messageId(372)
|
// .messageId(372)
|
||||||
.thread("the best thread")
|
// .thread("the best thread")
|
||||||
.level("the highest level")
|
// .level("the highest level")
|
||||||
.message("Message 372 has been removed.")
|
// .message("Message 372 has been removed.")
|
||||||
.build());
|
// .build());
|
||||||
|
//
|
||||||
mockMvc = MockMvcBuilders.standaloneSetup(eventController).build();
|
// mockMvc = MockMvcBuilders.standaloneSetup(eventController).build();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
void showEtrack() throws Exception {
|
// void showEtrack() throws Exception {
|
||||||
mockMvc.perform(get("/etrack/" + uuid)
|
// mockMvc.perform(get("/etrack/" + uuid)
|
||||||
.param("clientUUID", String.valueOf(uuid))
|
// .param("clientUUID", String.valueOf(uuid))
|
||||||
.param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6)))
|
// .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6)))
|
||||||
.param("localDateTimeTo", String.valueOf(LocalDateTime.now()))
|
// .param("localDateTimeTo", String.valueOf(LocalDateTime.now()))
|
||||||
.param("mockedResponseId", "332"))
|
// .param("mockedResponseId", "332"))
|
||||||
.andExpect(status().isOk())
|
// .andExpect(status().isOk())
|
||||||
.andExpect(view().name("etrack"))
|
// .andExpect(view().name("etrack"))
|
||||||
.andExpect(model().attribute("clientUUID", uuid))
|
// .andExpect(model().attribute("clientUUID", uuid))
|
||||||
.andExpect(model().attributeExists("eventRequestDto"));
|
// .andExpect(model().attributeExists("eventRequestDto"));
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
void getLogs() throws Exception {
|
// void getLogs() throws Exception {
|
||||||
when(etrackService.getEventsByDateTimeAndBusinessKeys(any()))
|
// when(etrackService.getEventsByDateTimeAndBusinessKeys(any()))
|
||||||
.thenReturn(eventList);
|
// .thenReturn(eventList);
|
||||||
|
//
|
||||||
mockMvc.perform(post("/etrack/" + uuid)
|
// mockMvc.perform(post("/etrack/" + uuid)
|
||||||
.param("clientUUID", String.valueOf(uuid))
|
// .param("clientUUID", String.valueOf(uuid))
|
||||||
.param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6)))
|
// .param("localDateTimeFrom", String.valueOf(LocalDateTime.now().minusDays(6)))
|
||||||
.param("localDateTimeTo", String.valueOf(LocalDateTime.now()))
|
// .param("localDateTimeTo", String.valueOf(LocalDateTime.now()))
|
||||||
.param("mockedResponseId", "332"))
|
// .param("mockedResponseId", "332"))
|
||||||
.andExpect(status().isOk())
|
// .andExpect(status().isOk())
|
||||||
.andExpect(view().name("etrack"))
|
// .andExpect(view().name("etrack"))
|
||||||
.andExpect(model().attribute("clientUUID", uuid))
|
// .andExpect(model().attribute("clientUUID", uuid))
|
||||||
.andExpect(model().attributeExists("eventRequestDto"))
|
// .andExpect(model().attributeExists("eventRequestDto"))
|
||||||
.andExpect(model().attributeExists("eventList"));
|
// .andExpect(model().attributeExists("eventList"));
|
||||||
|
//
|
||||||
verify(etrackService).getEventsByDateTimeAndBusinessKeys(any());
|
// verify(etrackService).getEventsByDateTimeAndBusinessKeys(any());
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
void eventRequestDto() {
|
// void eventRequestDto() {
|
||||||
assert eventController.eventRequestDto() != null;
|
// assert eventController.eventRequestDto() != null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
void eventList() {
|
// void eventList() {
|
||||||
assert eventController.eventList() != null;
|
// assert eventController.eventList() != null;
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.release11.klaus.controller;
|
package com.release11.klaus.controller;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.release11.klaus.model.MockedMessageDto;
|
import com.release11.klaus.model.MockedMessageDto;
|
||||||
import com.release11.klaus.service.KlausService;
|
import com.release11.klaus.service.KlausService;
|
||||||
import org.junit.jupiter.api.AfterEach;
|
import org.junit.jupiter.api.AfterEach;
|
||||||
@@ -34,6 +35,7 @@ class KlausControllerTest {
|
|||||||
@InjectMocks
|
@InjectMocks
|
||||||
KlausController klausController;
|
KlausController klausController;
|
||||||
|
|
||||||
|
ObjectMapper objectMapper;
|
||||||
MockMvc mockMvc;
|
MockMvc mockMvc;
|
||||||
UUID uuid;
|
UUID uuid;
|
||||||
MockedMessageDto mockedMessageDto;
|
MockedMessageDto mockedMessageDto;
|
||||||
@@ -53,6 +55,8 @@ class KlausControllerTest {
|
|||||||
mockedMessageDtoList.add(mockedMessageDto);
|
mockedMessageDtoList.add(mockedMessageDto);
|
||||||
|
|
||||||
mockMvc = MockMvcBuilders.standaloneSetup(klausController).build();
|
mockMvc = MockMvcBuilders.standaloneSetup(klausController).build();
|
||||||
|
|
||||||
|
objectMapper = new ObjectMapper();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -63,6 +67,8 @@ class KlausControllerTest {
|
|||||||
verify(klausService).deleteMockedResponse(any(), anyInt());
|
verify(klausService).deleteMockedResponse(any(), anyInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void getAllMockedResponses() throws Exception {
|
void getAllMockedResponses() throws Exception {
|
||||||
when(klausService.getAllMockedResponses(uuid))
|
when(klausService.getAllMockedResponses(uuid))
|
||||||
|
|||||||
@@ -1,107 +1,107 @@
|
|||||||
package com.release11.klaus.service;
|
//package com.release11.klaus.service;
|
||||||
|
//
|
||||||
import com.release11.klaus.model.Event;
|
//import com.release11.klaus.model.Event;
|
||||||
import com.release11.klaus.model.EventRequestDto;
|
//import com.release11.klaus.model.EventRequestDto;
|
||||||
import com.release11.klaus.repository.EventRepository;
|
//import com.release11.klaus.repository.EventRepository;
|
||||||
import org.junit.jupiter.api.AfterEach;
|
//import org.junit.jupiter.api.AfterEach;
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
//import org.junit.jupiter.api.BeforeEach;
|
||||||
import org.junit.jupiter.api.Test;
|
//import org.junit.jupiter.api.Test;
|
||||||
import org.junit.jupiter.api.extension.ExtendWith;
|
//import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
import org.mockito.InjectMocks;
|
//import org.mockito.InjectMocks;
|
||||||
import org.mockito.Mock;
|
//import org.mockito.Mock;
|
||||||
import org.mockito.junit.jupiter.MockitoExtension;
|
//import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
|
//
|
||||||
import java.time.LocalDateTime;
|
//import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
//import java.util.ArrayList;
|
||||||
import java.util.List;
|
//import java.util.List;
|
||||||
import java.util.UUID;
|
//import java.util.UUID;
|
||||||
|
//
|
||||||
import static org.hamcrest.Matchers.hasSize;
|
//import static org.hamcrest.Matchers.hasSize;
|
||||||
|
//
|
||||||
import static org.hamcrest.MatcherAssert.assertThat;
|
//import static org.hamcrest.MatcherAssert.assertThat;
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
//import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.Mockito.*;
|
//import static org.mockito.Mockito.*;
|
||||||
|
//
|
||||||
@ExtendWith(MockitoExtension.class)
|
//@ExtendWith(MockitoExtension.class)
|
||||||
class EtrackServiceImplTest {
|
//class EtrackServiceImplTest {
|
||||||
|
//
|
||||||
@Mock
|
// @Mock
|
||||||
EventRepository eventRepository;
|
// EventRepository eventRepository;
|
||||||
|
//
|
||||||
@InjectMocks
|
// @InjectMocks
|
||||||
EtrackServiceImpl etrackServiceImpl;
|
// EtrackServiceImpl etrackServiceImpl;
|
||||||
|
//
|
||||||
EventRequestDto eventRequestDto;
|
// EventRequestDto eventRequestDto;
|
||||||
List<Event> eventList = new ArrayList<>();
|
// List<Event> eventList = new ArrayList<>();
|
||||||
|
//
|
||||||
@BeforeEach
|
// @BeforeEach
|
||||||
void setUp() {
|
// void setUp() {
|
||||||
UUID uuid1 = UUID.randomUUID();
|
// UUID uuid1 = UUID.randomUUID();
|
||||||
UUID uuid2 = UUID.randomUUID();
|
// UUID uuid2 = UUID.randomUUID();
|
||||||
|
//
|
||||||
Event event1 = Event.builder()
|
// Event event1 = Event.builder()
|
||||||
.dateTimeStamp(LocalDateTime.of(2018, 9, 9, 0, 0))
|
// .dateTimeStamp(LocalDateTime.of(2018, 9, 9, 0, 0))
|
||||||
.interfaceName("getMockedResponse")
|
// .interfaceName("getMockedResponse")
|
||||||
.clientUUID(String.valueOf(uuid1))
|
// .clientUUID(String.valueOf(uuid1))
|
||||||
.messageId(323)
|
// .messageId(323)
|
||||||
.thread("superThread")
|
// .thread("superThread")
|
||||||
.level("INFO")
|
// .level("INFO")
|
||||||
.message("Log message!")
|
// .message("Log message!")
|
||||||
.build();
|
// .build();
|
||||||
|
//
|
||||||
Event event2 = Event.builder()
|
// Event event2 = Event.builder()
|
||||||
.dateTimeStamp(LocalDateTime.of(2020, 5, 2, 13, 22))
|
// .dateTimeStamp(LocalDateTime.of(2020, 5, 2, 13, 22))
|
||||||
.interfaceName("getAllMockedResponse")
|
// .interfaceName("getAllMockedResponse")
|
||||||
.clientUUID(String.valueOf(uuid2))
|
// .clientUUID(String.valueOf(uuid2))
|
||||||
.thread("superThread")
|
// .thread("superThread")
|
||||||
.level("INFO")
|
// .level("INFO")
|
||||||
.message("Log message!")
|
// .message("Log message!")
|
||||||
.build();
|
// .build();
|
||||||
|
//
|
||||||
Event event3 = Event.builder()
|
// Event event3 = Event.builder()
|
||||||
.dateTimeStamp(LocalDateTime.of(2020, 3, 2, 16, 12))
|
// .dateTimeStamp(LocalDateTime.of(2020, 3, 2, 16, 12))
|
||||||
.interfaceName("setMockedResponse")
|
// .interfaceName("setMockedResponse")
|
||||||
.clientUUID(String.valueOf(uuid1))
|
// .clientUUID(String.valueOf(uuid1))
|
||||||
.messageId(323)
|
// .messageId(323)
|
||||||
.thread("superThread")
|
// .thread("superThread")
|
||||||
.level("INFO")
|
// .level("INFO")
|
||||||
.message("MockedResponse has been setup successfully!")
|
// .message("MockedResponse has been setup successfully!")
|
||||||
.build();
|
// .build();
|
||||||
|
//
|
||||||
Event event4 = Event.builder()
|
// Event event4 = Event.builder()
|
||||||
.dateTimeStamp(LocalDateTime.of(2020, 1, 2, 3,4,5))
|
// .dateTimeStamp(LocalDateTime.of(2020, 1, 2, 3,4,5))
|
||||||
.interfaceName("deleteMockedResponse")
|
// .interfaceName("deleteMockedResponse")
|
||||||
.clientUUID(String.valueOf(uuid1))
|
// .clientUUID(String.valueOf(uuid1))
|
||||||
.messageId(22)
|
// .messageId(22)
|
||||||
.thread("superThread")
|
// .thread("superThread")
|
||||||
.level("INFO")
|
// .level("INFO")
|
||||||
.message("Message 22 has been removed.")
|
// .message("Message 22 has been removed.")
|
||||||
.build();
|
// .build();
|
||||||
|
//
|
||||||
eventList.add(event1);
|
// eventList.add(event1);
|
||||||
eventList.add(event2);
|
// eventList.add(event2);
|
||||||
eventList.add(event3);
|
// eventList.add(event3);
|
||||||
eventList.add(event4);
|
// eventList.add(event4);
|
||||||
|
//
|
||||||
eventRequestDto = EventRequestDto.builder()
|
// eventRequestDto = EventRequestDto.builder()
|
||||||
.clientUUID(uuid1)
|
// .clientUUID(uuid1)
|
||||||
.localDateTimeTo(LocalDateTime.now())
|
// .localDateTimeTo(LocalDateTime.now())
|
||||||
.localDateTimeFrom(LocalDateTime.of(2010, 2, 3, 4, 5,6 ))
|
// .localDateTimeFrom(LocalDateTime.of(2010, 2, 3, 4, 5,6 ))
|
||||||
.mockedResponseId(323)
|
// .mockedResponseId(323)
|
||||||
.build();
|
// .build();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
void getEventsByDateTimeAndBusinessKeys() {
|
// void getEventsByDateTimeAndBusinessKeys() {
|
||||||
when(eventRepository.findEvents(any(), any(), any()))
|
// when(eventRepository.findEvents(any(), any(), any()))
|
||||||
.thenReturn(eventList);
|
// .thenReturn(eventList);
|
||||||
|
//
|
||||||
List<Event> responseList = etrackServiceImpl.getEventsByDateTimeAndBusinessKeys(eventRequestDto);
|
// List<Event> responseList = etrackServiceImpl.getEventsByDateTimeAndBusinessKeys(eventRequestDto);
|
||||||
assertThat(responseList, hasSize(4));
|
// assertThat(responseList, hasSize(4));
|
||||||
|
//
|
||||||
verify(eventRepository).findEvents(any(), any(), any());
|
// verify(eventRepository).findEvents(any(), any(), any());
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@AfterEach
|
// @AfterEach
|
||||||
void tearDown() { reset(eventRepository); }
|
// void tearDown() { reset(eventRepository); }
|
||||||
}
|
//}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.release11.klaus.service;
|
package com.release11.klaus.service;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.release11.klaus.mappers.MockedMessageMapper;
|
import com.release11.klaus.mappers.MockedMessageMapper;
|
||||||
import com.release11.klaus.mappers.MockedMessageMapperImpl;
|
import com.release11.klaus.mappers.MockedMessageMapperImpl;
|
||||||
import com.release11.klaus.model.MockedMessage;
|
import com.release11.klaus.model.MockedMessage;
|
||||||
@@ -94,7 +95,7 @@ class KlausServiceImplTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void getMockedResponse() {
|
void getMockedResponse() throws JsonProcessingException {
|
||||||
when(mockedResponseRepository.getByCompositePrimaryKey(any()))
|
when(mockedResponseRepository.getByCompositePrimaryKey(any()))
|
||||||
.thenReturn(mockedMessage1);
|
.thenReturn(mockedMessage1);
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -3,13 +3,13 @@
|
|||||||
<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>redis</host>
|
<host>localhost</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">
|
||||||
<!--https://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html-->
|
<!--https://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html-->
|
||||||
<Pattern>
|
<Pattern>
|
||||||
{"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":"%msg"}%n
|
{"dateTimeStamp" : "%d{yyyy-MM-dd}T%d{HH:mm:ss}", "eventId":"%X{eventId}", "interfaceName":"%X{interfaceName}", "clientUUID":"%X{clientUUID}", "messageId":"%X{messageId}", "thread":"%t","level":"%-5level", "message":%msg}%n
|
||||||
</Pattern>
|
</Pattern>
|
||||||
</layout>
|
</layout>
|
||||||
</appender>
|
</appender>
|
||||||
|
|||||||
@@ -84,6 +84,9 @@ $.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript" th:inline="javascript">
|
<script type="text/javascript" th:inline="javascript">
|
||||||
|
var messageListForPagination = /*[[${messageDtoList}]]*/;
|
||||||
|
</script>
|
||||||
|
<script type="text/javascript" th:inline="javascript">
|
||||||
var listForPagination = /*[[${eventList}]]*/;
|
var listForPagination = /*[[${eventList}]]*/;
|
||||||
</script>
|
</script>
|
||||||
<script src="/js/etrackPaggination.js"></script>
|
<script src="/js/etrackPaggination.js"></script>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user