#304

mgramin · mgramin · commit ba73681dc96f · 2019-04-23T18:25:53.000+04: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
@@ -24,9 +24,9 @@
 
 package com.github.mgramin.sqlboot.model.resourcetype
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.github.mgramin.sqlboot.model.resource.DbResource
 import com.github.mgramin.sqlboot.model.uri.Uri
+import com.google.gson.JsonObject
 import reactor.core.publisher.Flux
 
 /**
@@ -37,32 +37,31 @@ interface ResourceType {
     /**
      * Name of resource type, e.g "table", "index", "stored procedure" etc
      */
-    @JsonProperty
-    fun name(): String {
-        return aliases()[0]
-    }
+    fun name() = aliases()[0]
 
     /**
      * Aliases of resource type, e.g. ["table", "tbl", "t", "tablo"]
      */
-    @JsonProperty
     fun aliases(): List<String>
 
     /**
      * Path of resource e.g. ["schema", "table", "column"] or ["schema", "table", "index", "index_column"]
      */
-    @JsonProperty
     fun path(): List<String>
 
     /**
      * Information about the resource metadata (properties) "name" -> "type"
      */
-    @JsonProperty
     fun metaData(uri: Uri): List<Metadata>
 
     /**
      * Read resources by uri
      */
     fun read(uri: Uri): Flux<DbResource>
 
+    /**
+     * Get as JSON
+     */
+    fun toJson(): JsonObject
+
 }
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
@@ -30,6 +30,8 @@ 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
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import reactor.core.publisher.Flux
 import reactor.core.publisher.toFlux
 import java.util.Arrays.asList
@@ -55,4 +57,8 @@ class FakeResourceType : ResourceType {
                     Metadata("@index", "Index name"),
                     Metadata("size", "Number", "Table size"))
 
+    override fun toJson(): JsonObject {
+        return JsonParser().parse("""{ "name": "fake_resource_type" }""").asJsonObject
+    }
+
 }
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
@@ -37,6 +37,7 @@ import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
 import com.github.mgramin.sqlboot.tools.files.file.impl.MarkdownFile
 import com.github.mgramin.sqlboot.tools.files.file.impl.SimpleFile
+import com.google.gson.JsonObject
 import reactor.core.publisher.Flux
 import java.io.File
 import java.nio.charset.Charset
