From 19e98250b76e1adc7a80209ce9d5c39313943ddf Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Mon, 5 Aug 2019 20:29:15 +0200 Subject: [PATCH] change UuidEntityVersioning --- .../kotlin/fr/postgresjson/entity/Entity.kt | 19 +++++++------------ .../fr/postgresjson/repository/Repository.kt | 5 +++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/fr/postgresjson/entity/Entity.kt b/src/main/kotlin/fr/postgresjson/entity/Entity.kt index f788517..a220a37 100644 --- a/src/main/kotlin/fr/postgresjson/entity/Entity.kt +++ b/src/main/kotlin/fr/postgresjson/entity/Entity.kt @@ -17,18 +17,14 @@ abstract class UuidEntity(override var id: UUID? = UUID.randomUUID()): Entity(id) /* Version */ -interface EntityVersioning { - var version: T +interface EntityVersioning { + var versionId: ID + var versionNumber: NUMBER? } -interface EntityVersioningIncrement: EntityVersioning -class EntityVersioningIncrementImp: EntityVersioningIncrement { - override var version: Int? = null -} - -interface EntityVersioningDate: EntityVersioning -class EntityVersioningDateImp: EntityVersioningDate { - override var version: DateTime? = null +class UuidEntityVersioning: EntityVersioning { + override var versionId: UUID = UUID.randomUUID() + override var versionNumber: Int? = null } /* Dates */ @@ -85,6 +81,5 @@ abstract class EntityImp>: Entity(), abstract class EntityExtended>: EntityImp(), - EntityVersioningIncrement by EntityVersioningIncrementImp(), + EntityVersioning by UuidEntityVersioning(), Published by EntityPublishedImp() - diff --git a/src/main/kotlin/fr/postgresjson/repository/Repository.kt b/src/main/kotlin/fr/postgresjson/repository/Repository.kt index 1bfc791..58815a0 100644 --- a/src/main/kotlin/fr/postgresjson/repository/Repository.kt +++ b/src/main/kotlin/fr/postgresjson/repository/Repository.kt @@ -10,4 +10,9 @@ interface RepositoryI> { fun getClassName(): String { return entityName.simpleName!! } + + enum class Direction { + asc, + desc + } }