Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix application.properties syntax issue #159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ logging.level.org.hibernate.SQL=DEBUG
logging.level.io.eventuate=DEBUG
logging.level.net.chrisrichardson.ftgo=DEBUG
logging.level.io.eventuate.tram=DEBUG
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_accounting_service
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/ftgo_accounting_service
spring.datasource.username=ftgo_accounting_service_user
spring.datasource.password=ftgo_accounting_service_password
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ logging.level.org.hibernate.SQL=DEBUG
logging.level.io.eventuate=DEBUG
logging.level.net.chrisrichardson.ftgo=DEBUG
logging.level.io.eventuate.tram=DEBUG
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_consumer_service
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/ftgo_consumer_service
spring.datasource.username=ftgo_consumer_service_user
spring.datasource.password=ftgo_consumer_service_password
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ logging.level.net.chrisrichardson.ftgo=DEBUG
logging.level.io.eventuate.tram=DEBUG

eventuate.database.schema=none
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_delivery_service
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/ftgo_delivery_service
spring.datasource.username=ftgo_delivery_service_user
spring.datasource.password=ftgo_delivery_service_password
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ logging.level.io.eventuate=DEBUG
logging.level.net.chrisrichardson.ftgo=DEBUG
logging.level.io.eventuate.tram=DEBUG

spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_kitchen_service
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/ftgo_kitchen_service
spring.datasource.username=ftgo_kitchen_service_user
spring.datasource.password=ftgo_kitchen_service_password
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181
10 changes: 5 additions & 5 deletions ftgo-kitchen-service/src/test/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ spring.jpa.generate-ddl=true
stubrunner.stream.enabled=false
stubrunner.integration.enabled=false

spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/eventuate
spring.datasource.username=mysqluser
spring.datasource.password=mysqlpw
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:-localhost}/bankingexampledb

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181

aws.access.key_id=id_key
aws.secret.access.key=access_key
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:localhost}:8000
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:-localhost}:8000
aws.region=us-west-2
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ logging.level.net.chrisrichardson.ftgo=DEBUG
logging.level.io.eventuate.tram=DEBUG
logging.level.root=INFO

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181

aws.access.key_id=id_key
aws.secret.access.key=access_key
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:localhost}:8000
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:-localhost}:8000
aws.region=us-west-2
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ spring.jpa.generate-ddl=true
stubrunner.stream.enabled=false
stubrunner.integration.enabled=false

spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/eventuate
spring.datasource.username=mysqluser
spring.datasource.password=mysqlpw
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:-localhost}/bankingexampledb

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181

aws.access.key_id=id_key
aws.secret.access.key=access_key
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:localhost}:8000
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:-localhost}:8000
aws.region=us-west-2
6 changes: 3 additions & 3 deletions ftgo-order-service/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ logging.level.net.chrisrichardson.ftgo=DEBUG
logging.level.io.eventuate.tram=DEBUG

eventuate.database.schema=none
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_order_service
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/ftgo_order_service
spring.datasource.username=ftgo_order_service_user
spring.datasource.password=ftgo_order_service_password
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
logging.level.org.springframework=INFO
logging.level.org.springframework.jdbc.datasource.DataSourceUtils=DEBUG

spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/eventuate
spring.datasource.username=mysqluser
spring.datasource.password=mysqlpw
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181

aws.access.key_id=id_key
aws.secret.access.key=access_key
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:localhost}:8000
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:-localhost}:8000
aws.region=us-west-2
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ logging.level.io.eventuate=DEBUG
logging.level.net.chrisrichardson.ftgo=DEBUG
logging.level.io.eventuate.tram=DEBUG

spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_restaurant_service
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:-localhost}/ftgo_restaurant_service
spring.datasource.username=ftgo_restaurant_service_user
spring.datasource.password=ftgo_restaurant_service_password
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:-localhost}:9092
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:-localhost}:2181