@@ -49,6 +50,9 @@ class FsResourceType(
         private val dbConnections: List<SimpleDbConnection>,
         private val dialects: List<Dialect>
 ) : ResourceType {
+    override fun toJson(): JsonObject {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
 
     private val resourceTypes: List<ResourceType> = walk(dbConnections.first().baseFolder!!.file.path)
 
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
@@ -39,6 +39,8 @@ import com.github.mgramin.sqlboot.sql.select.wrappers.OrderedSelectQuery
 import com.github.mgramin.sqlboot.sql.select.wrappers.PaginatedSelectQuery
 import com.github.mgramin.sqlboot.sql.select.wrappers.RestSelectQuery
 import com.github.mgramin.sqlboot.template.generator.impl.GroovyTemplateGenerator
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import org.apache.commons.lang3.StringUtils.strip
 import reactor.core.publisher.Flux
 
@@ -95,6 +97,14 @@ class SqlResourceType(
                     .map { Metadata(it.key, it.value) } +
                     Metadata("database", """{"label": "Database", "description": "Database name", "visible": true}""")
 
+    override fun toJson(): JsonObject {
+        val jsonObject = JsonObject()
+        jsonObject.addProperty("name", name())
+        jsonObject.addProperty("aliases", aliases().toString())
+        jsonObject.addProperty("query", simpleSelectQuery.query())
+        return jsonObject
+    }
+
     private fun createQuery(uri: Uri, connection: DbConnection): SelectQuery {
         val properties = simpleSelectQuery.properties()
         val baseQuery = PaginatedSelectQuery(
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
@@ -30,6 +30,7 @@ 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
+import org.json.JSONObject
 import reactor.core.publisher.Flux
 
 /**
@@ -50,4 +51,6 @@ class BodyWrapper(
 
     override fun metaData(uri: Uri): List<Metadata> = origin.metaData(uri)
 
+    override fun toJson() = origin.toJson()
+
 }
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
@@ -57,4 +57,6 @@ class DbNameWrapper(private val origin: ResourceType,
                         }
                     }
 
+    override fun toJson() = origin.toJson()
+
 }
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
@@ -75,4 +75,7 @@ class SelectWrapper(private val origin: ResourceType, private val parameterName:
             origin.metaData(uri)
         }
     }
+
+    override fun toJson() = origin.toJson()
+
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/header/TypeWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/header/TypeWrapper.kt
@@ -37,4 +37,6 @@ class TypeWrapper(private val origin: ResourceType) : ResourceType {
                         }
                     }
 
+    override fun toJson() = origin.toJson()
+
 }
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
@@ -70,4 +70,5 @@ class CacheWrapper(private val origin: ResourceType, private val parameterName:
     override fun metaData(uri: Uri): List<Metadata> {
         return origin.metaData(uri)
     }
+    override fun toJson() = origin.toJson()
 }
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
@@ -53,4 +53,5 @@ class LimitWrapper(private val origin: ResourceType, private val parameterName:
 
     override fun metaData(uri: Uri) = origin.metaData(uri)
 
+    override fun toJson() = origin.toJson()
 }
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
@@ -62,4 +62,5 @@ class PageWrapper constructor(
         }
     }
 
+    override fun toJson() = origin.toJson()
 }
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
@@ -61,4 +61,5 @@ class SortWrapper(private val origin: ResourceType,
         return Comparator { b, a -> compareValuesBy(a, b, *selectors) }
     }
 
+    override fun toJson() = origin.toJson()
 }
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
@@ -61,4 +61,5 @@ class WhereWrapper(private val origin: ResourceType) : ResourceType {
 
     override fun metaData(uri: Uri) = origin.metaData(uri)
 
+    override fun toJson() = origin.toJson()
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/ApiController.kt b/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/ApiController.kt
@@ -32,6 +32,7 @@ import com.github.mgramin.sqlboot.model.resourcetype.impl.FsResourceType
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
 import com.github.mgramin.sqlboot.model.uri.wrappers.SqlPlaceholdersWrapper
+import com.google.gson.JsonArray
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.context.annotation.ComponentScan
@@ -65,9 +66,13 @@ class ApiController {
 
 
     @RequestMapping(value = ["/api/{connectionName}/types"])
-    fun types(@PathVariable connectionName: String) =
-            FsResourceType(dbConnectionList.getConnectionsByMask(connectionName), emptyList()).resourceTypes()
-
+    fun types(@PathVariable connectionName: String): String {
+        val jsonArray = JsonArray()
+        FsResourceType(dbConnectionList.getConnectionsByMask(connectionName), emptyList())
+                .resourceTypes()
+                .forEach {jsonArray.add(it.toJson())}
+        return jsonArray.toString()
+    }
 
     @RequestMapping(value = ["/api/{connectionName}/**"], method = [GET, POST])
     fun getResourcesHeadersJson(request: HttpServletRequest) =
diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceTypeTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceTypeTest.kt
@@ -28,6 +28,7 @@ import com.github.mgramin.sqlboot.model.connection.SimpleDbConnection
 import com.github.mgramin.sqlboot.model.dialect.FakeDialect
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
 import com.github.mgramin.sqlboot.model.uri.impl.FakeUri
+import com.google.gson.JsonObject
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
@@ -124,6 +125,17 @@ class SqlResourceTypeTest {
         assertEquals(4, createType(sql, "column").metaData(FakeUri()).count())
     }
 
+    @Test
+    fun toJson() {
+        val sql = """select table_schema  as "@schema"
+                    |     , table_name    as "@table"
+                    |     , column_name   as "@column"
+                    |  from information_schema.columns""".trimMargin()
+        val json: JsonObject = createType(sql, "table").toJson()
+        assertEquals("table", json.get("name").asString)
+        assertEquals("[table]", json.get("aliases").asString)
+    }
+
     private fun createType(sql: String, type: String) =
             SqlResourceType(
                     aliases = arrayListOf(type),
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
@@ -229,6 +229,11 @@ class ResourceTypeWrapperTest {
                     w.metaData(FakeUri()).sorted())
         }
 
+        @Test
+        fun toJson() {
+            assertEquals("fake_resource_type", w.toJson().get("name").asString)
+        }
+
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,6 @@ class DbNameWrapper(private val origin: ResourceType,`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ override fun toJson() = origin.toJson()`
	`61`	`+`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,7 @@ class SelectWrapper(private val origin: ResourceType, private val parameterName:`
`75`	`75`	`origin.metaData(uri)`
`76`	`76`	`}`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ override fun toJson() = origin.toJson()`
	`80`	`+`
`78`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,6 @@ class TypeWrapper(private val origin: ResourceType) : ResourceType {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ override fun toJson() = origin.toJson()`
	`41`	`+`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,5 @@ class CacheWrapper(private val origin: ResourceType, private val parameterName:`
`70`	`70`	`override fun metaData(uri: Uri): List<Metadata> {`
`71`	`71`	`return origin.metaData(uri)`
`72`	`72`	`}`
	`73`	`+ override fun toJson() = origin.toJson()`
`73`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,5 @@ class LimitWrapper(private val origin: ResourceType, private val parameterName:`
`53`	`53`
`54`	`54`	`override fun metaData(uri: Uri) = origin.metaData(uri)`
`55`	`55`
	`56`	`+ override fun toJson() = origin.toJson()`
`56`	`57`	`}`