#39 moving to yaml properties files, leveraging include in main appli…

…cation.yaml
ed-pilots-network · Jun 27, 2023 · e336ce2 · e336ce2
1 parent 1261417
commit e336ce2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/boot/src/main/java/io/edpn/backend/configuration/PropertyConfig.java b/boot/src/main/java/io/edpn/backend/configuration/PropertyConfig.java
diff --git a/boot/src/main/resources/application.yaml b/boot/src/main/resources/application.yaml
@@ -8,3 +8,4 @@ spring:
   config:
     import:
       - trademodule.yaml
+      - usermodule.yaml
diff --git a/user-module/src/main/java/io/edpn/backend/user/configuration/PropertyConfig.java b/user-module/src/main/java/io/edpn/backend/user/configuration/PropertyConfig.java
@@ -5,9 +5,5 @@
 import org.springframework.context.annotation.PropertySources;
 
 @Configuration("UserModulePropertyConfig")
-@PropertySources({
-        @PropertySource("classpath:usermodule.properties"),
-        @PropertySource("classpath:usermodule-local.properties"),
-})
 public class PropertyConfig {
 }
diff --git a/user-module/src/main/resources/usermodule-local.yaml b/user-module/src/main/resources/usermodule-local.yaml
@@ -0,0 +1,5 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://localhost:54322/usermodule
+    username: edpn_usermodule
+    password: hvWYDHqG3yXCKReH
diff --git a/user-module/src/main/resources/usermodule.yaml b/user-module/src/main/resources/usermodule.yaml
@@ -0,0 +1,10 @@
+spring:
+  liquibase:
+    enabled: true
+    change-log: classpath:db/usermodule/changelog/usermodule-changelog.xml
+
+  datasource:
+    url: ${USERMODULE_DB_URL}
+    username: ${USERMODULE_DB_USERNAME}
+    password: ${USERMODULE_DB_PASSWORD}
+    driver-class-name: org.postgresql.Driver
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ spring: @@
       config:
         import:
           - trademodule.yaml
+          - usermodule.yaml