#322 use host prop

croc-code · May 18, 2019 · e148b47 · e148b47
1 parent e59658d
commit e148b47
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/connection/SimpleEndpoint.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/connection/SimpleEndpoint.kt
@@ -30,14 +30,14 @@ import com.google.gson.reflect.TypeToken
 import org.apache.tomcat.jdbc.pool.DataSource
 import org.springframework.core.io.Resource
 
-
 /**
  * @author Maksim Gramin ([email protected])
  * @version $Id: f221782080d430e77aed80ef8446745687c350f4 $
  * @since 0.1
  */
 open class SimpleEndpoint(
         var name: String? = null,
+        var host: String? = null,
         @JsonIgnore var baseFolder: Resource? = null,
         var user: String? = null,
         @JsonIgnore var password: String? = null,
@@ -47,20 +47,16 @@ open class SimpleEndpoint(
         var dialect: String? = null
 ) : Endpoint {
 
-    override fun name() = this.name!!
-
-    override fun host(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
+    override fun name() = name!!
 
-    override fun dialect() = this.dialect!!
+    override fun host() = host!!
 
-    private var dataSource: DataSource? = null
+    override fun dialect() = dialect!!
 
-    override fun properties(): Map<String, Any> {
-        return Gson().fromJson(properties, object : TypeToken<Map<String, Any>>() {}.type)
-    }
+    override fun properties(): Map<String, Any> =
+            Gson().fromJson(properties, object : TypeToken<Map<String, Any>>() {}.type)
 
+    private var dataSource: DataSource? = null
 
     @JsonIgnore
     override fun getDataSource(): DataSource {

diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceTypeTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceTypeTest.kt
@@ -54,16 +54,26 @@ class FsResourceTypeTest {
 
     init {
         dbMd.name = "unit_test_db_md"
+        dbMd.host = "127.0.0.1"
         dbMd.dialect = "h2"
         dbMd.baseFolder = FileSystemResource("conf/h2/md/database")
         dbMd.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"
-        dbMd.properties = """{ "url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';" }"""
+        dbMd.properties = """
+            {
+                "url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';"
+            }
+            """.trimIndent()
 
         dbSql.name = "unit_test_db_sql"
+        dbSql.host = "127.0.0.1"
         dbSql.dialect = "h2"
         dbSql.baseFolder = FileSystemResource("conf/h2/sql/database")
         dbSql.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"
-        dbSql.properties = """{ "url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';" }"""
+        dbSql.properties = """
+            {
+                "url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';"
+            }
+            """.trimIndent()
     }
 
     @ParameterizedTest

diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceTypeTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceTypeTest.kt
@@ -51,10 +51,15 @@ class SqlResourceTypeTest {
 
     init {
         db.name = "unit_test_db"
+        db.host = "127.0.0.1"
         db.dialect = "h2"
         db.baseFolder = FileSystemResource("conf/h2/database")
         db.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"
-        db.properties = """{ "url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';" }"""
+        db.properties = """
+            {
+                "url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';"
+            }
+            """.trimIndent()
     }
 
     @Test

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -7,6 +7,7 @@ conf:
 
   endpoints:
     - name: h2
+      host: 127.0.0.1
       dialect: h2
       baseFolder: file:conf/h2/md/database
       driverClassName: org.h2.Driver
@@ -17,6 +18,7 @@ conf:
           "description": "Embedded db for unit tests only"
         }
     - name: dev
+      host: 127.0.0.1
       dialect: h2
       baseFolder: file:conf/h2/md/database
       driverClassName: org.h2.Driver
@@ -29,6 +31,7 @@ conf:
           "css_class": "fas fa-fw fa-2x fa-tools"
         }
     - name: test
+      host: 127.0.0.1
       dialect: h2
       baseFolder: file:conf/h2/md/database
       driverClassName: org.h2.Driver
@@ -41,6 +44,7 @@ conf:
           "css_class": "fas fa-fw fa-2x fa-bug"
         }
     - name: prod
+      host: 127.0.0.1
       dialect: h2
       baseFolder: file:conf/h2/md/database
       driverClassName: org.h2.Driver