diff --git a/boot/src/main/resources/application.properties b/boot/src/main/resources/application.properties deleted file mode 100644 index 4372e19a..00000000 --- a/boot/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -management.endpoints.web.exposure.include=prometheus diff --git a/boot/src/main/resources/application.yaml b/boot/src/main/resources/application.yaml new file mode 100644 index 00000000..c055e480 --- /dev/null +++ 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 index c4f8637e..6657c176 100644 --- 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 new file mode 100644 index 00000000..babbe707 --- /dev/null +++ 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 deleted file mode 100644 index 1f555777..00000000 --- a/trade-module/src/main/resources/application-local.properties +++ /dev/null @@ -1,10 +0,0 @@ -spring.liquibase.enabled=true -spring.liquibase.change-log=classpath:db/changelog/changelog-master.xml - -spring.datasource.url=jdbc:postgresql://localhost:54321/trademodule -spring.datasource.username=edpn_trademodule -spring.datasource.password=MSDVq372rNk3AwRq -spring.datasource.driver-class-name=org.postgresql.Driver - -spring.kafka.bootstrap-servers=localhost:9092 -spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer \ No newline at end of file diff --git a/trade-module/src/main/resources/application.properties b/trade-module/src/main/resources/application.properties deleted file mode 100644 index 98d6e3dd..00000000 --- a/trade-module/src/main/resources/application.properties +++ /dev/null @@ -1,10 +0,0 @@ -spring.liquibase.enabled=true -spring.liquibase.change-log=classpath:db/changelog/changelog-master.xml - -spring.datasource.url=${TRADEMODULE_DB_URL} -spring.datasource.username=${TRADEMODULE_DB_USERNAME} -spring.datasource.password=${TRADEMODULE_DB_PASSWORD} -spring.datasource.driver-class-name=org.postgresql.Driver - -spring.kafka.bootstrap-servers=${KAFKA_URL} -spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer diff --git a/trade-module/src/main/resources/db/changelog/changelog-master.xml b/trade-module/src/main/resources/db/changelog/changelog-master.xml deleted file mode 100644 index 9d604683..00000000 --- a/trade-module/src/main/resources/db/changelog/changelog-master.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/trade-module/src/main/resources/db/changelog/add_commodity_market_view_query_performance_indexes.xml b/trade-module/src/main/resources/db/trademodule/changelog/add_commodity_market_view_query_performance_indexes.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/add_commodity_market_view_query_performance_indexes.xml rename to trade-module/src/main/resources/db/trademodule/changelog/add_commodity_market_view_query_performance_indexes.xml diff --git a/trade-module/src/main/resources/db/changelog/add_foreign_key_indexes.xml b/trade-module/src/main/resources/db/trademodule/changelog/add_foreign_key_indexes.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/add_foreign_key_indexes.xml rename to trade-module/src/main/resources/db/trademodule/changelog/add_foreign_key_indexes.xml diff --git a/trade-module/src/main/resources/db/changelog/add_timestamp_market_datum_table.xml b/trade-module/src/main/resources/db/trademodule/changelog/add_timestamp_market_datum_table.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/add_timestamp_market_datum_table.xml rename to trade-module/src/main/resources/db/trademodule/changelog/add_timestamp_market_datum_table.xml diff --git a/trade-module/src/main/resources/db/changelog/add_unique_indexes.xml b/trade-module/src/main/resources/db/trademodule/changelog/add_unique_indexes.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/add_unique_indexes.xml rename to trade-module/src/main/resources/db/trademodule/changelog/add_unique_indexes.xml diff --git a/trade-module/src/main/resources/db/changelog/create_commodity_market_info_view.xml b/trade-module/src/main/resources/db/trademodule/changelog/create_commodity_market_info_view.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/create_commodity_market_info_view.xml rename to trade-module/src/main/resources/db/trademodule/changelog/create_commodity_market_info_view.xml diff --git a/trade-module/src/main/resources/db/changelog/create_commodity_table.xml b/trade-module/src/main/resources/db/trademodule/changelog/create_commodity_table.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/create_commodity_table.xml rename to trade-module/src/main/resources/db/trademodule/changelog/create_commodity_table.xml diff --git a/trade-module/src/main/resources/db/changelog/create_latest_market_data_view.xml b/trade-module/src/main/resources/db/trademodule/changelog/create_latest_market_data_view.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/create_latest_market_data_view.xml rename to trade-module/src/main/resources/db/trademodule/changelog/create_latest_market_data_view.xml diff --git a/trade-module/src/main/resources/db/changelog/create_market_datum_table.xml b/trade-module/src/main/resources/db/trademodule/changelog/create_market_datum_table.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/create_market_datum_table.xml rename to trade-module/src/main/resources/db/trademodule/changelog/create_market_datum_table.xml diff --git a/trade-module/src/main/resources/db/changelog/create_request_data_message_table.xml b/trade-module/src/main/resources/db/trademodule/changelog/create_request_data_message_table.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/create_request_data_message_table.xml rename to trade-module/src/main/resources/db/trademodule/changelog/create_request_data_message_table.xml diff --git a/trade-module/src/main/resources/db/changelog/create_station_table.xml b/trade-module/src/main/resources/db/trademodule/changelog/create_station_table.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/create_station_table.xml rename to trade-module/src/main/resources/db/trademodule/changelog/create_station_table.xml diff --git a/trade-module/src/main/resources/db/changelog/create_system_table.xml b/trade-module/src/main/resources/db/trademodule/changelog/create_system_table.xml similarity index 100% rename from trade-module/src/main/resources/db/changelog/create_system_table.xml rename to trade-module/src/main/resources/db/trademodule/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 new file mode 100644 index 00000000..3b2d9451 --- /dev/null +++ b/trade-module/src/main/resources/db/trademodule/changelog/trademodule-changelog.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/trade-module/src/main/resources/trademodule-local.yaml b/trade-module/src/main/resources/trademodule-local.yaml new file mode 100644 index 00000000..64ca7f9a --- /dev/null +++ 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 new file mode 100644 index 00000000..00774f44 --- /dev/null +++ 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