fix select on query with no result

Improve gradle tasks
update dependencies
2021-02-27 01:29:21 +01:00 · 2021-02-27 00:19:30 +01:00 · 2021-02-26 23:00:41 +01:00 · 2021-02-26 23:00:29 +01:00 · 2020-12-15 14:21:07 +01:00 · 2020-11-26 09:29:13 +01:00
41 changed files with 252 additions and 324 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,16 +2,30 @@
  <code_scheme name="Project" version="173">
    <JetCodeStyleSettings>
      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
        <value>
-          <package name="java.util" withSubpackages="true" static="false" />
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
        </value>
      </option>
      <option name="SPACE_BEFORE_EXTEND_COLON" value="false" />
      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="IMPORT_NESTED_CLASSES" value="true" />
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
--- a/.idea/runConfigurations/Check.xml
+++ b/.idea/runConfigurations/Check.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="Check" type="CompoundRunConfigurationType">
+    <toRun name="run DB" type="docker-deploy" />
    <toRun name="Lint" type="GradleRunConfiguration" />
    <toRun name="tests" type="JUnit" />
    <method v="2" />
--- a/.idea/runConfigurations/Test_and_Publish_To_MavenLocal.xml
+++ b/.idea/runConfigurations/Test_and_Publish_To_MavenLocal.xml
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test and Publish To MavenLocal" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="publishToMavenLocal" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
-      </ENTRIES>
-    </extension>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Lint" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="tests" run_configuration_type="JUnit" />
-    </method>
-  </configuration>
-</component>
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,11 +4,12 @@ plugins {
    jacoco

    id("maven-publish")
-    id("org.jetbrains.kotlin.jvm") version "1.3.50"
+    kotlin("jvm") version "1.4.30"

-    id("org.jlleitschuh.gradle.ktlint") version "8.2.0"
-    id("org.owasp.dependencycheck") version "5.1.0"
-    id("fr.coppernic.versioning") version "3.1.2"
+    id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
+    id("org.owasp.dependencycheck") version "6.1.1"
+    id("fr.coppernic.versioning") version "3.2.1"
+    id("com.avast.gradle.docker-compose") version "0.14.0"
 }

 group = "com.github.flecomte"
@@ -27,19 +28,41 @@ tasks.withType<KotlinCompile> {
    }
 }

+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+
+tasks.test {
+    useJUnit()
+    useJUnitPlatform()
+    systemProperty("junit.jupiter.execution.parallel.enabled", true)
+    finalizedBy(tasks.ktlintCheck)
+}
+
+tasks.publishToMavenLocal {
+    dependsOn(tasks.test)
+}
+
 dependencies {
    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.31")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9")
-    implementation("com.github.jasync-sql:jasync-postgresql:1.0.7")
-    implementation("org.slf4j:slf4j-api:1.7.26")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.31")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.1")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.1")
+    implementation("com.github.jasync-sql:jasync-postgresql:1.1.7")
+    implementation("org.slf4j:slf4j-api:1.7.30")
+    implementation("com.avast.gradle:gradle-docker-compose-plugin:0.14.0")

    testImplementation("ch.qos.logback:logback-classic:1.2.3")
    testImplementation("ch.qos.logback:logback-core:1.2.3")
