close cassandra session upon query execution

ekino · Sep 3, 2024 · d376bf0 · d376bf0
1 parent c90ea4f
commit d376bf0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/jcv-db-cassandra/src/main/kotlin/com/ekino/oss/jcv/db/cassandra/util/DBComparatorBuilder.kt b/jcv-db-cassandra/src/main/kotlin/com/ekino/oss/jcv/db/cassandra/util/DBComparatorBuilder.kt
@@ -7,21 +7,12 @@ import com.ekino.oss.jcv.db.cassandra.DbComparatorCassandra
 import com.ekino.oss.jcv.db.config.DBValidators
 import org.skyscreamer.jsonassert.JSONCompareMode
 
-class DBComparatorBuilder {
+class DBComparatorBuilder(
+    private var mode: JSONCompareMode,
+    private var validators: List<JsonValidator<*>>
+) {
 
-    constructor()
-
-    constructor(
-        mode: JSONCompareMode,
-        validators: List<JsonValidator<*>>
-    ) {
-        this.mode = mode
-        this.validators = validators
-    }
-
-    private lateinit var mode: JSONCompareMode
-    private lateinit var validators: List<JsonValidator<*>>
-    private var datasource: CassandraDataSource? = null
+    private lateinit var datasource: CassandraDataSource
     private var customMapper: CassandraMapper? = null
 
     companion object {

diff --git a/jcv-db-cassandra/src/main/kotlin/com/ekino/oss/jcv/db/cassandra/util/QueryConverter.kt b/jcv-db-cassandra/src/main/kotlin/com/ekino/oss/jcv/db/cassandra/util/QueryConverter.kt
@@ -2,22 +2,19 @@ package com.ekino.oss.jcv.db.cassandra.util
 
 import com.datastax.oss.driver.api.core.CqlSession
 import com.datastax.oss.driver.api.core.cql.ResultSet
-import com.ekino.oss.jcv.db.exception.DbAssertException
 import com.ekino.oss.jcv.db.model.RowModel
 import com.ekino.oss.jcv.db.model.TableModel
 import java.net.InetSocketAddress
 
-class QueryConverter(private val dataSource: CassandraDataSource? = null) {
+class QueryConverter(private val dataSource: CassandraDataSource) {
     fun fromQueryToTableModel(query: String): TableModel {
-        val session = buildCqlSession(dataSource)
-
-        val resultSet = session.execute(query)
-        return fromResultSetToTableModel(resultSet)
+        return buildCqlSession().use { session ->
+            val resultSet = session.execute(query)
+            fromResultSetToTableModel(resultSet)
+        }
     }
 
-    private fun buildCqlSession(dataSource: CassandraDataSource? = null): CqlSession {
-        dataSource ?: throw DbAssertException("You have to defined a valida datource")
-
+    private fun buildCqlSession(): CqlSession {
         val builder = CqlSession
             .builder()
             .withLocalDatacenter(dataSource.datacenter)