#347

Author: mgramin

src/main/kotlin/com/github/mgramin/sqlboot/model/connection/SimpleEndpoint.kt

@@ -33,8 +33,6 @@
 package com.github.mgramin.sqlboot.model.connection
 
 import com.fasterxml.jackson.annotation.JsonIgnore
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import org.apache.tomcat.jdbc.pool.DataSource
 
 /**
@@ -45,18 +43,14 @@ import org.apache.tomcat.jdbc.pool.DataSource
 open class SimpleEndpoint(
         var name: String? = null,
         var host: String? = null,
-        var properties: String? = null
+        var properties: Map<String, Any>? = null
 ) : Endpoint {
 
     override fun name() = name!!
 
     override fun host() = host!!
 
-    override fun properties(): Map<String, Any> =
-            Gson().fromJson(properties, object : TypeToken<Map<String, Any>>() {}.type)
-
-    fun getProperties(): Map<String, Any> =
-            Gson().fromJson(properties, object : TypeToken<Map<String, Any>>() {}.type)
+    override fun properties(): Map<String, Any> = properties!!
 
     private var dataSource: DataSource? = null
 

src/main/resources/application.yml

@@ -14,18 +14,16 @@ conf:
   endpoints:
     - name: h2
       host: 127.0.0.1
-      properties: >
-        {
-          "sql.dialect": "h2",
-          "fs.base.folder": "conf/h2/md/database",
-          "jdbc.url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';",
-          "jdbc.driver.class.name": "org.h2.Driver",
-          "jdbc.user": "",
-          "jdbc.password": "",
-          "os.query.rest.port": "8082",
-          "visible": true,
-          "description": "Embedded db for unit tests only"
-        }
+      properties:
+          sql.dialect: h2
+          fs.base.folder: conf/h2/md/database
+          jdbc.url: jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';
+          jdbc.driver.class.name: org.h2.Driver
+          jdbc.user:
+          jdbc.password:
+          os.query.rest.port: 8082
+          visible: true
+          description: Embedded db for unit tests only
 
 server:
   port: 8007

src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceTypeTest.kt

@@ -61,14 +61,12 @@ class FsResourceTypeTest {
     init {
         dbMd.name = "unit_test_db_md"
         dbMd.host = "127.0.0.1"
-        dbMd.properties = """
-            {
-                "fs_base_folder": "conf/h2/md/database",
-                "sql_dialect": "h2",
-                "jdbc_url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';",
-                "jdbc_driver_class_name": "org.h2.Driver"
-            }
-            """.trimIndent()
+        dbMd.properties = mapOf(
+                "fs_base_folder" to "conf/h2/md/database",
+                "sql_dialect" to "h2",
+                "jdbc_url" to "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';",
+                "jdbc_driver_class_name" to "org.h2.Driver"
+        )
     }
 
     @ParameterizedTest
@@ -80,12 +78,12 @@ class FsResourceTypeTest {
             "prod/table/bookings,5",
             "prod/table/bookings.airports,1")
     fun read(uri: String, count: Long) {
-            connections.forEach {
-                StepVerifier
-                        .create(FsResourceType(listOf(it), listOf(FakeDialect())).read(DbUri(uri)))
-                        .expectNextCount(count)
-                        .verifyComplete()
-            }
+        connections.forEach {
+            StepVerifier
+                    .create(FsResourceType(listOf(it), listOf(FakeDialect())).read(DbUri(uri)))
+                    .expectNextCount(count)
+                    .verifyComplete()
+        }
     }
 
     @Test

src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceTypeTest.kt

@@ -59,13 +59,11 @@ class SqlResourceTypeTest {
     init {
         db.name = "unit_test_db"
         db.host = "127.0.0.1"
-        db.properties = """
-            {
-                "sql_dialect": "h2",
-                "jdbc_url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';",
-                "jdbc_driver_class_name": "org.h2.Driver"
-            }
-            """.trimIndent()
+        db.properties = mapOf(
+                "sql_dialect" to "h2",
+                "jdbc_url" to "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';",
+                "jdbc_driver_class_name" to "org.h2.Driver"
+        )
     }
 
     @Test

src/test/resources/application.yml

@@ -8,18 +8,16 @@ conf:
   endpoints:
     - name: h2
       host: 127.0.0.1
-      properties: >
-        {
-          "sql_dialect": "h2",
-          "fs_base_folder": "conf/h2/md/database",
-          "jdbc_url": "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';",
-          "jdbc_driver_class_name": "org.h2.Driver",
-          "jdbc.user": "",
-          "jdbc.password": "",
-          "os.query.rest.port": "8082",
-          "visible": false,
-          "description": "Embedded db for unit tests only"
-        }
+      properties:
+          sql_dialect: h2
+          fs_base_folder: conf/h2/md/database
+          jdbc_url: jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';
+          jdbc_driver_class_name: org.h2.Driver
+          jdbc.user:
+          jdbc.password:
+          os.query.rest.port: 8082
+          visible: false
+          description: Embedded db for unit tests only
 
 spring:
   jmx: