#43 - fixing application.properties files not overloading with multim…

…odule setup * #43 - fixing application.properties files not overloading with multimodule setup * #43 - moving liquibase files * #43 moving to yaml properties files, leveraging include in main application.yaml * #39 making module names uniform
ed-pilots-network · Jun 27, 2023 · 91b6159 · 91b6159
1 parent 9a74570
commit 91b6159
Show file tree

Hide file tree

Showing 21 changed files with 63 additions and 44 deletions.
diff --git a/boot/src/main/resources/application.properties b/boot/src/main/resources/application.properties
diff --git a/boot/src/main/resources/application.yaml b/boot/src/main/resources/application.yaml
@@ -0,0 +1,10 @@
+management:
+  endpoints:
+    web:
+      exposure:
+        include: prometheus,health
+
+spring:
+  config:
+    import:
+      - trademodule.yaml
diff --git a/trade-module/src/main/java/io/edpn/backend/trade/configuration/MessagingConfig.java b/trade-module/src/main/java/io/edpn/backend/trade/configuration/MessagingConfig.java
@@ -8,7 +8,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
+@Configuration("TradeModuleMessagingConfig")
 public class MessagingConfig {
 
     @Bean

diff --git a/trade-module/src/main/java/io/edpn/backend/trade/configuration/PropertyConfig.java b/trade-module/src/main/java/io/edpn/backend/trade/configuration/PropertyConfig.java
@@ -0,0 +1,7 @@
+package io.edpn.backend.trade.configuration;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration("TradeModulePropertyConfig")
+public class PropertyConfig {
+}
diff --git a/trade-module/src/main/resources/application-local.properties b/trade-module/src/main/resources/application-local.properties
diff --git a/trade-module/src/main/resources/application.properties b/trade-module/src/main/resources/application.properties
diff --git a/trade-module/src/main/resources/db/changelog/changelog-master.xml b/trade-module/src/main/resources/db/changelog/changelog-master.xml
diff --git a/...market_view_query_performance_indexes.xml → ...market_view_query_performance_indexes.xml b/...market_view_query_performance_indexes.xml → ...market_view_query_performance_indexes.xml
diff --git a/.../db/changelog/add_foreign_key_indexes.xml → ...ule/changelog/add_foreign_key_indexes.xml b/.../db/changelog/add_foreign_key_indexes.xml → ...ule/changelog/add_foreign_key_indexes.xml
diff --git a/...elog/add_timestamp_market_datum_table.xml → ...elog/add_timestamp_market_datum_table.xml b/...elog/add_timestamp_market_datum_table.xml → ...elog/add_timestamp_market_datum_table.xml
diff --git a/...urces/db/changelog/add_unique_indexes.xml → ...demodule/changelog/add_unique_indexes.xml b/...urces/db/changelog/add_unique_indexes.xml → ...demodule/changelog/add_unique_indexes.xml
diff --git a/...log/create_commodity_market_info_view.xml → ...log/create_commodity_market_info_view.xml b/...log/create_commodity_market_info_view.xml → ...log/create_commodity_market_info_view.xml
diff --git a/...s/db/changelog/create_commodity_table.xml → ...dule/changelog/create_commodity_table.xml b/...s/db/changelog/create_commodity_table.xml → ...dule/changelog/create_commodity_table.xml
diff --git a/...ngelog/create_latest_market_data_view.xml → ...ngelog/create_latest_market_data_view.xml b/...ngelog/create_latest_market_data_view.xml → ...ngelog/create_latest_market_data_view.xml
diff --git a/...b/changelog/create_market_datum_table.xml → ...e/changelog/create_market_datum_table.xml b/...b/changelog/create_market_datum_table.xml → ...e/changelog/create_market_datum_table.xml
diff --git a/...log/create_request_data_message_table.xml → ...log/create_request_data_message_table.xml b/...log/create_request_data_message_table.xml → ...log/create_request_data_message_table.xml
diff --git a/...ces/db/changelog/create_station_table.xml → ...module/changelog/create_station_table.xml b/...ces/db/changelog/create_station_table.xml → ...module/changelog/create_station_table.xml
diff --git a/...rces/db/changelog/create_system_table.xml → ...emodule/changelog/create_system_table.xml b/...rces/db/changelog/create_system_table.xml → ...emodule/changelog/create_system_table.xml
diff --git a/trade-module/src/main/resources/db/trademodule/changelog/trademodule-changelog.xml b/trade-module/src/main/resources/db/trademodule/changelog/trademodule-changelog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+
+    <include file="/db/trademodule/changelog/create_system_table.xml"/>
+    <include file="/db/trademodule/changelog/create_commodity_table.xml"/>
+    <include file="/db/trademodule/changelog/create_station_table.xml"/>
+    <include file="/db/trademodule/changelog/create_market_datum_table.xml"/>
+    <include file="/db/trademodule/changelog/add_foreign_key_indexes.xml"/>
+    <include file="/db/trademodule/changelog/add_commodity_market_view_query_performance_indexes.xml"/>
+    <include file="/db/trademodule/changelog/add_unique_indexes.xml"/>
+    <include file="/db/trademodule/changelog/create_request_data_message_table.xml"/>
+    <include file="/db/trademodule/changelog/add_timestamp_market_datum_table.xml"/>
+
+    <!-- views always last as they might depend on new columns -->
+    <include file="/db/trademodule/changelog/create_commodity_market_info_view.xml"/>
+    <include file="/db/trademodule/changelog/create_latest_market_data_view.xml"/>
+
+</databaseChangeLog>
diff --git a/trade-module/src/main/resources/trademodule-local.yaml b/trade-module/src/main/resources/trademodule-local.yaml
@@ -0,0 +1,8 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://localhost:54321/trademodule
+    username: edpn_trademodule
+    password: MSDVq372rNk3AwRq
+
+  kafka:
+    bootstrap-servers: localhost:9092
diff --git a/trade-module/src/main/resources/trademodule.yaml b/trade-module/src/main/resources/trademodule.yaml
@@ -0,0 +1,15 @@
+spring:
+  liquibase:
+    enabled: true
+    change-log: classpath:db/trademodule/changelog/trademodule-changelog.xml
+
+  datasource:
+    url: ${TRADEMODULE_DB_URL}
+    username: ${TRADEMODULE_DB_USERNAME}
+    password: ${TRADEMODULE_DB_PASSWORD}
+    driver-class-name: org.postgresql.Driver
+
+  kafka:
+    bootstrap-servers: ${KAFKA_URL}
+    consumer:
+      value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer