#89 use Sequence in SelectQuery

mgramin · mgramin · commit 4c6df5f9cfbb · 2019-01-14T14:17:34.000+03:00
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resource_type/ResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resource_type/ResourceType.kt
@@ -27,16 +27,13 @@ package com.github.mgramin.sqlboot.model.resource_type
 import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.resource.DbResource
 import com.github.mgramin.sqlboot.model.uri.Uri
 import org.json.JSONException
 import org.json.JSONObject
-
-import java.util.HashMap
-import java.util.stream.Stream
-
+import java.util.*
 import java.util.stream.Collectors.toList
+import java.util.stream.Stream
 
 /**
  * Resource type e.g. Table, Index, Stored function etc
@@ -82,7 +79,6 @@ interface ResourceType {
     /**
      * Read resources by uri
      */
-    @Throws(BootException::class)
     fun read(uri: Uri): Stream<DbResource>
 
     @JsonAutoDetect(fieldVisibility = Visibility.ANY)
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resource_type/impl/sql/SqlResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resource_type/impl/sql/SqlResourceType.kt
@@ -31,16 +31,11 @@ import com.github.mgramin.sqlboot.model.resource_type.ResourceType
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
 import com.github.mgramin.sqlboot.sql.select.SelectQuery
-
-import java.util.HashMap
-import java.util.LinkedHashMap
-import kotlin.collections.Map.Entry
-import java.util.stream.Stream
-
+import org.apache.commons.lang3.StringUtils.strip
+import java.util.*
 import java.util.Optional.ofNullable
 import java.util.stream.Collectors.toList
-import java.util.stream.Collectors.toMap
-import org.apache.commons.lang3.StringUtils.strip
+import java.util.stream.Stream
 
 /**
  * Created by MGramin on 12.07.2017.
@@ -75,12 +70,14 @@ class SqlResourceType(
                     val name = path[path.size - 1].toString()
 
                     val headers = o.entries
-                            .map { strip(it.key, "@") to ofNullable(it.value).orElse("")}
+                            .map { strip(it.key, "@") to ofNullable(it.value).orElse("") }
                             .toMap()
                     DbResourceImpl(name, this,
                             DbUri(this.name(), path.stream().map { it.toString() }.collect(toList())),
                             headers)
                 }
+                .map { o -> o as DbResource }
+                .toList().stream()
     }
 
     override fun metaData(): Map<String, String> {
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/SqlController.kt b/src/main/kotlin/com/github/mgramin/sqlboot/rest/controllers/SqlController.kt
@@ -24,13 +24,11 @@
 
 package com.github.mgramin.sqlboot.rest.controllers
 
-import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.sql.select.impl.JdbcSelectQuery
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.*
-import java.util.stream.Collectors.toList
 import javax.sql.DataSource
 
 /**
@@ -42,27 +40,28 @@ import javax.sql.DataSource
 class SqlController(@field:Autowired private val dataSource: DataSource) {
 
     @RequestMapping(value = ["sql"], produces = arrayOf(MediaType.APPLICATION_XML_VALUE))
-    @Throws(BootException::class)
     fun execSql2Xml(@RequestBody sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().collect(toList())
+        return JdbcSelectQuery(dataSource, sql).select().toList()
     }
 
-    @RequestMapping(value = ["exec"], method = arrayOf(RequestMethod.POST), produces = arrayOf(MediaType.APPLICATION_XML_VALUE))
-    @Throws(BootException::class)
+    @RequestMapping(
+            value = ["exec"],
+            method = arrayOf(RequestMethod.POST),
+            produces = arrayOf(MediaType.APPLICATION_XML_VALUE))
     fun execSql2XmlPost(@RequestBody sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().collect(toList())
+        return JdbcSelectQuery(dataSource, sql).select().toList()
     }
 
     @RequestMapping(value = ["exec"], produces = arrayOf(MediaType.APPLICATION_JSON_VALUE))
-    @Throws(BootException::class)
     fun execSql2Json(@RequestParam("sql") sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().collect(toList())
+        return JdbcSelectQuery(dataSource, sql).select().toList()
     }
 
-    @RequestMapping(value = ["exec"], method = arrayOf(RequestMethod.POST), produces = arrayOf(MediaType.APPLICATION_JSON_VALUE))
-    @Throws(BootException::class)
+    @RequestMapping(
+            value = ["exec"],
+            method = arrayOf(RequestMethod.POST),
+            produces = arrayOf(MediaType.APPLICATION_JSON_VALUE))
     fun execSql2JsonPost(@RequestBody sql: String): List<Map<String, Any>> {
-        return JdbcSelectQuery(dataSource, sql).select().collect(toList())
+        return JdbcSelectQuery(dataSource, sql).select().toList()
     }
-
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/SelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/SelectQuery.kt
@@ -43,17 +43,15 @@ interface SelectQuery {
      * @throws BootException SQL exception
      */
     @Deprecated("")
