293

mgramin · mgramin · commit 627c08e3cc21 · 2019-04-19T15:30:43.000+03:00
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/ResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/ResourceType.kt
@@ -57,17 +57,18 @@ interface ResourceType {
     fun path(): List<String>
 
     /**
-     * Retrieves a map that contains information about the resource metadata (properties) "name" ->
-     * "type"
+     * Retrieves a map that contains information about the resource metadata (properties) "name" -> "type"
      */
-    @JsonProperty
-    fun metaData(): Map<String, String>
+//    @JsonProperty
+//    fun metaData(): Map<String, String>
 
-    fun metaData(uri: Uri): List<Metadata> {
-        return metaData().entries
-                .map { e -> Metadata(e.key, e.value) }
-                .toList()
-    }
+    @JsonProperty
+    fun metaData(uri: Uri): List<Metadata>
+//    {
+//        return metaData().entries
+//                .map { e -> Metadata(e.key, e.value) }
+//                .toList()
+//    }
 
     /**
      * Read resources by uri
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FakeResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FakeResourceType.kt
@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.impl
 
 import com.github.mgramin.sqlboot.model.resource.DbResource
 import com.github.mgramin.sqlboot.model.resource.impl.FakeDbResource
+import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
@@ -53,7 +54,9 @@ class FakeResourceType : ResourceType {
                 FakeDbResource(DbUri("prod/table/hr.jobs"))).toFlux()
     }
 
-    override fun metaData(): Map<String, String> {
-        return hashMapOf("@schema" to "Schema name", "@table" to "Table name", "@index" to "Index name")
+    override fun metaData(uri: Uri): List<Metadata> {
+        return listOf(Metadata("@schema", "Schema name"),
+                Metadata("@table", "Table name"),
+                Metadata("@index", "Index name"))
     }
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceType.kt
@@ -27,6 +27,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.impl
 import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.connection.SimpleDbConnection
 import com.github.mgramin.sqlboot.model.resource.DbResource
+import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.resourcetype.wrappers.body.BodyWrapper
 import com.github.mgramin.sqlboot.model.resourcetype.wrappers.header.SelectWrapper
@@ -91,12 +92,12 @@ class FsResourceType(
                         .toList())
     }
 
-    override fun metaData(): Map<String, String> {
+    override fun metaData(uri: Uri): List<Metadata> {
         try {
             return resourceTypes
                     .asSequence()
                     .first { v -> v.name().equals(uri.type(), ignoreCase = true) }
-                    .metaData()
+                    .metaData(uri)
         } catch (e: Exception) {
             throw BootException("Type not found", 404)
         }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceType.kt
@@ -27,6 +27,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.impl
 import com.github.mgramin.sqlboot.model.connection.DbConnection
 import com.github.mgramin.sqlboot.model.resource.DbResource
 import com.github.mgramin.sqlboot.model.resource.impl.DbResourceImpl
+import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
@@ -84,12 +85,9 @@ class SqlResourceType(
                 }
     }
 
-    override fun metaData(): Map<String, String> {
-        val columns = simpleSelectQuery.columns()
-        val newColumns = columns.toMutableMap()
-        newColumns["database"] = """{"label": "Database", "description": "Database name", "visible": true}"""
-        return newColumns
-    }
+    override fun metaData(uri: Uri): List<Metadata> = simpleSelectQuery.columns()
+            .map { Metadata(it.key, it.value) } +
+            Metadata("database", """{"label": "Database", "description": "Database name", "visible": true}""")
 
     private fun createQuery(uri: Uri, connection: DbConnection): SelectQuery {
         return JdbcSelectQuery(
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/body/BodyWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/body/BodyWrapper.kt
@@ -27,6 +27,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.wrappers.body
 import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.resource.DbResource
 import com.github.mgramin.sqlboot.model.resource.wrappers.DbResourceBodyWrapper
+import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.template.generator.TemplateGenerator
@@ -54,7 +55,7 @@ class BodyWrapper(
                 .map { r -> DbResourceBodyWrapper(r, templateGenerator.generate(r.headers())) }
     }
 
-    override fun metaData(): Map<String, String> {
-        return origin.metaData()
+    override fun metaData(uri: Uri): List<Metadata> {
+        return origin.metaData(uri)
     }
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/header/DbNameWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/header/DbNameWrapper.kt
@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.wrappers.header
 
 import com.github.mgramin.sqlboot.model.connection.DbConnection
 import com.github.mgramin.sqlboot.model.resource.DbResource
+import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.uri.Uri
 import reactor.core.publisher.Flux
@@ -41,11 +42,7 @@ class DbNameWrapper(private val origin: ResourceType,
         return origin.path()
     }
 
-    override fun metaData(): Map<String, String> {
-        val metaData = origin.metaData().toMutableMap()
-        metaData["database"] = "Database name"
-        return metaData
-    }
+    override fun metaData(uri: Uri): List<Metadata> = origin.metaData(uri) + Metadata("database", "Database name")
 
     override fun read(uri: Uri): Flux<DbResource> {
         return origin.read(uri).map {
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/header/SelectWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/header/SelectWrapper.kt
@@ -65,10 +65,6 @@ class SelectWrapper(private val origin: ResourceType, private val parameterName:
         }
     }
 
-    override fun metaData(): Map<String, String> {
-        return origin.metaData()
-    }
-
     override fun metaData(uri: Uri): List<Metadata> {
         val select = uri.params()[parameterName]
         return if (select != null) {
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/CacheWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/CacheWrapper.kt
@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.wrappers.list
 
 import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.resource.DbResource
+import com.github.mgramin.sqlboot.model.resourcetype.Metadata
 import com.github.mgramin.sqlboot.model.resourcetype.ResourceType
 import com.github.mgramin.sqlboot.model.uri.Uri
 import reactor.core.publisher.Flux
@@ -66,7 +67,7 @@ class CacheWrapper(private val origin: ResourceType, private val parameterName:
         return cachedResources!!.toFlux()
     }
 
-    override fun metaData(): Map<String, String> {
-        return origin.metaData()
+    override fun metaData(uri: Uri): List<Metadata> {
+        return origin.metaData(uri)
     }
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/LimitWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/LimitWrapper.kt
@@ -51,7 +51,6 @@ class LimitWrapper(private val origin: ResourceType, private val parameterName:
         return origin.read(uri).take(limit.toLong())
     }
 
-    override fun metaData(): Map<String, String> {
-        return origin.metaData()
-    }
+    override fun metaData(uri: Uri) = origin.metaData(uri)
+
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/PageWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/PageWrapper.kt
@@ -45,9 +45,7 @@ class PageWrapper constructor(
         return origin.path()
     }
 
-    override fun metaData(): Map<String, String> {
-        return origin.metaData()
-    }
+    override fun metaData(uri: Uri) = origin.metaData(uri)
 
     override fun read(uri: Uri): Flux<DbResource> {
         val pageParameter = uri.params()[parameterName]
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/SortWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/SortWrapper.kt
@@ -42,9 +42,7 @@ class SortWrapper(private val origin: ResourceType,
         return origin.path()
     }
 
-    override fun metaData(): Map<String, String> {
-        return origin.metaData()
-    }
+    override fun metaData(uri: Uri) = origin.metaData(uri)
 
     override fun read(uri: Uri): Flux<DbResource> {
         return origin.read(uri)
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/WhereWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/list/WhereWrapper.kt
@@ -59,7 +59,6 @@ class WhereWrapper(private val origin: ResourceType) : ResourceType {
                 }
     }
 
-    override fun metaData(): Map<String, String> {
-        return origin.metaData()
-    }
+    override fun metaData(uri: Uri) = origin.metaData(uri)
+
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/SwaggerController.kt b/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/SwaggerController.kt
@@ -194,13 +194,13 @@ class SwaggerController {
         }
 
         // definitions
-        for (resourceType in resourceTypes) {
+        /*for (resourceType in resourceTypes) {
             val model = ModelImpl()
             for ((key, value) in resourceType.metaData().entries) {
                 model.property(key, StringProperty().description(value))
             }
             swagger.model(resourceType.name(), model)
-        }
+        }*/
 
         return swagger
     }
diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/ResourceTypeWrapperTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/ResourceTypeWrapperTest.kt
@@ -167,17 +167,6 @@ class ResourceTypeWrapperTest {
 //            w.read(FakeUri()).forEach { println(it.headers()) }
         }
 
-        @Test
-        override fun metaData() {
-            assertEquals(
-                    hashMapOf(
-                            "@schema" to "Schema name",
-                            "@table" to "Table name",
-                            "@index" to "Index name",
-                            "database" to "Database name"),
-                    w.metaData())
-        }
-
         @Test
         override fun metaDataByUri() {
             assertEquals(
@@ -240,12 +229,6 @@ class ResourceTypeWrapperTest {
                     w.metaData(FakeUri()).sorted())
         }
 
-        @Test
-        open fun metaData() {
-            assertEquals(hashMapOf("@schema" to "Schema name", "@table" to "Table name", "@index" to "Index name"),
-                    w.metaData())
-        }
-
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.impl`
`26`	`26`
`27`	`27`	`import com.github.mgramin.sqlboot.model.resource.DbResource`
`28`	`28`	`import com.github.mgramin.sqlboot.model.resource.impl.FakeDbResource`
	`29`	`+import com.github.mgramin.sqlboot.model.resourcetype.Metadata`
`29`	`30`	`import com.github.mgramin.sqlboot.model.resourcetype.ResourceType`
`30`	`31`	`import com.github.mgramin.sqlboot.model.uri.Uri`
`31`	`32`	`import com.github.mgramin.sqlboot.model.uri.impl.DbUri`
`@@ -53,7 +54,9 @@ class FakeResourceType : ResourceType {`
`53`	`54`	`FakeDbResource(DbUri("prod/table/hr.jobs"))).toFlux()`
`54`	`55`	`}`
`55`	`56`
`56`		`- override fun metaData(): Map<String, String> {`
`57`		`- return hashMapOf("@schema" to "Schema name", "@table" to "Table name", "@index" to "Index name")`
	`57`	`+ override fun metaData(uri: Uri): List<Metadata> {`
	`58`	`+ return listOf(Metadata("@schema", "Schema name"),`
	`59`	`+ Metadata("@table", "Table name"),`
	`60`	`+ Metadata("@index", "Index name"))`
`58`	`61`	`}`
`59`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ package com.github.mgramin.sqlboot.model.resourcetype.wrappers.body`
`27`	`27`	`import com.github.mgramin.sqlboot.exceptions.BootException`
`28`	`28`	`import com.github.mgramin.sqlboot.model.resource.DbResource`
`29`	`29`	`import com.github.mgramin.sqlboot.model.resource.wrappers.DbResourceBodyWrapper`
	`30`	`+import com.github.mgramin.sqlboot.model.resourcetype.Metadata`
`30`	`31`	`import com.github.mgramin.sqlboot.model.resourcetype.ResourceType`
`31`	`32`	`import com.github.mgramin.sqlboot.model.uri.Uri`
`32`	`33`	`import com.github.mgramin.sqlboot.template.generator.TemplateGenerator`
`@@ -54,7 +55,7 @@ class BodyWrapper(`
`54`	`55`	`.map { r -> DbResourceBodyWrapper(r, templateGenerator.generate(r.headers())) }`
`55`	`56`	`}`
`56`	`57`
`57`		`- override fun metaData(): Map<String, String> {`
`58`		`- return origin.metaData()`
	`58`	`+ override fun metaData(uri: Uri): List<Metadata> {`
	`59`	`+ return origin.metaData(uri)`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,6 @@ class SelectWrapper(private val origin: ResourceType, private val parameterName:`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- override fun metaData(): Map<String, String> {`
`69`		`- return origin.metaData()`
`70`		`- }`
`71`		`-`
`72`	`68`	`override fun metaData(uri: Uri): List<Metadata> {`
`73`	`69`	`val select = uri.params()[parameterName]`
`74`	`70`	`return if (select != null) {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ class LimitWrapper(private val origin: ResourceType, private val parameterName:`
`51`	`51`	`return origin.read(uri).take(limit.toLong())`
`52`	`52`	`}`
`53`	`53`
`54`		`- override fun metaData(): Map<String, String> {`
`55`		`- return origin.metaData()`
`56`		`- }`
	`54`	`+ override fun metaData(uri: Uri) = origin.metaData(uri)`
	`55`	`+`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,7 @@ class PageWrapper constructor(`
`45`	`45`	`return origin.path()`
`46`	`46`	`}`
`47`	`47`
`48`		`- override fun metaData(): Map<String, String> {`
`49`		`- return origin.metaData()`
`50`		`- }`
	`48`	`+ override fun metaData(uri: Uri) = origin.metaData(uri)`
`51`	`49`
`52`	`50`	`override fun read(uri: Uri): Flux<DbResource> {`
`53`	`51`	`val pageParameter = uri.params()[parameterName]`