Cloud Config enhancements

Replaced keys of app configs
Added @ConfigurationProperties classes for mail related config

crss-admin/crss-admin-audit.yml

@@ -1,73 +1,74 @@
 crss:
-  fields:
-    role:
-      PERMISSIONS: Privileges
-    systemConfig:
-      KEY: Key
-      CONFIG_VALUE: Value
-    documentManagement:
-      REQT_CONSTRAINT: Required
-      LABEL: Label
-      DESCRIPTION: Description
-      FORM: Form
-      APPLICANT_TYPE: Application Type
-      MEMBERSHIP: Membership
-      SECTION: Section
-      EXPIRING: Expiring
-      MAX_FILES: Maximum number of files
-      VALID_EXTS: Valid Extensions
-    user:
-      FIRST_NAME: Firstname
-      LAST_NAME: Lastname
-      MIDDLE_NAME: Middlename
-      USERNAME: Username
-      EMAIL_ADDRESS: Email Address
-      PWD: Password
-      DEPARTMENT: Department
-      ENABLED: Enabled
-      USER_ROLES: Roles
-      USER_TYPE: User Type
-  values:
-    dropdownValues:
-      APP_VIEW_APPLICANT: View Applicant Signup Details
-      APP_ASSESS_APPLICANT: Assess Applicant Signup Details
-      ORG_CREATE_ORGANIZATION: Create Organization
-      ORG_UPDATE_ORGANIZATION: Update Organization
-      ORG_VIEW_ORGANIZATION: View Organization
-      REG_CREATE_REGISTRATION: Create Registration
-      REG_VIEW_REGISTRATION: View Registration
-      REG_UPDATE_REGISTRATION: Update Registration
-      REG_ROUTE_REGISTRATION: Route Registration
-      REG_ASSESS_REGISTRATION: Assess Registration
-      MIR_CREATE_MIRF: Create MIRF
-      MIR_UPDATE_MIRF: Update MIRF
-      MIR_VIEW_MIRF: View MIRF
-      MIR_DELETE_MIRF: Delete MIRF
-      MTN_CREATE_MARKET_TRADING_NODE: Create Market Trading Node
-      MTN_VIEW_MARKET_TRADING_NODE: View Market Trading Node
-      MTN_UPDATE_MARKET_TRADING_NODE: Update Market Trading Node
-      DOC_MANAGE_DOCUMENTS: Manage Documents
-      MQ_UPLOAD_METER_DATA: Upload Meter Quantity
-      MQ_VIEW_METERING_QUANTITY: View Metering Quantity
-      BCQ_UPLOAD_BILATERAL_CONTRACT_QUANTITY: Upload Bilateral Contract Quantity
-      BCQ_VIEW_BILATERAL_CONTRACT_QUANTITY: View Bilateral Contract Quantity
-      BCQ_ASSESS_BILATERAL_CONTRACT_QUANTITY: Assess Bilateral Contract Quantity
-      BCQ_CANCEL_BILATERAL_CONTRACT_QUANTITY: Cancel Bilateral Contract Quantity
-      ADM_USR_CREATE_USER: Create New User
-      ADM_USR_UPDATE_USER: Update User
-      ADM_USR_VIEW_USER: View User
-      ADM_ROL_CREATE_ROLE: Create New Role
-      ADM_ROL_UPDATE_ROLE: Update Role
-      ADM_ROL_VIEW_ROLE: View Role
-      ADM_ROL_DELETE_ROLE: Delete Role
-      ADM_PRI_VIEW_PRIVILEGES: View Privileges
-      ADM_AUD_MANAGE_AUDIT_LOGS: Manage Audit Logs
-      ADM_SYS_MANAGE_SYSTEM_CONFIG: Manage System Configuration
-      ADM_JOB_MANAGE_JOB_SCHEDULER: Manage Job Scheduler
-      MP_MANAGE_MARKET_PARTICIPANTS: Manage Market Participants
-      MP_MANAGE_WESM_MARKET_PRODUCTS: Manage WESM Market Products
-      REG_LINK_USER_REGISTRATION: Link User Registration
-      REG_VIEW_LIST_OF_REGISTRATION: View List Of Registration
-      MO: Market Operator
-      SO: System Operator
-      MP: Market Participant
+  audit:
+    fields:
+      role:
+        PERMISSIONS: Privileges
+      systemConfig:
+        KEY: Key
+        CONFIG_VALUE: Value
+      documentManagement:
+        REQT_CONSTRAINT: Required
+        LABEL: Label
+        DESCRIPTION: Description
+        FORM: Form
+        APPLICANT_TYPE: Application Type
+        MEMBERSHIP: Membership
+        SECTION: Section
+        EXPIRING: Expiring
+        MAX_FILES: Maximum number of files
+        VALID_EXTS: Valid Extensions
+      user:
+        FIRST_NAME: Firstname
+        LAST_NAME: Lastname
+        MIDDLE_NAME: Middlename
+        USERNAME: Username
+        EMAIL_ADDRESS: Email Address
+        PWD: Password
+        DEPARTMENT: Department
+        ENABLED: Enabled
+        USER_ROLES: Roles
+        USER_TYPE: User Type
+    values:
+      dropdownValues:
+        APP_VIEW_APPLICANT: View Applicant Signup Details
+        APP_ASSESS_APPLICANT: Assess Applicant Signup Details
+        ORG_CREATE_ORGANIZATION: Create Organization
+        ORG_UPDATE_ORGANIZATION: Update Organization
+        ORG_VIEW_ORGANIZATION: View Organization
+        REG_CREATE_REGISTRATION: Create Registration
+        REG_VIEW_REGISTRATION: View Registration
+        REG_UPDATE_REGISTRATION: Update Registration
+        REG_ROUTE_REGISTRATION: Route Registration
+        REG_ASSESS_REGISTRATION: Assess Registration
+        MIR_CREATE_MIRF: Create MIRF
+        MIR_UPDATE_MIRF: Update MIRF
+        MIR_VIEW_MIRF: View MIRF
+        MIR_DELETE_MIRF: Delete MIRF
+        MTN_CREATE_MARKET_TRADING_NODE: Create Market Trading Node
+        MTN_VIEW_MARKET_TRADING_NODE: View Market Trading Node
+        MTN_UPDATE_MARKET_TRADING_NODE: Update Market Trading Node
+        DOC_MANAGE_DOCUMENTS: Manage Documents
+        MQ_UPLOAD_METER_DATA: Upload Meter Quantity
+        MQ_VIEW_METERING_QUANTITY: View Metering Quantity
+        BCQ_UPLOAD_BILATERAL_CONTRACT_QUANTITY: Upload Bilateral Contract Quantity
+        BCQ_VIEW_BILATERAL_CONTRACT_QUANTITY: View Bilateral Contract Quantity
+        BCQ_ASSESS_BILATERAL_CONTRACT_QUANTITY: Assess Bilateral Contract Quantity
+        BCQ_CANCEL_BILATERAL_CONTRACT_QUANTITY: Cancel Bilateral Contract Quantity
+        ADM_USR_CREATE_USER: Create New User
+        ADM_USR_UPDATE_USER: Update User
+        ADM_USR_VIEW_USER: View User
+        ADM_ROL_CREATE_ROLE: Create New Role
+        ADM_ROL_UPDATE_ROLE: Update Role
+        ADM_ROL_VIEW_ROLE: View Role
+        ADM_ROL_DELETE_ROLE: Delete Role
+        ADM_PRI_VIEW_PRIVILEGES: View Privileges
+        ADM_AUD_MANAGE_AUDIT_LOGS: Manage Audit Logs
+        ADM_SYS_MANAGE_SYSTEM_CONFIG: Manage System Configuration
+        ADM_JOB_MANAGE_JOB_SCHEDULER: Manage Job Scheduler
+        MP_MANAGE_MARKET_PARTICIPANTS: Manage Market Participants
+        MP_MANAGE_WESM_MARKET_PRODUCTS: Manage WESM Market Products
+        REG_LINK_USER_REGISTRATION: Link User Registration
+        REG_VIEW_LIST_OF_REGISTRATION: View List Of Registration
+        MO: Market Operator
+        SO: System Operator
+        MP: Market Participant

