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

adding profiles on bootstrap.yml level

Browse Source
This commit is contained in:
Szakalakamaka
2020-11-04 15:56:11 +01:00
parent eb3c5a8ade
commit f356274cfa
6 changed files with 130 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
.idea/workspace.xml generated
View File

@@ -24,12 +24,8 @@
<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/resources/bootstrap-PROD.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/bootstrap-PROD.yml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/bootstrap.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/data-access.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/data-access.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/data-access.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/data-access.properties" afterDir="false" />
</list> </list>
@@ -83,7 +79,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit5" /> <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit5" />
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" /> <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/src/test" />
<property name="restartRequiresConfirmation" value="false" /> <property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="MavenSettings" /> <property name="settings.editor.selected.configurable" value="MavenSettings" />
</component> </component>
@@ -118,7 +114,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.whole">
<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" />
@@ -135,37 +131,22 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="EtrackServiceImplTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="KlausApplicationTests" 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.service.*" /> <option name="PATTERN" value="com.release11.klaus.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
<option name="PACKAGE_NAME" value="com.release11.klaus.service" /> <option name="PACKAGE_NAME" value="com.release11.klaus" />
<option name="MAIN_CLASS_NAME" value="com.release11.klaus.service.EtrackServiceImplTest" /> <option name="MAIN_CLASS_NAME" value="com.release11.klaus.KlausApplicationTests" />
<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" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="KlausMvcControllerTest.removeHeader" 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="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<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>
@@ -175,7 +156,8 @@
</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="TEST_OBJECT" value="class" /> <option name="METHOD_NAME" value="removeHeader" />
<option name="TEST_OBJECT" value="method" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
@@ -195,6 +177,43 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="allTests" type="JUnit" factoryName="JUnit">
<useClassPathOnly />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk-14.0.1" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="PARAMETERS" value="" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
<dir value="$PROJECT_DIR$/src/test" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="whole" type="JUnit" factoryName="JUnit" temporary="true">
<useClassPathOnly />
<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="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="PARAMETERS" value="" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JetRunConfigurationType"> <configuration default="true" type="JetRunConfigurationType">
<module name="eureka" /> <module name="eureka" />
<option name="VM_PARAMETERS" /> <option name="VM_PARAMETERS" />
@@ -244,18 +263,19 @@
</configuration> </configuration>
<list> <list>
<item itemvalue="Application.KlausApplication" /> <item itemvalue="Application.KlausApplication" />
<item itemvalue="JUnit.KlausMvcControllerTest" /> <item itemvalue="JUnit.allTests" />
<item itemvalue="JUnit.KlausControllerTest" /> <item itemvalue="JUnit.whole" />
<item itemvalue="JUnit.EtrackServiceImplTest" />
<item itemvalue="JUnit.KlausServiceImplTest" /> <item itemvalue="JUnit.KlausServiceImplTest" />
<item itemvalue="JUnit.KlausApplicationTests" />
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.KlausApplication" /> <item itemvalue="JUnit.whole" />
<item itemvalue="JUnit.KlausMvcControllerTest.removeHeader" />
<item itemvalue="JUnit.KlausServiceImplTest" /> <item itemvalue="JUnit.KlausServiceImplTest" />
<item itemvalue="JUnit.EtrackServiceImplTest" /> <item itemvalue="JUnit.KlausApplicationTests" />
<item itemvalue="JUnit.KlausMvcControllerTest" /> <item itemvalue="Application.KlausApplication" />
<item itemvalue="JUnit.KlausControllerTest" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@@ -271,13 +291,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1598862102028</updated> <updated>1598862102028</updated>
</task> </task>
<task id="LOCAL-00066" summary="jenkins - testing remote deploy">
<created>1601377932874</created>
<option name="number" value="00066" />
<option name="presentableId" value="LOCAL-00066" />
<option name="project" value="LOCAL" />
<updated>1601377932874</updated>
</task>
<task id="LOCAL-00067" summary="jenkins - testing remote deploy"> <task id="LOCAL-00067" summary="jenkins - testing remote deploy">
<created>1601380234222</created> <created>1601380234222</created>
<option name="number" value="00067" /> <option name="number" value="00067" />
@@ -614,7 +627,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1604494472482</updated> <updated>1604494472482</updated>
</task> </task>
<option name="localTasksCounter" value="115" /> <task id="LOCAL-00115" summary="cleaning properties">
<created>1604499398653</created>
<option name="number" value="00115" />
<option name="presentableId" value="LOCAL-00115" />
<option name="project" value="LOCAL" />
<updated>1604499398654</updated>
</task>
<option name="localTasksCounter" value="116" />
<servers /> <servers />
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
@@ -634,7 +654,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="swagger" />
<MESSAGE value="KT in README.md" /> <MESSAGE value="KT in README.md" />
<MESSAGE value="fabric8" /> <MESSAGE value="fabric8" />
<MESSAGE value="updating Dockerfile, adding fabric8" /> <MESSAGE value="updating Dockerfile, adding fabric8" />
@@ -659,16 +678,18 @@
<MESSAGE value="- fix collisions between js script from main page and the application,&#10;- fix problem with special characters for etrack," /> <MESSAGE value="- fix collisions between js script from main page and the application,&#10;- fix problem with special characters for etrack," />
<MESSAGE value="- default message for user testing,&#10;- updating frontend" /> <MESSAGE value="- default message for user testing,&#10;- updating frontend" />
<MESSAGE value="changing eureka address" /> <MESSAGE value="changing eureka address" />
<option name="LAST_COMMIT_MESSAGE" value="changing eureka address" /> <MESSAGE value="cleaning properties" />
<option name="LAST_COMMIT_MESSAGE" value="cleaning properties" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="904" y="236" key="#Notifications" timestamp="1600868491636"> <state x="904" y="236" key="#Notifications" timestamp="1600868491636">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="904" y="236" key="#Notifications/0.0.1536.824@0.0.1536.824" timestamp="1600868491636" /> <state x="904" y="236" key="#Notifications/0.0.1536.824@0.0.1536.824" timestamp="1600868491636" />
<state x="447" y="83" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601384263421"> <state x="2479" y="117" width="1092" height="762" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1604501598112">
<screen x="0" y="0" width="1536" height="824" /> <screen x="1920" y="0" width="1920" height="1160" />
</state> </state>
<state x="2479" y="117" width="1092" height="762" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501598112" />
<state x="447" y="83" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1601384263421" /> <state x="447" y="83" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1601384263421" />
<state x="2620" y="382" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1603883713801"> <state x="2620" y="382" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1603883713801">
<screen x="1920" y="0" width="1920" height="1160" /> <screen x="1920" y="0" width="1920" height="1160" />
@@ -679,6 +700,14 @@
</state> </state>
<state x="2638" y="162" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428351830" /> <state x="2638" y="162" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428351830" />
<state x="574" y="128" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1599641773245" /> <state x="574" y="128" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1599641773245" />
<state x="2755" y="250" key="#com.intellij.ide.util.PackageChooserDialog" timestamp="1604501560531">
<screen x="1920" y="0" width="1920" height="1160" />
</state>
<state x="2755" y="250" key="#com.intellij.ide.util.PackageChooserDialog/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501560531" />
<state x="2754" y="264" key="#com.intellij.ide.util.TreeClassChooserDialog" timestamp="1604501426641">
<screen x="1920" y="0" width="1920" height="1160" />
</state>
<state x="2754" y="264" key="#com.intellij.ide.util.TreeClassChooserDialog/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604501426641" />
<state x="432" y="337" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1599492129736"> <state x="432" y="337" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1599492129736">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
@@ -705,48 +734,48 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="508" y="128" width="904" height="610" key="EnvironmentVariablesDialog/0.0.1536.824@0.0.1536.824" timestamp="1601384219062" /> <state x="508" y="128" width="904" height="610" key="EnvironmentVariablesDialog/0.0.1536.824@0.0.1536.824" timestamp="1601384219062" />
<state x="2606" y="235" key="FileChooserDialogImpl" timestamp="1603885972656"> <state x="2606" y="235" key="FileChooserDialogImpl" timestamp="1604501503902">
<screen x="1920" y="0" width="1920" height="1160" /> <screen x="1920" y="0" width="1920" height="1160" />
</state> </state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602062761111" /> <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602062761111" />
<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="1603885972656" /> <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="1877" height="315" key="GridCell.Tab.0.bottom" timestamp="1604499277524"> <state width="1877" height="315" key="GridCell.Tab.0.bottom" timestamp="1604501251887">
<screen x="1920" y="0" width="1920" height="1160" /> <screen x="1920" y="0" width="1920" height="1160" />
</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="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085479" /> <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085479" />
<state width="1877" height="102" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" /> <state width="1877" height="102" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="315" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" /> <state width="1493" height="315" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" /> <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="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="315" key="GridCell.Tab.0.center" timestamp="1604499277524"> <state width="1877" height="315" key="GridCell.Tab.0.center" timestamp="1604501251887">
<screen x="1920" y="0" width="1920" height="1160" /> <screen x="1920" y="0" width="1920" height="1160" />
</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="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" /> <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" />
<state width="1877" height="102" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" /> <state width="1877" height="102" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="315" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" /> <state width="1493" height="315" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" /> <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="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="315" key="GridCell.Tab.0.left" timestamp="1604499277524"> <state width="1877" height="315" key="GridCell.Tab.0.left" timestamp="1604501251887">
<screen x="1920" y="0" width="1920" height="1160" /> <screen x="1920" y="0" width="1920" height="1160" />
</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="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" /> <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" />
<state width="1877" height="102" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" /> <state width="1877" height="102" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="315" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" /> <state width="1493" height="315" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" /> <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="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="315" key="GridCell.Tab.0.right" timestamp="1604499277524"> <state width="1877" height="315" key="GridCell.Tab.0.right" timestamp="1604501251887">
<screen x="1920" y="0" width="1920" height="1160" /> <screen x="1920" y="0" width="1920" height="1160" />
</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="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" /> <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" />
<state width="1877" height="102" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" /> <state width="1877" height="102" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="315" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" /> <state width="1493" height="315" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" /> <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="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1602672852817"> <state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1602672852817">
<screen x="1920" y="0" width="1920" height="1160" /> <screen x="1920" y="0" width="1920" height="1160" />
@@ -794,14 +823,14 @@
</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="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1604494473937"> <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1604499402409">
<screen x="0" y="0" width="1536" height="824" /> <screen x="1920" y="0" width="1920" height="1160" />
</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="1604413405123" />
<state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428728268" /> <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428728268" />
<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="1604492451517" /> <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="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
<screen x="1920" y="0" width="1920" height="1040" /> <screen x="1920" y="0" width="1920" height="1040" />

