288

Author: mgramin

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/Uri.kt

@@ -74,6 +74,12 @@ interface Uri : Serializable {
      */
     fun action(): String
 
+    /**
+     * Connection name
+     */
+    fun connection(): String
+
+
     fun pageNumber(): Int {
         val pageParameter = params()["page"]
         val pageNumber: Int

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/impl/DbUri.kt

@@ -89,6 +89,8 @@ class DbUri : Uri {
 
     override fun action() = this.action
 
+    override fun connection() = this.connection
+
     override fun toString(): String {
         val result = StringBuilder(connection + "/" + type + "/" + objects.joinToString("."))
         if (action != "" && action != "create")

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/impl/FakeUri.kt

@@ -28,6 +28,7 @@ import com.github.mgramin.sqlboot.model.uri.Uri
 
 class FakeUri : Uri {
 
+
     override fun type(): String {
         return "table"
     }
@@ -48,4 +49,8 @@ class FakeUri : Uri {
         return "create"
     }
 
+    override fun connection(): String {
+        return "prod"
+    }
+
 }

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/wrappers/JsonWrapper.kt

@@ -43,6 +43,8 @@ class JsonWrapper(private val origin: Uri) : Uri {
 
     override fun action() = origin.action()
 
+    override fun connection() = origin.connection()
+
     override fun toString(): String {
         var s = "DbUri{" +
                 "type='" + origin.type() + '\''.toString() +

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/wrappers/SqlPlaceholdersWrapper.kt

@@ -46,6 +46,8 @@ class SqlPlaceholdersWrapper(private val origin: Uri) : Uri {
 
     override fun action() = origin.action()
 
+    override fun connection() = origin.connection()
+
     override fun toString() = origin.toString()
 
 }

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

@@ -81,14 +81,11 @@ class ApiController {
                 .filter { it != "headers" }
                 .joinToString(separator = "/") { it }
         val uri: Uri = SqlPlaceholdersWrapper(DbUri(parseUri(uriString, request)))
-        return getListResponseEntityHeaders(uri, connectionName)
+        return getListResponseEntityHeaders(uri)
     }
 
-    private fun getListResponseEntityHeaders(
-            uri: Uri,
-            connectionName: String
-    ): ResponseEntity<List<Map<String, Any>>> {
-        val connections = dbConnectionList.getConnectionsByMask(connectionName)
+    private fun getListResponseEntityHeaders(uri: Uri): ResponseEntity<List<Map<String, Any>>> {
+        val connections = dbConnectionList.getConnectionsByMask(uri.connection())
         try {
             val headers = FsResourceTypes(connections, uri)
                     .read(uri)
@@ -121,13 +118,13 @@ class ApiController {
                 .filter { it != "meta" }
                 .joinToString(separator = "/") { it }
         val uri = SqlPlaceholdersWrapper(DbUri(parseUri(uriString, request)))
-        return responseEntity(connectionName, uri)
+        return responseEntity(uri)
     }
 
 
-    private fun responseEntity(connectionName: String, uri: Uri): ResponseEntity<List<Metadata>> {
+    private fun responseEntity(uri: Uri): ResponseEntity<List<Metadata>> {
         val fsResourceTypes = FsResourceTypes(
-                listOf(dbConnectionList.getConnectionByName(connectionName)), uri)
+                listOf(dbConnectionList.getConnectionByName(uri.connection())), uri)
         val resourceType = fsResourceTypes
                 .resourceTypes()
                 .stream()