#269

Author: mgramin

src/main/kotlin/com/github/mgramin/sqlboot/exceptions/BootException.kt

@@ -32,25 +32,33 @@ package com.github.mgramin.sqlboot.exceptions
  */
 class BootException : RuntimeException {
 
+    val errorCode: Int
+        get() = field
+
+
     /**
      * Ctor.
      *
      * @param message Error message
      */
-    constructor(message: String) : super(message) {}
+    constructor(message: String) : super(message) {
+        this.errorCode = 0
+    }
 
     /**
      * Ctor.
      *
-     * @param message Error message
      * @param cause Cause
      */
-    constructor(message: String, cause: Throwable) : super(message, cause) {}
+    constructor(cause: Throwable) : super(cause) {
+        this.errorCode = 0
+    }
 
     /**
-     * Ctor.
      *
-     * @param cause Cause
      */
-    constructor(cause: Throwable) : super(cause) {}
+    constructor(message: String, errorCode: Int) : super(message) {
+        this.errorCode = errorCode
+    }
+
 }

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

@@ -24,41 +24,27 @@
 
 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()
         }
     }
 
+    override fun name() = origin.name()
+
+    override fun properties() = origin.properties()
+
+    override fun health() = health
+
+    override fun paginationQueryTemplate() = origin.paginationQueryTemplate()
+
+    override fun getDataSource() = origin.getDataSource()
+
 }

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

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

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

@@ -38,8 +38,8 @@ import org.springframework.stereotype.Service
 @ConfigurationProperties(prefix = "conf")
 open class DbConnectionList(val connections: List<SimpleDbConnection>) {
 
-    fun getConnectionByName(name: String) = connections.first { v -> v.getName().equals(name, ignoreCase = true) }
+    fun getConnectionByName(name: String) = connections.first { v -> v.name().equals(name, ignoreCase = true) }
 
-    fun getConnectionsByMask(name: String) = connections.filter { v -> v.getName().matches(name.toRegex()) }
+    fun getConnectionsByMask(name: String) = connections.filter { v -> v.name().matches(name.toRegex()) }
 
 }

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

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

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

@@ -34,46 +34,27 @@ import org.springframework.core.io.Resource
  * @version $Id: f221782080d430e77aed80ef8446745687c350f4 $
  * @since 0.1
  */
-open class SimpleDbConnection : DbConnection {
+open class SimpleDbConnection(
+        var name: String? = null,
+        @JsonIgnore var baseFolder: Resource? = null,
+        var url: String? = null,
+        var user: String? = null,
+        @JsonIgnore var password: String? = null,
+        var driverClassName: String? = null,
+        var properties: String? = null,
+        var paginationQueryTemplate: String? = null
+) : DbConnection {
+
+    override fun name() = this.name!!
 
     override fun paginationQueryTemplate() = this.paginationQueryTemplate!!
 
-    override fun getName(): String {
-        return name!!
-    }
-
-    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
-    var user: String? = null
-    @JsonIgnore
-    var password: String? = null
-    var driverClassName: String? = null
-    private var properties: String? = null
-
-    var paginationQueryTemplate: String? = null
-
+    override fun health() = "UKNOWN"
 
     private var dataSource: DataSource? = null
 
-    override fun getHealth() = "UKNOWN"
-
-    constructor()
+    override fun properties() = JSONObject(properties).toMap()
 
-    override fun getProperties(): Map<String, Any> {
-        return JSONObject(properties).toMap()
-    }
-
-    fun setProperties(properties: String) {
-        this.properties = properties
-    }
 
     @JsonIgnore
     override fun getDataSource(): DataSource {

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/composite/FsResourceTypes.kt

@@ -38,6 +38,7 @@ import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerato
 import com.github.mgramin.sqlboot.tools.files.file.impl.SimpleFile
 import reactor.core.publisher.Flux
 import java.io.File
+import java.lang.Exception
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets.UTF_8
 
@@ -85,17 +86,25 @@ class FsResourceTypes(
     }
 
     override fun read(uri: Uri): Flux<DbResource> {
+        try {
         return resourceTypes
                 .asSequence()
                 .first { v -> v.name().equals(uri.type(), ignoreCase = true) }
                 .read(uri)
+        } catch (e : Exception) {
+            throw BootException("Type not found", 404)
+        }
     }
 
     override fun metaData(): Map<String, String> {
-        return resourceTypes
-                .asSequence()
-                .first { v -> v.name().equals(uri.type(), ignoreCase = true) }
-                .metaData()
+        try {
+            return resourceTypes
+                    .asSequence()
+                    .first { v -> v.name().equals(uri.type(), ignoreCase = true) }
+                    .metaData()
+        } catch (e : Exception) {
+            throw BootException("Type not found", 404)
+        }
     }
 
 }

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.getName()
+                                                mutableMap["database"] = connection.name()
                                                 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.getName()
+                    headers["database"] = dbConnection.name()
                     return headers
                 }
 

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

@@ -25,6 +25,7 @@
 package com.github.mgramin.sqlboot.rest.controllers
 
 import com.fasterxml.jackson.core.JsonProcessingException
+import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.connection.DbConnectionList
 import com.github.mgramin.sqlboot.model.resource.DbResource
 import com.github.mgramin.sqlboot.model.resourcetype.Metadata
@@ -423,7 +424,15 @@ class ApiController {
         val connections = dbConnectionList.getConnectionsByMask(connectionName!!)
         val result = ArrayList<DbResource>()
         val fsResourceTypes = FsResourceTypes(connections, uri)
-        val collect = fsResourceTypes.read(uri).collectList().block()
+        val collect: MutableList<DbResource>?
+        try {
+            collect = fsResourceTypes.read(uri).collectList().block()
+        } catch (e: BootException) {
+            if (e.errorCode == 404) {
+                return ResponseEntity(result, HttpStatus.NOT_FOUND)
+            }
+            return ResponseEntity(result, HttpStatus.INTERNAL_SERVER_ERROR)
+        }
         result.addAll(collect)
 
         return if (result.isEmpty()) {