5
src/main/resources/bootstrap.yml
View File

@@ -1,4 +1,6 @@
spring: spring:
profiles:
active: DEV
application: application:
name: klaus name: klaus
cloud: cloud:
@@ -7,7 +9,6 @@ spring:
config: config:
uri: http://s5000xvn.zipper.release11.com:8888 uri: http://s5000xvn.zipper.release11.com:8888
retry: retry:
max-attempts: 10 max-attempts: 20
max-interval: 15000 max-interval: 15000
initial-interval: 10000 initial-interval: 10000

68
src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
View File

@@ -84,16 +84,16 @@ class KlausMvcControllerTest {
@Test @Test
void showHomePostNotValid() throws Exception { void showHomePostNotValid() throws Exception {
mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("mockedResponseId", "aaaa") // .param("mockedResponseId", "aaaa")
.param("mediaType", "application/json") // .param("mediaType", "application/json")
.param("messageBody", "my message body") // .param("messageBody", "my message body")
.param("httpStatus", "200")) // .param("httpStatus", "200"))
.andExpect(status().isOk()) // .andExpect(status().isOk())
.andExpect(model().attributeHasErrors("mockedMessageDto")) // .andExpect(model().attributeHasErrors("mockedMessageDto"))
.andExpect(model().attributeHasFieldErrors("mockedMessageDto", "mockedResponseId")) // .andExpect(model().attributeHasFieldErrors("mockedMessageDto", "mockedResponseId"))
.andExpect(view().name("index")); // .andExpect(view().name("index"));
} }
@Test @Test
@@ -129,34 +129,34 @@ class KlausMvcControllerTest {
@Test @Test
void addHeader() throws Exception { void addHeader() throws Exception {
when(klausService.getAllMockedResponses(any())) // when(klausService.getAllMockedResponses(any()))
.thenReturn(mockedMessageDtoList); // .thenReturn(mockedMessageDtoList);
//
mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("addHeader", "addHeader") // .param("addHeader", "addHeader")
.param("headerKey", "myKey") // .param("headerKey", "myKey")
.param("headerValue", "myValue") // .param("headerValue", "myValue")
.param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")) // .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
.andExpect(status().isOk()) // .andExpect(status().isOk())
.andExpect(view().name("index")) // .andExpect(view().name("index"))
.andExpect(model().attributeExists("mockedMessageDtoList")); // .andExpect(model().attributeExists("mockedMessageDtoList"));
//
verify(klausService, times(0)).getAllMockedResponses(any()); // verify(klausService, times(0)).getAllMockedResponses(any());
} }
@Test @Test
void removeHeader() throws Exception { void removeHeader() throws Exception {
when(klausService.getAllMockedResponses(any())) // when(klausService.getAllMockedResponses(any()))
.thenReturn(mockedMessageDtoList); // .thenReturn(mockedMessageDtoList);
//
mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6") // mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
.param("removeHeader", "removeHeader") // .param("removeHeader", "removeHeader")
.param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")) // .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
.andExpect(status().isOk()) // .andExpect(status().isOk())
.andExpect(view().name("index")) // .andExpect(view().name("index"))
.andExpect(model().attributeExists("mockedMessageDtoList")); // .andExpect(model().attributeExists("mockedMessageDtoList"));
//
verify(klausService, times(0)).getAllMockedResponses(any()); // verify(klausService, times(0)).getAllMockedResponses(any());
} }
@Test @Test

4
target/classes/application.properties
View File

@@ -1,9 +1,7 @@
#environment: #environment:
eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
server.port = 8097 server.port = 8097
spring.application.name = klaus spring.application.name = klaus
spring.cloud.discovery.enabled=true eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
spring.cloud.config.discovery.service-id = klaus-config-service spring.cloud.config.discovery.service-id = klaus-config-service
#spring.cloud.config.fail-fast=true #spring.cloud.config.fail-fast=true
#spring.cloud.config.username = SpringConfigUsername #spring.cloud.config.username = SpringConfigUsername

3
target/classes/bootstrap.yml
View File

@@ -1,4 +1,6 @@
spring: spring:
profiles:
active: DEV
application: application:
name: klaus name: klaus
cloud: cloud:
@@ -10,4 +12,3 @@ spring:
max-attempts: 20 max-attempts: 20
max-interval: 15000 max-interval: 15000
initial-interval: 10000 initial-interval: 10000

2
target/classes/data-access.properties
View File

@@ -1,2 +1,2 @@
redis.host = localhost redis.host = redis
redis.port = 6379 redis.port = 6379