crss-admin/crss-admin-dcos.yml

@@ -1,5 +1,6 @@
 spring:
-  profiles.include: embedded-ldap
+  profiles:
+    include: embedded-ldap
   datasource:
     platform : postgres
     url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_admin

crss-admin/crss-admin-dev.yml

@@ -1,5 +1,6 @@
 spring:
-  profiles.include: embedded-ldap
+  profiles:
+    include: embedded-ldap
   datasource:
     platform : postgres
     url: jdbc:postgresql://localhost:5432/crss_admin
@@ -35,4 +36,7 @@ spring:
 server:
   port: 8082
 
-app.esignatures.root-folder: target/crss/esig
+crss:
+  mail:
+    signature:
+      root-dir: target/crss/esig

crss-admin/crss-admin-pemc-staging.yml

@@ -1,5 +1,6 @@
 spring:
-  profiles.include: embedded-ldap
+  profiles:
+    include: embedded-ldap
   jpa:
     database: ORACLE
     properties:

crss-admin/crss-admin-staging.yml

@@ -1,5 +1,6 @@
 spring:
-  profiles.include: ldap
+  profiles:
+    include: ldap
   datasource:
     url: jdbc:postgresql://192.168.241.62:5432/crss_admin
     username: crss_admin

crss-admin/crss-admin-uat.yml

@@ -1,5 +1,6 @@
 spring:
-  profiles.include: ldap
+  profiles:
+    include: ldap
   datasource:
     url: jdbc:postgresql://192.168.235.6:5432/crss_admin
     username: crss_admin

crss-admin/crss-admin.yml

@@ -13,8 +13,10 @@ feign:
   hystrix:
     enabled: false
 
-app.esignatures.root-folder: /crss/esig
-
-const:
-   bcc:
-     emails: "{DOE:DOE@mail.com,ERC:ERC@mail.com}"
+crss:
+  mail:
+    signature:
+      root-dir: /crss/esig
+    bcc:
+      DOE: DOE@mail.com
+      ERC: ERC@mail.com