-    @Throws(BootException::class)
-    fun select(): Stream<Map<String, Any>>
+    fun select(): Sequence<Map<String, Any>>
 
     /**
      * Execute select query with parameters
      *
      * @return query result
      * @throws BootException SQL exception
      */
-    @Throws(BootException::class)
-    open fun select(variables: Map<String, Any>): Stream<Map<String, Any>> {
+    fun select(variables: Map<String, Any>): Sequence<Map<String, Any>> {
         return select()
     }
 
@@ -69,7 +67,5 @@ interface SelectQuery {
      * @throws BootException SQL exception
      */
     @Deprecated("")
-    @Throws(BootException::class)
     fun dbHealth()
-
 }
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/impl/JdbcSelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/impl/JdbcSelectQuery.kt
@@ -34,11 +34,7 @@ import java.sql.SQLException
 import java.util.AbstractMap.SimpleEntry
 import java.util.Arrays.stream
 import java.util.Optional.ofNullable
-import java.util.Spliterator.ORDERED
-import java.util.Spliterators.spliteratorUnknownSize
 import java.util.stream.Collectors.toMap
-import java.util.stream.Stream
-import java.util.stream.StreamSupport.stream
 import javax.sql.DataSource
 
 /**
@@ -48,30 +44,28 @@ import javax.sql.DataSource
  * @version $Id: f38638fde3d38f83edd4b8a03c570f845c856752 $
  * @since 0.1
  */
-class JdbcSelectQuery(private val dataSource: DataSource,
-                      private val sql: String?,
-                      private val nullAlias: String,
-                      private val templateGenerator: TemplateGenerator?) : SelectQuery {
+class JdbcSelectQuery(
+    private val dataSource: DataSource,
+    private val sql: String?,
+    private val nullAlias: String,
+    private val templateGenerator: TemplateGenerator?
+) : SelectQuery {
 
-    constructor(datasource: DataSource,
-                templateGenerator: TemplateGenerator) : this(datasource, null, "[NULL]", templateGenerator) {
-    }
+    constructor(datasource: DataSource, templateGenerator: TemplateGenerator)
+            : this(datasource, null, "[NULL]", templateGenerator)
 
-    constructor(datasource: DataSource,
-                sql: String) : this(datasource, sql, "[NULL]", null) {
-    }
+    constructor(datasource: DataSource, sql: String)
+            : this(datasource, sql, "[NULL]", null)
 
-    @Throws(BootException::class)
-    override fun select(): Stream<Map<String, Any>> {
+    override fun select(): Sequence<Map<String, Any>> {
         return getMapStream(sql)
     }
 
-    @Throws(BootException::class)
-    override fun select(variables: Map<String, Any>): Stream<Map<String, Any>> {
+    override fun select(variables: Map<String, Any>): Sequence<Map<String, Any>> {
         return getMapStream(templateGenerator!!.generate(variables))
     }
 
-    private fun getMapStream(sqlText: String?): Stream<Map<String, Any>> {
+    private fun getMapStream(sqlText: String?): Sequence<Map<String, Any>> {
         logger.info(sqlText)
         val rowSet = JdbcTemplate(dataSource).queryForRowSet(sqlText)
         val iterator = object : Iterator<Map<String, Any>> {
@@ -101,7 +95,7 @@ class JdbcSelectQuery(private val dataSource: DataSource,
                                 { a, b -> a }))
             }
         }
-        return stream(spliteratorUnknownSize(iterator, ORDERED), false)
+        return iterator.asSequence()
     }
 
     override fun columns(): Map<String, String> {
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PageWrapper.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/PageWrapper.kt
@@ -28,26 +28,19 @@ import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.sql.select.SelectQuery
 import java.util.stream.Stream
 
-class PageWrapper
-/**
- * Ctor.
- *
- * @param origin
- * @param pageNumber
- * @param pageSize
- */
-(private val origin: SelectQuery,
- private val pageNumber: Int,
- private val pageSize: Int
+class PageWrapper(
+    private val origin: SelectQuery,
+    private val pageNumber: Int,
+    private val pageSize: Int
 ) : SelectQuery {
 
     val sql = """select *
                 |  from ()""".trimMargin()
 
     @Throws(BootException::class)
-    override fun select(): Stream<Map<String, Any>> {
+    override fun select(): Sequence<Map<String, Any>> {
         println(sql)
-        return Stream.empty()
+        return sequenceOf()
     }
 
     override fun columns(): Map<String, String> {
diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/sql/impl/JdbcSelectQueryTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/sql/impl/JdbcSelectQueryTest.kt
@@ -54,7 +54,7 @@ class JdbcSelectQueryTest {
                   |  from (select name as   "n"
                   |             , email as "mail"
                   |          from main_schema.users)""".trimMargin())
-                .select().collect(Collectors.toList())
+                .select().toList()
         println(select[0])
 //        assertThat(select[0], hasEntry("labrador", "buzz"));
 //        assertEquals(select.toString(),
