feature #10: log Query

src/test/kotlin/fr/postgresjson/ConnectionTest.kt

@@ -1,10 +1,10 @@
 package fr.postgresjson
 
-import com.github.jasync.sql.db.util.isCompleted
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.entity.IdEntity
 import org.junit.Assert.*
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
@@ -41,7 +41,7 @@ class ConnectionTest(): TestAbstract() {
             from test2 t
             JOIN test t2 ON t.test_id = t2.id
         ) j;
-        """
+        """.trimIndent()
         )
         assertNotNull(objs)
         assertTrue(objs is List<ObjTest2>)
@@ -71,9 +71,8 @@ class ConnectionTest(): TestAbstract() {
     @Test
     fun callExec() {
         val o = ObjTest("myName")
-        val future = connection.exec("select json_build_object('id', 1, 'name', ?::json->>'name')", listOf(o))
-        future.join()
-        assertTrue(future.isCompleted)
+        val result = connection.exec("select json_build_object('id', 1, 'name', ?::json->>'name')", listOf(o))
+        Assertions.assertEquals(1, result.rowsAffected)
     }
 
     @Test
@@ -107,9 +106,9 @@ class ConnectionTest(): TestAbstract() {
             """.trimIndent(),
             params
         )
-        assertEquals(result[0]!!.first, "ff")
-        assertEquals(result[0]!!.seconde, "sec")
-        assertEquals(result[0]!!.third, 123)
+        assertEquals(result[0].first, "ff")
+        assertEquals(result[0].seconde, "sec")
+        assertEquals(result[0].third, 123)
     }
 
     @Test

src/test/kotlin/fr/postgresjson/RequesterTest.kt

@@ -1,16 +1,12 @@
 package fr.postgresjson
 
-import com.github.jasync.sql.db.QueryResult
-import com.github.jasync.sql.db.util.isCompleted
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.entity.IdEntity
 import org.junit.Assert
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import java.io.File
-import java.util.concurrent.CompletableFuture
 
 class RequesterTest: TestAbstract() {
     class ObjTest(var name:String): IdEntity(1)
@@ -42,25 +38,23 @@ class RequesterTest: TestAbstract() {
     @Test
     fun `call exec on query`() {
         val resources = File(this::class.java.getResource("/sql/query").toURI())
-        val future: CompletableFuture<QueryResult> = Requester(getConnextion())
+        val result = Requester(getConnextion())
             .addQuery(resources)
             .getQuery("Test/selectOne")
             .exec()
 
-        future.join()
-        Assertions.assertTrue(future.isCompleted)
+        assertEquals(1, result.rowsAffected)
     }
 
     @Test
     fun `call exec on function`() {
         val resources = File(this::class.java.getResource("/sql/function").toURI())
-        val future: CompletableFuture<QueryResult> = Requester(getConnextion())
+        val result = Requester(getConnextion())
             .addFunction(resources)
             .getFunction("test_function")
             .exec(listOf("test", "plip"))
 
-        future.join()
-        Assertions.assertTrue(future.isCompleted)
+        assertEquals(1, result.rowsAffected)
     }
 
     @Test

src/test/resources/logback.xml

@@ -4,23 +4,23 @@
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <property name="LOG_DIR" value="./postgresjson" />
+    <property name="LOG_DIR" value="./var/log" />
     <appender name="query" class="ch.qos.logback.core.FileAppender">
         <file>${LOG_DIR}/query.log</file>
         <append>true</append>
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg%n</pattern>
+            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
     <appender name="other" class="ch.qos.logback.core.FileAppender">
         <file>${LOG_DIR}/other.log</file>
         <append>true</append>
         <encoder>
-            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg%n</pattern>
+            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
-    <root level="trace">
+    <root level="debug">
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="other" />
     </root>
@@ -28,7 +28,7 @@
     <logger name="org.eclipse.jetty" level="INFO"/>
     <logger name="io.netty" level="INFO"/>
 
-    <logger name="fr.postgresjson.connexion" level="trace">
+    <logger name="fr.postgresjson.connexion" level="debug">
         <appender-ref ref="query" />
     </logger>
 </configuration>