-    testImplementation("io.mockk:mockk:1.9")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")
-    testImplementation("org.amshove.kluent:kluent:1.47")
+    testImplementation("io.mockk:mockk:1.10.6")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.4.30")
+    testImplementation("org.amshove.kluent:kluent:1.65")
 }

 val sourcesJar by tasks.creating(Jar::class) {
@@ -47,6 +70,14 @@ val sourcesJar by tasks.creating(Jar::class) {
    from(sourceSets.getByName("main").allSource)
 }

+apply(plugin = "docker-compose")
+dockerCompose {
+    projectName = "postgres-json"
+    useComposeFiles = listOf("docker-compose.yml")
+    stopContainers = true
+    isRequiredBy(project.tasks.test)
+}
+
 publishing {
    repositories {
        maven {
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,13 +13,3 @@ services:
      POSTGRES_DB: json_test
      POSTGRES_USER: test
      POSTGRES_PASSWORD: test
-
-  pgadmin:
-    container_name: pgadmin4_json
-    image: dpage/pgadmin4
-    restart: always
-    ports:
-      - 8585:80
-    environment:
-      PGADMIN_DEFAULT_EMAIL: rusk23@gmail.com
-      PGADMIN_DEFAULT_PASSWORD: azerty
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
--- a/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
+++ b/src/main/kotlin/fr/postgresjson/connexion/Connection.kt
@@ -12,7 +12,7 @@ import fr.postgresjson.entity.Serializable
 import fr.postgresjson.serializer.Serializer
 import fr.postgresjson.utils.LoggerDelegate
 import org.slf4j.Logger
-import java.util.concurrent.*
+import java.util.concurrent.CompletableFuture

 typealias SelectOneCallback<T> = QueryResult.(T?) -> Unit
 typealias SelectCallback<T> = QueryResult.(List<T>) -> Unit
@@ -25,17 +25,26 @@ class Connection(
    private val host: String = "localhost",
    private val port: Int = 5432
 ) : Executable {
-    private lateinit var connection: ConnectionPool<PostgreSQLConnection>
+    private var connection: ConnectionPool<PostgreSQLConnection>? = null
    private val serializer = Serializer()
    private val logger: Logger? by LoggerDelegate()

    internal fun connect(): ConnectionPool<PostgreSQLConnection> {
-        if (!::connection.isInitialized || !connection.isConnected()) {
-            connection = PostgreSQLConnectionBuilder.createConnectionPool(
-                "jdbc:postgresql://$host:$port/$database?user=$username&password=$password"
-            )
+        return connection.let { connectionPool ->
+            if (connectionPool == null || !connectionPool.isConnected()) {
+                PostgreSQLConnectionBuilder.createConnectionPool(
+                    "jdbc:postgresql://$host:$port/$database?user=$username&password=$password"
+                ).also {
+                    connection = it
+                }
+            } else {
+                connectionPool
+            }
        }
-        return connection
+    }
+
+    fun disconnect() {
+        connection?.run { disconnect() }
    }

    fun <A> inTransaction(f: (Connection) -> CompletableFuture<A>) = connect().inTransaction(f)
@@ -50,7 +59,7 @@ class Connection(
            it is EntityI && typeReference.type.typeName == it::class.java.name
        } as R?
        val result = exec(sql, compileArgs(values))
-        val json = result.rows[0].getString(0)
+        val json = result.rows.firstOrNull()?.getString(0)
        return if (json === null) {
            null
        } else {
@@ -271,11 +280,14 @@ class Connection(
            logger?.debug("Query executed in $duration ms \n{}", args)
            return result
        } catch (e: Throwable) {
-            logger?.info("""
+            logger?.info(
+                """
                Query Error: 
                ${sql.prependIndent()}, 
                ${values.joinToString(", ").prependIndent()}
-            """.trimIndent(), e)
+                """.trimIndent(),
+                e
+            )
            throw e
        }
    }
--- a/src/main/kotlin/fr/postgresjson/connexion/Requester.kt
+++ b/src/main/kotlin/fr/postgresjson/connexion/Requester.kt
@@ -3,7 +3,6 @@ package fr.postgresjson.connexion
 import fr.postgresjson.utils.searchSqlFiles
 import java.net.URI
 import fr.postgresjson.definition.Function as DefinitionFunction
-import fr.postgresjson.definition.Function as FunctionDefinition
 import fr.postgresjson.definition.Query as QueryDefinition

 class Requester(
@@ -52,7 +51,7 @@ class Requester(
    fun addFunction(functionsDirectory: URI): Requester {
        functionsDirectory.searchSqlFiles()
            .forEach {
-                if (it is FunctionDefinition) {
+                if (it is DefinitionFunction) {
                    addFunction(it)
                }
            }
--- a/src/main/kotlin/fr/postgresjson/definition/Query.kt
+++ b/src/main/kotlin/fr/postgresjson/definition/Query.kt
@@ -14,8 +14,8 @@ class Query(
        """-- *name ?: ?(?<name>[^ \n]+)"""
            .toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE))
            .find(script)?.let {
-            it.groups["name"]?.value?.trim()
-        }
+                it.groups["name"]?.value?.trim()
+            }

    /** Try to get name from the filename */
    private fun getNameFromFile(source: Path): String = source
--- a/src/main/kotlin/fr/postgresjson/entity/immutable/ImmutableEntity.kt
+++ b/src/main/kotlin/fr/postgresjson/entity/immutable/ImmutableEntity.kt
@@ -1,12 +1,7 @@
-package fr.postgresjson.entity.immutable
+package fr.postgresjson.entity

-import fr.postgresjson.entity.EntityI
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import fr.postgresjson.entity.mutable.EntityDeletedBy
-import fr.postgresjson.entity.mutable.EntityDeletedByImp
 import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID

 interface EntityRefI<T> : EntityI {
    val id: T
@@ -17,7 +12,7 @@ interface UuidEntityI : EntityRefI<UUID> {
 }

 abstract class Entity<T>(override val id: T) : EntityRefI<T>
-open class UuidEntity(override val id: UUID = UUID.randomUUID()) : UuidEntityI, Entity<UUID>(id)
+open class UuidEntity(id: UUID? = null) : UuidEntityI, Entity<UUID>(id ?: UUID.randomUUID())

 /* Version */
 interface EntityVersioning<ID, NUMBER> {
@@ -26,16 +21,27 @@ interface EntityVersioning<ID, NUMBER> {
 }

 class UuidEntityVersioning(
-    override var versionNumber: Int? = null,
-    override val versionId: UUID = UUID.randomUUID()
-) : EntityVersioning<UUID, Int?>
+    override val versionNumber: Int,
+    versionId: UUID? = null
+) : EntityVersioning<UUID, Int> {
+    override val versionId: UUID = versionId ?: UUID.randomUUID()
+}

 /* Dates */
 interface EntityCreatedAt {
    val createdAt: DateTime
 }
 interface EntityUpdatedAt {
-    var updatedAt: DateTime
+    val updatedAt: DateTime
+}
+
+interface EntityDeletedAt {
+    val deletedAt: DateTime?
+    fun isDeleted(): Boolean {
+        return deletedAt?.let {
+            it < DateTime.now()
+        } ?: false
+    }
 }

 class EntityCreatedAtImp(
@@ -43,15 +49,23 @@ class EntityCreatedAtImp(
 ) : EntityCreatedAt

 class EntityUpdatedAtImp(
-    override var updatedAt: DateTime = DateTime.now()
+    override val updatedAt: DateTime = DateTime.now()
 ) : EntityUpdatedAt

+class EntityDeletedAtImp(
+    override val deletedAt: DateTime? = null
+) : EntityDeletedAt
+
 /* Author */
 interface EntityCreatedBy<T : EntityI> {
    val createdBy: T
 }
 interface EntityUpdatedBy<T : EntityI> {
-    var updatedBy: T
+    val updatedBy: T
+}
+
+interface EntityDeletedBy<T : EntityI> {
+    val deletedBy: T?
 }

 class EntityCreatedByImp<UserT : EntityI>(
@@ -59,9 +73,13 @@ class EntityCreatedByImp<UserT : EntityI>(
 ) : EntityCreatedBy<UserT>

 class EntityUpdatedByImp<UserT : EntityI>(
-    override var updatedBy: UserT
+    override val updatedBy: UserT
 ) : EntityUpdatedBy<UserT>

+class EntityDeletedByImp<UserT : EntityI>(
+    override val deletedBy: UserT?
+) : EntityDeletedBy<UserT>
+
 /* Mixed */
 class EntityCreatedImp<UserT : EntityI>(
    override val createdAt: DateTime = DateTime.now(),
@@ -71,10 +89,22 @@ class EntityCreatedImp<UserT : EntityI>(

 class EntityUpdatedImp<UserT : EntityI>(
    updatedAt: DateTime = DateTime.now(),
-    override var updatedBy: UserT
+    override val updatedBy: UserT
 ) : EntityUpdatedBy<UserT>,
    EntityUpdatedAt by EntityUpdatedAtImp(updatedAt)

+/* Published */
+interface Published<UserT : EntityI> {
+    val publishedAt: DateTime?
+    val publishedBy: UserT?
+}
+
+class EntityPublishedImp<UserT : EntityI>(
+    override val publishedBy: UserT?
+) : Published<UserT> {
+    override val publishedAt: DateTime? = null
+}
+
 /* Implementation */
 abstract class EntityImp<T, UserT : EntityI>(
    updatedBy: UserT,
@@ -86,3 +116,11 @@ abstract class EntityImp<T, UserT : EntityI>(
    EntityCreatedBy<UserT> by EntityCreatedByImp(updatedBy),
    EntityUpdatedBy<UserT> by EntityUpdatedByImp(updatedBy),
    EntityDeletedBy<UserT> by EntityDeletedByImp(updatedBy)
+
+abstract class UuidEntityExtended<T, UserT : EntityI>(
+    updatedBy: UserT,
+    publishedBy: UserT?
+) :
+    EntityImp<T, UserT>(updatedBy),
+    EntityVersioning<UUID, Int> by UuidEntityVersioning(0),
+    Published<UserT> by EntityPublishedImp(publishedBy)
--- a/src/main/kotlin/fr/postgresjson/entity/mutable/MutableEntity.kt
+++ b/src/main/kotlin/fr/postgresjson/entity/mutable/MutableEntity.kt
@@ -1,135 +0,0 @@
-package fr.postgresjson.entity.mutable
-
-import fr.postgresjson.entity.EntityI
-import org.joda.time.DateTime
-import java.util.*
-
-interface EntityRefI<T> : EntityI {
-    var id: T?
-}
-
-interface UuidEntityI : EntityRefI<UUID> {
-    override var id: UUID?
-}
-
-interface IdEntityI : EntityRefI<Int> {
-    override var id: Int?
-}
-
-abstract class Entity<T>(override var id: T? = null) : EntityRefI<T>
-open class UuidEntity(override var id: UUID? = UUID.randomUUID()) : UuidEntityI, Entity<UUID>(id)
-open class IdEntity(override var id: Int? = null) : IdEntityI, Entity<Int>(id)
-
-/* Version */
-interface EntityVersioning<ID, NUMBER> {
-    var versionId: ID
-    var versionNumber: NUMBER?
-}
-
-class UuidEntityVersioning(
-    override var versionNumber: Int? = null,
-    override var versionId: UUID = UUID.randomUUID()
-) : EntityVersioning<UUID, Int>
-
-/* Dates */
-interface EntityCreatedAt {
-    var createdAt: DateTime?
-}
-
-interface EntityUpdatedAt {
-    var updatedAt: DateTime?
-}
-
-interface EntityDeletedAt {
-    var deletedAt: DateTime?
-    fun isDeleted(): Boolean {
-        val deletedAt = deletedAt
-        return deletedAt != null && deletedAt < DateTime.now()
-    }
-}
-
-class EntityCreatedAtImp : EntityCreatedAt {
-    override var createdAt: DateTime? = null
-}
-
-class EntityUpdatedAtImp : EntityUpdatedAt {
-    override var updatedAt: DateTime? = null
-}
-
-class EntityDeletedAtImp : EntityDeletedAt {
-    override var deletedAt: DateTime? = null
-}
-
-/* Author */
-interface EntityCreatedBy<T : EntityI> {
-    var createdBy: T?
-}
-
-interface EntityUpdatedBy<T : EntityI> {
-    var updatedBy: T?
-}
-
-interface EntityDeletedBy<T : EntityI> {
-    var deletedBy: T?
-}
-
-class EntityCreatedByImp<UserT : EntityI>(
-    override var createdBy: UserT?
-) : EntityCreatedBy<UserT>
-
-class EntityUpdatedByImp<UserT : EntityI>(
-    override var updatedBy: UserT?
-) : EntityUpdatedBy<UserT>
-
-class EntityDeletedByImp<UserT : EntityI>(
-    override var deletedBy: UserT?
-) : EntityDeletedBy<UserT>
-
-/* Mixed */
-class EntityDeletedImp<UserT : EntityI>(
-    override var deletedBy: UserT? = null
-) : EntityDeletedBy<UserT>,
-    EntityDeletedAt by EntityDeletedAtImp()
-
-class EntityUpdatedImp<UserT : EntityI>(
-    override var updatedAt: DateTime? = null,
-    override var updatedBy: UserT? = null
-) : EntityUpdatedBy<UserT>,
-    EntityUpdatedAt by EntityUpdatedAtImp()
-
-class EntityCreatedImp<UserT : EntityI>(
-    override var createdAt: DateTime? = null,
-    override var createdBy: UserT? = null
-) : EntityCreatedBy<UserT>,
-    EntityCreatedAt by EntityCreatedAtImp()
-
-/* Published */
-interface Published<UserT : EntityI> {
-    var publishedAt: DateTime?
-    var publishedBy: UserT?
-}
-
-class EntityPublishedImp<UserT : EntityI>(
-    override var publishedBy: UserT?
-) : Published<UserT> {
-    override var publishedAt: DateTime? = null
-}
-
-/* Implementation */
-abstract class EntityImp<T, UserT : EntityI>(
-    updatedBy: UserT?
-) : Entity<T>(),
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityUpdatedAt by EntityUpdatedAtImp(),
-    EntityDeletedAt by EntityDeletedAtImp(),
-    EntityCreatedBy<UserT> by EntityCreatedByImp(updatedBy),
-    EntityUpdatedBy<UserT> by EntityUpdatedByImp(updatedBy),
-    EntityDeletedBy<UserT> by EntityDeletedByImp(updatedBy)
-
-abstract class UuidEntityExtended<T, UserT : EntityI>(
-    updatedBy: UserT?,
-    publishedBy: UserT?
-) :
-    EntityImp<T, UserT>(updatedBy),
-    EntityVersioning<UUID, Int> by UuidEntityVersioning(),
-    Published<UserT> by EntityPublishedImp(publishedBy)
--- a/src/main/kotlin/fr/postgresjson/migration/Function.kt
+++ b/src/main/kotlin/fr/postgresjson/migration/Function.kt
@@ -4,8 +4,8 @@ import com.github.jasync.sql.db.postgresql.exceptions.GenericDatabaseException
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.migration.Migration.Action
 import fr.postgresjson.migration.Migration.Status
-import java.util.*
-import java.util.concurrent.*
+import java.util.Date
+import java.util.concurrent.CompletionException
 import fr.postgresjson.definition.Function as DefinitionFunction

 data class Function(
--- a/src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt
+++ b/src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt
@@ -1,9 +1,9 @@
 package fr.postgresjson.migration

 import fr.postgresjson.connexion.Connection
-import fr.postgresjson.entity.mutable.Entity
+import fr.postgresjson.entity.Entity
 import fr.postgresjson.migration.Migration.Action
-import java.util.*
+import java.util.Date

 data class MigrationScript(
    val name: String,
--- a/src/main/kotlin/fr/postgresjson/migration/Migrations.kt
+++ b/src/main/kotlin/fr/postgresjson/migration/Migrations.kt
@@ -2,8 +2,7 @@ package fr.postgresjson.migration

 import com.fasterxml.jackson.core.type.TypeReference
 import fr.postgresjson.connexion.Connection
-import fr.postgresjson.definition.Migration as DefinitionMigration
-import fr.postgresjson.entity.mutable.Entity
+import fr.postgresjson.entity.Entity
 import fr.postgresjson.migration.Migration.Action
 import fr.postgresjson.migration.Migration.Status
 import fr.postgresjson.utils.LoggerDelegate
@@ -11,8 +10,9 @@ import fr.postgresjson.utils.searchSqlFiles
 import org.slf4j.Logger
 import java.io.FileNotFoundException
 import java.net.URI
-import java.util.*
+import java.util.Date
 import fr.postgresjson.definition.Function as DefinitionFunction
+import fr.postgresjson.definition.Migration as DefinitionMigration

 class MigrationEntity(
    val filename: String,
--- a/src/test/kotlin/fr/postgresjson/ConnectionTest.kt
+++ b/src/test/kotlin/fr/postgresjson/ConnectionTest.kt
@@ -1,70 +1,73 @@
 package fr.postgresjson

 import fr.postgresjson.connexion.Paginated
-import fr.postgresjson.entity.mutable.IdEntity
 import fr.postgresjson.entity.Parameter
-import org.junit.Assert.*
+import fr.postgresjson.entity.UuidEntity
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
+import java.util.UUID

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class ConnectionTest() : TestAbstract() {
-    private class ObjTest(var name: String) : IdEntity()
-    private class ObjTest2(var title: String, var test: ObjTest?) : IdEntity()
-    private class ObjTest3(var first: String, var seconde: String, var third: Int) : IdEntity()
-    private class ObjTestWithParameterObject(var first: ParameterObject, var seconde: ParameterObject) : IdEntity()
+    private class ObjTest(val name: String, id: UUID = UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00")) : UuidEntity(id)
+    private class ObjTest2(val title: String, var test: ObjTest?) : UuidEntity()
+    private class ObjTest3(val first: String, var seconde: String, var third: Int) : UuidEntity()
+    private class ObjTestWithParameterObject(var first: ParameterObject, var seconde: ParameterObject) : UuidEntity()
    private class ParameterObject(var third: String) : Parameter

    @Test
    fun getObject() {
        val obj: ObjTest? = connection.selectOne("select to_json(a) from test a limit 1")
        assertTrue(obj is ObjTest)
-        assertTrue(obj!!.id == 1)
+        assertTrue(obj!!.id == UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
    }

    @Test
    fun getExistingObject() {
-        val objs: List<ObjTest2> = connection.select("""
-        select
-            json_agg(j)
-            FROM (
-            SELECT
-                t.id, t.title,
-                t2 as test
-            from test2 t
-            JOIN test t2 ON t.test_id = t2.id
-        ) j;
-        """.trimIndent()
+        val objs: List<ObjTest2> = connection.select(
+            """
+            select
+                json_agg(j)
+                FROM (
+                SELECT
+                    t.id, t.title,
+                    t2 as test
+                from test2 t
+                JOIN test t2 ON t.test_id = t2.id
+            ) j;
+            """.trimIndent()
        )
        assertNotNull(objs)
        assertEquals(objs.size, 2)
-        assertEquals(objs[0].id, 1)
-        assertEquals(objs[0].test!!.id, 1)
+        assertEquals(objs[0].id, UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
+        assertEquals(objs[0].test!!.id, UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
    }

    @Test
    fun callRequestWithArgs() {
-        val result: ObjTest? = connection.selectOne("select json_build_object('id', 1, 'name', ?::text)", listOf("myName"))
+        val result: ObjTest? = connection.selectOne("select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', ?::text)", listOf("myName"))
        assertNotNull(result)
        assertEquals("myName", result!!.name)
    }

    @Test
    fun callRequestWithArgsEntity() {
-        val o = ObjTest("myName")
-        o.id = 88
-        val obj: ObjTest? = connection.selectOne("select json_build_object('id', id, 'name', name) FROM json_to_record(?::json) as o(id int, name text);", listOf(o))
+        val o = ObjTest("myName", id = UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00"))
+        val obj: ObjTest? = connection.selectOne("select json_build_object('id', id, 'name', name) FROM json_to_record(?::json) as o(id uuid, name text);", listOf(o))
        assertNotNull(obj)
        assertTrue(obj is ObjTest)
-        assertEquals(obj!!.id, 88)
+        assertEquals(obj!!.id, UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00"))
        assertEquals(obj.name, "myName")
    }

    @Test
    fun callExec() {
        val o = ObjTest("myName")
-        val result = connection.exec("select json_build_object('id', 1, 'name', ?::json->>'name')", listOf(o))
+        val result = connection.exec("select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', ?::json->>'name')", listOf(o))
        Assertions.assertEquals(1, result.rowsAffected)
    }

@@ -141,8 +144,8 @@ class ConnectionTest() : TestAbstract() {
        val result: Paginated<ObjTest> = connection.select(
            """
            SELECT json_build_array(
-                json_build_object('id', 3, 'name', :name::text),
-                json_build_object('id', 4, 'name', :name::text || '-2')
+                json_build_object('id', '417aaa7e-7bc6-49b7-9fe8-6c8433b3f430', 'name', :name::text),
+                json_build_object('id', 'abd46e7a-e749-4ce4-8361-e7b64da89da6', 'name', :name::text || '-2')
            ), 10 as total
            LIMIT :limit OFFSET :offset
            """.trimIndent(),
--- a/src/test/kotlin/fr/postgresjson/EntityTest.kt
+++ b/src/test/kotlin/fr/postgresjson/EntityTest.kt
@@ -1,15 +1,22 @@
 package fr.postgresjson

+import fr.postgresjson.entity.Entity
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedBy
 import fr.postgresjson.entity.EntityI
-import fr.postgresjson.entity.mutable.*
+import fr.postgresjson.entity.EntityUpdatedAt
+import fr.postgresjson.entity.EntityUpdatedBy
+import fr.postgresjson.entity.Published
+import fr.postgresjson.entity.UuidEntityExtended
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
+import java.util.UUID

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class EntityTest() {
-    private class User(id: Int?) : Entity<Int?>(id)
-    private class ObjTest(var name: String) : UuidEntityExtended<Int?, User>(User(1), User(2))
+    private class User(id: UUID = UUID.randomUUID()) : Entity<UUID>(id)
+    private class ObjTest(var name: String) : UuidEntityExtended<Int?, User>(User(), User())

    @Test
    fun getObject() {
@@ -17,7 +24,7 @@ class EntityTest() {
        assertTrue(obj is ObjTest)
        assertTrue(obj is UuidEntityExtended<Int?, User>)
        assertTrue(obj is EntityI)
-        assertTrue(obj is Entity<Int?>)
+        assertTrue(obj is Entity<UUID>)
        assertTrue(obj is Published<User>)
        assertTrue(obj is EntityCreatedBy<User>)
        assertTrue(obj is EntityUpdatedBy<User>)
--- a/src/test/kotlin/fr/postgresjson/MigrationTest.kt
+++ b/src/test/kotlin/fr/postgresjson/MigrationTest.kt
@@ -10,6 +10,7 @@ import org.amshove.kluent.shouldThrow
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
+import java.util.UUID

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class MigrationTest() : TestAbstract() {
@@ -103,7 +104,7 @@ class MigrationTest() : TestAbstract() {
            .getFunction("test_function")
            .selectOne(listOf("test", "plip"))

-        Assertions.assertEquals(objTest!!.id, 3)
+        Assertions.assertEquals(objTest!!.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
        Assertions.assertEquals(objTest.name, "test")
    }

@@ -119,7 +120,7 @@ class MigrationTest() : TestAbstract() {
            .getFunction("test_function_duplicate")
            .selectOne(listOf("test"))

-        Assertions.assertEquals(objTest!!.id, 3)
+        Assertions.assertEquals(objTest!!.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
        Assertions.assertEquals(objTest.name, "test")

        val resources2 = this::class.java.getResource("/sql/function/Test2").toURI()
--- a/src/test/kotlin/fr/postgresjson/RequesterTest.kt
+++ b/src/test/kotlin/fr/postgresjson/RequesterTest.kt
@@ -2,13 +2,14 @@ package fr.postgresjson

 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.mutable.IdEntity
+import fr.postgresjson.entity.UuidEntity
 import org.junit.Assert
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import java.util.UUID

 class RequesterTest : TestAbstract() {
-    class ObjTest(var name: String) : IdEntity(1)
+    class ObjTest(var name: String, id: UUID = UUID.fromString("5623d902-3067-42f3-bfd9-095dbb12c29f")) : UuidEntity(id)

    @Test
    fun `get query from file`() {
@@ -18,7 +19,7 @@ class RequesterTest : TestAbstract() {
            .getQuery("selectOne")
            .selectOne()

-        assertEquals(objTest!!.id, 2)
+        assertEquals(objTest!!.id, UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528"))
        assertEquals(objTest.name, "test")
    }

@@ -30,7 +31,7 @@ class RequesterTest : TestAbstract() {
            .getFunction("test_function")
            .selectOne(listOf("test", "plip"))

-        assertEquals(objTest!!.id, 3)
+        assertEquals(objTest!!.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
        assertEquals(objTest.name, "test")
    }

--- a/src/test/kotlin/fr/postgresjson/SerializerTest.kt
+++ b/src/test/kotlin/fr/postgresjson/SerializerTest.kt
@@ -1,6 +1,6 @@
 package fr.postgresjson

-import fr.postgresjson.entity.mutable.IdEntity
+import fr.postgresjson.entity.UuidEntity
 import fr.postgresjson.serializer.Serializer
 import fr.postgresjson.serializer.deserialize
 import fr.postgresjson.serializer.serialize
@@ -10,23 +10,23 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
+import java.util.UUID

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SerializerTest {
-    private class ObjTest(var val1: String, var val2: Int) : IdEntity(1)
-    private class ObjTestDate(var val1: DateTime) : IdEntity(2)
+    private class ObjTest(var val1: String, var val2: Int, id: UUID = UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96")) : UuidEntity(id)
+    private class ObjTestDate(var val1: DateTime, id: UUID = UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528")) : UuidEntity(id)

    private val serializer = Serializer()

-    private val objSerialized: String = """{"val1":"plop","val2":123,"id":2}"""
-    private val objSerializedWithExtra: String = """{"val1":"plop","val2":123,"id":2,"toto":"tata"}"""
+    private val objSerialized: String = """{"val1":"plop","val2":123,"id":"829b1a29-5db8-47f9-9562-961c561ac528"}"""
+    private val objSerializedWithExtra: String = """{"val1":"plop","val2":123,"id":"829b1a29-5db8-47f9-9562-961c561ac528","toto":"tata"}"""
    private val objSerializedUpdate = """{"val1":"update","val2":123}"""
    private lateinit var obj: ObjTest

    @BeforeEach
    fun before() {
-        obj = ObjTest("plop", 123)
-        obj.id = 2
+        obj = ObjTest("plop", 123, UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528"))
    }

    @Test
--- a/src/test/resources/fixtures/init.sql
+++ b/src/test/resources/fixtures/init.sql
@@ -8,7 +8,7 @@ create schema if not exists public;

 create table if not exists test
 (
-    id serial not null
+    id uuid not null
        constraint test_pk
            primary key,
    name text
@@ -16,24 +16,24 @@ create table if not exists test

 create table if not exists test2
 (
-    id serial not null,
+    id uuid not null,
    title text,
-    test_id integer
+    test_id uuid
        constraint test2_test_id_fk
            references test
 );

-INSERT INTO test (id, name) VALUES (1, 'plop') ON CONFLICT DO NOTHING;
-INSERT INTO test2 (id, title, test_id) VALUES (1, 'plop', 1) ON CONFLICT DO NOTHING;
-INSERT INTO test2 (id, title, test_id) VALUES (2, 'plip', 1) ON CONFLICT DO NOTHING;
-INSERT INTO test2 (id, title, test_id) VALUES (3, 'ttt', null) ON CONFLICT DO NOTHING;
+INSERT INTO test (id, name) VALUES ('1e5f5d41-6d14-4007-897b-0ed2616bec96', 'plop') ON CONFLICT DO NOTHING;
+INSERT INTO test2 (id, title, test_id) VALUES ('1e5f5d41-6d14-4007-897b-0ed2616bec96', 'plop', '1e5f5d41-6d14-4007-897b-0ed2616bec96') ON CONFLICT DO NOTHING;
+INSERT INTO test2 (id, title, test_id) VALUES ('829b1a29-5db8-47f9-9562-961c561ac528', 'plip', '1e5f5d41-6d14-4007-897b-0ed2616bec96') ON CONFLICT DO NOTHING;
+INSERT INTO test2 (id, title, test_id) VALUES ('457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'ttt', null) ON CONFLICT DO NOTHING;

 CREATE OR REPLACE FUNCTION test_function (name text default 'plop', IN hi text default 'hello', out result json)
    LANGUAGE plpgsql
 AS
 $$
 BEGIN
-    result = json_build_object('id', 3, 'name', name);
+    result = json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name);
 END;
 $$;

@@ -44,8 +44,8 @@ AS
 $$
 BEGIN
    result = json_build_array(
-            json_build_object('id', 3, 'name', name),
-            json_build_object('id', 4, 'name', hi)
+            json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name),
+            json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', hi)
        );
 END;
 $$;
@@ -56,8 +56,8 @@ AS
 $$
 BEGIN
    SELECT json_build_array(
-                   json_build_object('id', 3, 'name', name::text),
-                   json_build_object('id', 4, 'name', name::text || '-2')
+                   json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name::text),
+                   json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', name::text || '-2')
               ),
           10
    INTO result, total
@@ -70,7 +70,7 @@ CREATE OR REPLACE FUNCTION test_function_object (inout resource json)
 AS
 $$
 BEGIN
-    resource = json_build_object('id', 1, 'name', 'changedName');
+    resource = json_build_object('id', '1e5f5d41-6d14-4007-897b-0ed2616bec96', 'name', 'changedName');
 END;
 $$;

--- a/src/test/resources/sql/function/Test/function_test.sql
+++ b/src/test/resources/sql/function/Test/function_test.sql
@@ -3,6 +3,6 @@ LANGUAGE plpgsql
 AS
 $$
 BEGIN
-    result = json_build_object('id', 3, 'name', name);
+    result = json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name);
 END;
 $$
--- a/src/test/resources/sql/function/Test/function_test_object.sql
+++ b/src/test/resources/sql/function/Test/function_test_object.sql
@@ -3,6 +3,6 @@ LANGUAGE plpgsql
 AS
 $$
 BEGIN
-    resource = json_build_object('id', 1, 'name', 'changedName');
+    resource = json_build_object('id', '1e5f5d41-6d14-4007-897b-0ed2616bec96', 'name', 'changedName');
 END;
 $$
--- a/src/test/resources/sql/function/Test/test_function_multiple.sql
+++ b/src/test/resources/sql/function/Test/test_function_multiple.sql
@@ -4,8 +4,8 @@ AS
 $$
 BEGIN
    result = json_build_array(
-        json_build_object('id', 3, 'name', name),
-        json_build_object('id', 4, 'name', hi)
+        json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name),
+        json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', hi)
    );
 END;
 $$
--- a/src/test/resources/sql/function/Test/test_function_paginated.sql
+++ b/src/test/resources/sql/function/Test/test_function_paginated.sql
@@ -4,8 +4,8 @@ AS
 $$
 BEGIN
    SELECT json_build_array(
-        json_build_object('id', 3, 'name', name::text),
-        json_build_object('id', 4, 'name', name::text || '-2')
+        json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name::text),
+        json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', name::text || '-2')
    ),
    10
    INTO result, total
--- a/src/test/resources/sql/function/Test1/function_test_duplicate.sql
+++ b/src/test/resources/sql/function/Test1/function_test_duplicate.sql
@@ -3,6 +3,6 @@ CREATE OR REPLACE FUNCTION test_function_duplicate (name text default 'plop') re
 AS
 $$
 BEGIN
-    return json_build_object('id', 3, 'name', name);
+    return json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name);
 END;
 $$
--- a/src/test/resources/sql/query/Test/selectOne.sql
+++ b/src/test/resources/sql/query/Test/selectOne.sql
@@ -1 +1 @@
-select json_build_object('id', 2, 'name', 'test');
+select json_build_object('id', '829b1a29-5db8-47f9-9562-961c561ac528', 'name', 'test');
--- a/src/test/resources/sql/query/Test/selectOneWithParameters.sql
+++ b/src/test/resources/sql/query/Test/selectOneWithParameters.sql
@@ -1 +1 @@
-select json_build_object('id', 2, 'name', :name::text), 'plop'::text as other;
+select json_build_object('id', '829b1a29-5db8-47f9-9562-961c561ac528', 'name', :name::text), 'plop'::text as other;
--- a/src/test/resources/sql/query/Test/selectPaginated.sql
+++ b/src/test/resources/sql/query/Test/selectPaginated.sql
@@ -1,5 +1,5 @@
 SELECT json_build_array(
-   json_build_object('id', 3, 'name', :name::text),
-   json_build_object('id', 4, 'name', :name::text || '-2')
+   json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', :name::text),
+   json_build_object('id', '6085c12e-e94d-4ae1-b7ad-23acc7a82a98', 'name', :name::text || '-2')
 ), 10 as total
 LIMIT :limit OFFSET :offset
Author	SHA1	Message	Date
Fabrice Lecomte	35a8712eef	fix select on query with no result	2021-02-27 01:29:21 +01:00
Fabrice Lecomte	b200b3579a	Improve gradle tasks	2021-02-27 00:19:30 +01:00
Fabrice Lecomte	a13ca2d954	update dependencies	2021-02-26 23:00:41 +01:00
Fabrice Lecomte	36ed678c5a	Add disconnect method	2021-02-26 23:00:29 +01:00
Fabrice Lecomte	c2c8b91dc5	Remove Mutable entities	2020-12-15 14:21:07 +01:00
Fabrice Lecomte	9d208292a5	fix immutable entities	2020-11-26 09:29:13 +01:00
Fabrice Lecomte	8bb3b61f2d	Fix Generate UUID if null is defined as ID	2020-07-10 22:43:58 +02:00
Fabrice Lecomte	5023f229ca	Generate UUID if null is defined as ID	2020-07-10 17:24:35 +02:00