#269

Author: mgramin

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

@@ -0,0 +1,64 @@
+/*
+ * The MIT License (MIT)
+ * <p>
+ * Copyright (c) 2016-2019 Maksim Gramin
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * <p>
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.mgramin.sqlboot.model.connection
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import org.slf4j.LoggerFactory
+import javax.sql.DataSource
+
+class CheckedConnection(private val origin: DbConnection) : DbConnection {
+
+    override fun getProperties() = origin.getProperties()
+
+    private val health: String
+
+    private val logger = LoggerFactory.getLogger(this::class.java)
+
+    @JsonIgnore
+    override fun getDataSource(): DataSource {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getName() = origin.getName()
+
+    override fun getHealth(): String {
+        return health
+    }
+
+//    override fun getDataSource() = origin.getDataSource()
+
+    override fun paginationQueryTemplate() = origin.paginationQueryTemplate()
+
+    init {
+        health = try {
+            logger.info("Check connection...")
+            origin.getDataSource().connection
+            "Ok"
+        } catch (e: Exception) {
+            e.message.toString()
+        }
+    }
+
+}

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

@@ -28,8 +28,14 @@ import javax.sql.DataSource
 
 interface DbConnection {
 
-    fun name(): String
+    fun getName(): String
+
+    fun getHealth(): String
+
     fun getDataSource(): DataSource
+
     fun paginationQueryTemplate(): String
 
+    fun getProperties(): Map<String, Any>
+
 }

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

@@ -39,10 +39,10 @@ import org.springframework.stereotype.Service
 open class DbConnectionList(val connections: List<SimpleDbConnection>) {
 
     fun getConnectionByName(name: String): SimpleDbConnection {
-        return connections.first { v -> v.name.equals(name, ignoreCase = true) }
+        return connections.first { v -> v.getName().equals(name, ignoreCase = true) }
     }
 
     fun getConnectionsByMask(name: String): List<SimpleDbConnection> {
-        return connections.filter { v -> v.name!!.matches(name.toRegex()) }
+        return connections.filter { v -> v.getName().matches(name.toRegex()) }
     }
 }

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

@@ -27,8 +27,15 @@ package com.github.mgramin.sqlboot.model.connection
 import javax.sql.DataSource
 
 class FakeDbConnection : DbConnection {
+    override fun getProperties(): Map<String, Any> {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getHealth(): String {
+        return "Ok"
+    }
 
-    override fun name(): String {
+    override fun getName(): String {
         return "Simple fake connection"
     }
 

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

@@ -38,11 +38,17 @@ open class SimpleDbConnection : DbConnection {
 
     override fun paginationQueryTemplate() = this.paginationQueryTemplate!!
 
-    override fun name(): String {
+    override fun getName(): String {
         return name!!
     }
 
-    var name: String? = null
+    fun setName(name: String) {
+        this.name = name
+    }
+
+    private var name: String? = null
+
+
     @JsonIgnore // TODO fix json serialization for Resource class
     var baseFolder: Resource? = null
     var url: String? = null
@@ -57,15 +63,7 @@ open class SimpleDbConnection : DbConnection {
 
     private var dataSource: DataSource? = null
 
-    val health: String
-        get() {
-            return try {
-                getDataSource().connection
-                "OK"
-            } catch (e: Exception) {
-                e.message.toString()
-            }
-        }
+    override fun getHealth() = "UKNOWN"
 
     constructor()
     constructor(name: String? = null, baseFolder: Resource? = null, url: String? = null,
@@ -81,7 +79,7 @@ open class SimpleDbConnection : DbConnection {
         this.paginationQueryTemplate = paginationQueryTemplate
     }
 
-    fun getProperties(): Map<String, Any> {
+    override fun getProperties(): Map<String, Any> {
         return JSONObject(properties).toMap()
     }
 

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/sql/SqlResourceType.kt

@@ -69,7 +69,7 @@ class SqlResourceType(
                                     return@map createQuery(uri, connection).execute(hashMapOf("uri" to uri))
                                             .map<Map<String, Any>?> {
                                                 val mutableMap = it.toMutableMap()
-                                                mutableMap["database"] = connection.name()
+                                                mutableMap["database"] = connection.getName()
                                                 mutableMap
                                             }
                                 }

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/header/DbNameWrapper.kt

@@ -65,7 +65,7 @@ class DbNameWrapper(private val origin: ResourceType,
 
                 override fun headers(): Map<String, Any> {
                     val headers = it.headers().toMutableMap()
-                    headers["database"] = dbConnection.name()
+                    headers["database"] = dbConnection.getName()
                     return headers
                 }
 

src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/ApiController.kt

@@ -56,7 +56,6 @@ import org.springframework.http.MediaType
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.CrossOrigin
-import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod.GET
@@ -65,13 +64,11 @@ import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.ResponseBody
 import org.springframework.web.bind.annotation.RestController
 import reactor.core.publisher.Flux
-import java.time.Duration
 import java.util.ArrayList
 import java.util.Arrays.asList
 import java.util.stream.Collectors.joining
 import java.util.stream.Collectors.toList
 import javax.servlet.http.HttpServletRequest
-import kotlin.random.Random
 
 /**
  * @author Maksim Gramin (mgramin@gmail.com)

src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/DbConnectionsController.kt

@@ -24,14 +24,22 @@
 
 package com.github.mgramin.sqlboot.rest.controllers
 
+import com.github.mgramin.sqlboot.model.connection.CheckedConnection
+import com.github.mgramin.sqlboot.model.connection.DbConnection
 import com.github.mgramin.sqlboot.model.connection.DbConnectionList
 import com.github.mgramin.sqlboot.model.connection.SimpleDbConnection
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.context.annotation.ComponentScan
+import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.CrossOrigin
+import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.ResponseBody
 import org.springframework.web.bind.annotation.RestController
+import reactor.core.publisher.Flux
+import reactor.core.publisher.toFlux
+import reactor.core.scheduler.Schedulers
 
 /**
  * @author Maksim Gramin (mgramin@gmail.com)
@@ -52,4 +60,16 @@ class DbConnectionsController @Autowired constructor(private val dbConnectionLis
         @RequestMapping(value = ["/connections"])
         get() = dbConnectionList.connections*/
 
+    @GetMapping(value = ["/connections/health"], produces = [MediaType.TEXT_EVENT_STREAM_VALUE])
+    @ResponseBody
+    internal fun health(): Flux<DbConnection> {
+        return dbConnectionList
+                .connections
+                .toFlux()
+                .parallel()
+                .runOn(Schedulers.elastic())
+                .map { CheckedConnection(it) as DbConnection }
+                .sequential()
+    }
+
 }

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

@@ -48,7 +48,7 @@ class FsResourceTypesTest {
     private val db = SimpleDbConnection()
 
     init {
-        db.name = "unit_test_db"
+        db.setName("unit_test_db")
         db.baseFolder = FileSystemResource("conf/h2/database")
         db.url = "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';"
         db.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"