From a99e97fda1164ed2804f1af5c9ac5dcc4a862da2 Mon Sep 17 00:00:00 2001
From: Szakalakamaka <rafzukow@gmail.com>
Date: Wed, 28 Oct 2020 13:04:01 +0100
Subject: [PATCH] adding profiles to bootstrap.yml

---
 .idea/workspace.xml                           | 60 ++++++++++---------
 src/main/resources/application-DEV.properties |  2 +-
 src/main/resources/bootstrap-PROD.yml         |  2 +
 src/main/resources/bootstrap.properties       |  7 +--
 src/main/resources/bootstrap.yml              |  4 +-
 .../mappers/MockedMessageMapperImpl.java      |  2 +-
 6 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aec25d7..4e54ac7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,6 +24,11 @@
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-DEV.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-DEV.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap-PROD.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap-PROD.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" 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/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -75,7 +80,7 @@
     <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.defaultLibrarySuperClass.JUnit5" value="" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../mockedservices-klaus-config-server" />
     <property name="restartRequiresConfirmation" value="false" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
@@ -92,18 +97,18 @@
       <recent name="com.release11.klaus.repository" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\phabricator\mockedservices-master" />
       <recent name="D:\phabricator\mockedservices" />
       <recent name="D:\phabricator\mockedservices\src" />
       <recent name="D:\phabricator\mockedservices\src\main\java\com\release11\klaus\docker" />
       <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static\js" />
-      <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\phabricator\mockedservices-master\src" />
       <recent name="D:\phabricator\mockedservices-master\src\main\resources" />
       <recent name="D:\phabricator\mockedservices-master" />
       <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static\js" />
       <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\templates" />
-      <recent name="D:\git\Szakalakamaka\Klaus\src\main\resources\static\img" />
     </key>
     <key name="CreateClassDialog.RecentsKey">
       <recent name="com.release11.klaus.repository" />
@@ -263,13 +268,6 @@
       <option name="presentableId" value="Default" />
       <updated>1598862102028</updated>
     </task>
-    <task id="LOCAL-00058" summary="adding logs from the application">
-      <created>1601297733933</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1601297733934</updated>
-    </task>
     <task id="LOCAL-00059" summary="adding logs from the application">
       <created>1601297895444</created>
       <option name="number" value="00059" />
@@ -606,7 +604,14 @@
       <option name="project" value="LOCAL" />
       <updated>1603724236562</updated>
     </task>
-    <option name="localTasksCounter" value="107" />
+    <task id="LOCAL-00107" summary="adding profiles to dockerfile">
+      <created>1603883796525</created>
+      <option name="number" value="00107" />
+      <option name="presentableId" value="LOCAL-00107" />
+      <option name="project" value="LOCAL" />
+      <updated>1603883796526</updated>
+    </task>
+    <option name="localTasksCounter" value="108" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -626,7 +631,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="fixing update, delete buttons" />
     <MESSAGE value="sort buttons for etrack" />
     <MESSAGE value="js small fixes" />
     <MESSAGE value="js fix sort paggination, show body for etrack" />
@@ -651,7 +655,8 @@
     <MESSAGE value="unit tests" />
     <MESSAGE value="updating cloud settings" />
     <MESSAGE value="testing config service" />
-    <option name="LAST_COMMIT_MESSAGE" value="testing config service" />
+    <MESSAGE value="adding profiles to dockerfile" />
+    <option name="LAST_COMMIT_MESSAGE" value="adding profiles to dockerfile" />
   </component>
   <component name="WindowStateProjectService">
     <state x="904" y="236" key="#Notifications" timestamp="1600868491636">
@@ -662,10 +667,10 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <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="1603723397911">
+    <state x="2620" y="382" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1603883713801">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
-    <state x="2620" y="382" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603723397911" />
+    <state x="2620" y="382" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603883713801" />
     <state x="574" y="128" key="#com.intellij.ide.util.MemberChooser" timestamp="1599641773245">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -696,43 +701,44 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="508" y="128" width="904" height="610" key="EnvironmentVariablesDialog/0.0.1536.824@0.0.1536.824" timestamp="1601384219062" />
-    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1602662342585">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state x="2606" y="235" key="FileChooserDialogImpl" timestamp="1603885972656">
+      <screen x="1920" y="0" width="1920" height="1160" />
     </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.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="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
-    <state width="1877" height="317" key="GridCell.Tab.0.bottom" timestamp="1603724251155">
+    <state width="1877" height="317" key="GridCell.Tab.0.bottom" timestamp="1603886417381">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
-    <state width="1877" height="317" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603724251155" />
+    <state width="1877" height="317" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
     <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="317" key="GridCell.Tab.0.center" timestamp="1603724251155">
+    <state width="1877" height="317" key="GridCell.Tab.0.center" timestamp="1603886417381">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424968" />
-    <state width="1877" height="317" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603724251155" />
+    <state width="1877" height="317" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
     <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="317" key="GridCell.Tab.0.left" timestamp="1603724251155">
+    <state width="1877" height="317" key="GridCell.Tab.0.left" timestamp="1603886417381">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424967" />
-    <state width="1877" height="317" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603724251155" />
+    <state width="1877" height="317" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
     <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="317" key="GridCell.Tab.0.right" timestamp="1603724251155">
+    <state width="1877" height="317" key="GridCell.Tab.0.right" timestamp="1603886417381">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
-    <state width="1877" height="317" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603724251155" />
+    <state width="1877" height="317" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
     <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">
       <screen x="1920" y="0" width="1920" height="1160" />
@@ -780,13 +786,13 @@
     </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@0.0.1536.824" timestamp="1601975962923" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1603724239080">
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1603883799501">
       <screen x="1920" y="0" width="1920" height="1160" />
     </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="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
     <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255416393" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603724239080" />
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603883799501" />
     <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">
       <screen x="1920" y="0" width="1920" height="1040" />
diff --git a/src/main/resources/application-DEV.properties b/src/main/resources/application-DEV.properties
index 74b730a..521587f 100644
--- a/src/main/resources/application-DEV.properties
+++ b/src/main/resources/application-DEV.properties
@@ -1,7 +1,7 @@
 #environment:
 server.port = 8097
 spring.application.name = klaus
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
+eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
 
 #logging:
 spring.output.ansi.enabled = always
diff --git a/src/main/resources/bootstrap-PROD.yml b/src/main/resources/bootstrap-PROD.yml
index 3a46aac..c9a2696 100644
--- a/src/main/resources/bootstrap-PROD.yml
+++ b/src/main/resources/bootstrap-PROD.yml
@@ -1,4 +1,6 @@
 spring:
+  profiles:
+    active: PROD
   application:
     name: klaus
   cloud:
diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties
index 11db1dc..10024bd 100644
--- a/src/main/resources/bootstrap.properties
+++ b/src/main/resources/bootstrap.properties
@@ -1,6 +1,4 @@
 #environment:
-spring.cloud.discovery.enabled=true
-spring.cloud.config.discovery.enabled = true
 spring.cloud.config.discovery.service-id = klaus-config-service
 spring.cloud.config.fail-fast=true
 #spring.cloud.config.retry.initial-interval = 1500
@@ -9,10 +7,7 @@ spring.cloud.config.fail-fast=true
 #spring.cloud.config.retry.max-intervals = 1000
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
-
 eureka.instance.preferIpAddress = true
-eureka.instance.hostname = klaus
-eureka.client.registerWithEureka = true
-eureka.client.fetchRegistry = true
+
 
 
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index 3a46aac..320de77 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -1,4 +1,6 @@
 spring:
+  profiles:
+    active: DEV
   application:
     name: klaus
   cloud:
@@ -20,4 +22,4 @@ eureka:
     register-with-eureka: true
     fetch-registry: true
     serviceUrl:
-      defaultZone: http://netflix:eureka@eureka:8761/eureka
+      defaultZone: http://netflix:eureka@localhost:8761/eureka
diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
index e706c81..ee9463c 100644
--- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
+++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2020-10-14T13:24:17+0200",
+    date = "2020-10-28T12:55:15+0100",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)"
 )
 @Component