#304

Author: mgramin

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

@@ -32,13 +32,15 @@ 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.github.mgramin.sqlboot.model.uri.impl.FakeUri
 import com.github.mgramin.sqlboot.sql.select.SelectQuery
 import com.github.mgramin.sqlboot.sql.select.impl.SimpleSelectQuery
 import com.github.mgramin.sqlboot.sql.select.wrappers.JdbcSelectQuery
 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.Gson
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import org.apache.commons.lang3.StringUtils.strip
@@ -102,6 +104,7 @@ class SqlResourceType(
         jsonObject.addProperty("name", name())
         jsonObject.addProperty("aliases", aliases().toString())
         jsonObject.addProperty("query", simpleSelectQuery.query())
+        jsonObject.add("metadata", Gson().toJsonTree(metaData(FakeUri())))
         return jsonObject
     }
 

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

@@ -44,7 +44,6 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod.GET
 import org.springframework.web.bind.annotation.RequestMethod.POST
 import org.springframework.web.bind.annotation.RestController
-import java.util.ArrayList
 import javax.servlet.http.HttpServletRequest
 
 /**
@@ -70,20 +69,31 @@ class ApiController {
         val jsonArray = JsonArray()
         FsResourceType(dbConnectionList.getConnectionsByMask(connectionName), emptyList())
                 .resourceTypes()
-                .forEach {jsonArray.add(it.toJson())}
+                .forEach { jsonArray.add(it.toJson()) }
         return jsonArray.toString()
     }
 
-    @RequestMapping(value = ["/api/{connectionName}/**"], method = [GET, POST])
-    fun getResourcesHeadersJson(request: HttpServletRequest) =
-            getListResponseEntityHeaders(SqlPlaceholdersWrapper(DbUri(parseUri(request, "api/headers"))))
-
 
     @RequestMapping(value = ["/api/meta/{connectionName}/**"], method = [GET, POST])
-    fun getResourceMetadata(request: HttpServletRequest) =
-            responseEntity(SqlPlaceholdersWrapper(DbUri(parseUri(request, "api/meta"))))
+    fun getResourceMetadata(request: HttpServletRequest): ResponseEntity<String> {
+        val jsonArray = JsonArray()
+        val uri = SqlPlaceholdersWrapper(
+                        DbUri(parseUri(request, "api/meta")))
+        FsResourceType(listOf(dbConnectionList.getConnectionByName(uri.connection())), emptyList())
+                .resourceTypes()
+                .asSequence()
+                .filter { v -> v.name().equals(uri.type(), ignoreCase = true) }
+                .map { it.metaData(uri) }
+                .first()
+                .forEach { jsonArray.add(it.toJson()) }
+        return ResponseEntity(jsonArray.toString(), HttpStatus.OK)
+    }
 
 
+    @RequestMapping(value = ["/api/{connectionName}/**"], method = [GET, POST])
+    fun getResourcesHeadersJson(request: HttpServletRequest) =
+            getListResponseEntityHeaders(SqlPlaceholdersWrapper(DbUri(parseUri(request, "api/headers"))))
+
     private fun getListResponseEntityHeaders(uri: Uri): ResponseEntity<List<Map<String, Any>>> {
         val connections = dbConnectionList.getConnectionsByMask(uri.connection())
         try {
@@ -106,20 +116,6 @@ class ApiController {
     }
 
 
-    private fun responseEntity(uri: Uri): ResponseEntity<List<Metadata>> {
-        val fsResourceTypes = FsResourceType(
-                listOf(dbConnectionList.getConnectionByName(uri.connection())),
-                emptyList())
-        val resourceType = fsResourceTypes
-                .resourceTypes()
-                .stream()
-                .filter { v -> v.name().equals(uri.type(), ignoreCase = true) }
-                .findAny()
-                .orElse(null) ?: return ResponseEntity(ArrayList(), HttpStatus.NO_CONTENT)
-        return ResponseEntity(resourceType.metaData(uri), HttpStatus.OK)
-    }
-
-
     private fun parseUri(request: HttpServletRequest, basePath: String): String {
         val path = request.servletPath
                 .split("/")