Give more flexibility for jdbc url: schemas, query parameters, dbname prefix (#14)

Author: jonenst

src/main/resources/application.yaml

@@ -9,7 +9,7 @@ spring:
       max-request-size: 103MB
 
   datasource:
-    url: ${dbApi}:${dbVendor}://${hostPort}/${dbName}${query}
+    url: ${dbUrl}
     username: ${login}
     password: ${password}
 
@@ -54,6 +54,14 @@ network-store-server:
   preloading-strategy: COLLECTION
   base-uri: http://localhost:8080/
 
+# this structure is shared among all microservices, if you change it, change it everywhere
+# customQuery allows a microservice to set query parameters specific to itself
+# if customQuery is empty, set queryBegin to "?", otherwise set it to "&"
+# this allow the user to add additional query elements common to all microservices
+# and using the appropriate leading character depending on whether the microsevice
+# uses custom query parameters
+queryBegin: '?'
+customQuery:
 dbName: dynamicmappings
 dbApi: jdbc
 

src/main/resources/database.properties

@@ -1,7 +1,33 @@
+# This file is meant to be overriden in deployments by a single file in all microservices
+# if you change its structure, change it in all microservices.
+# values here can be overriden for all microservices in this common file,
+# or in specific microservices in its specific application.yml file
+
+# default values
 dbVendor=postgresql
 host=localhost
 port=5432
 query=
 login=postgres
 password=postgres
-hostPort=${host}:${port}
+# use this if you want to use the preferred db name of the microservice,
+# but with multiple variants, like for different environments
+dbPrefix=
+
+# these allow to customize the url construction a bit for weird jdbc connection strings
+hostPort=://${host}:${port}/
+dbProtocolHost=${dbApi}:${dbVendor}${hostPort}
+
+dbFullName=${dbPrefix}${dbName}
+finalQuery=${customQuery}${query}
+dbManyBasesPath=${dbFullName}${finalQuery}
+dbManySchemasPath=${commonDbName}?currentSchema=${dbFullName}${finalQuery}
+
+dbUrlManyBases=${dbProtocolHost}${dbManyBasesPath}
+dbUrlManySchemas=${dbProtocolHost}${dbManySchemasPath}
+
+# leave this if you want 1 database per microservice
+dbUrl=${dbUrlManyBases}
+# use this if you want 1 database for all microservice, each in a schema
+# and set commonDbName
+#dbUrl=${dbUrlManySchemas}

src/test/resources/application-default.yml

@@ -16,7 +16,7 @@ logging:
 
 dbVendor: h2:mem
 query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-hostPort:
+hostPort: ":"
 
 backing-services:
   case: