flecomte/postgres-json
1
1
Fork 0
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

Fix Generate UUID if null is defined as ID

Browse Source
This commit is contained in:
Fabrice Lecomte
2020-07-10 22:43:58 +02:00
parent 5023f229ca
commit 8bb3b61f2d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/fr/postgresjson/entity/immutable/ImmutableEntity.kt
View File

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

4
src/main/kotlin/fr/postgresjson/entity/mutable/MutableEntity.kt
View File

@@ -29,7 +29,7 @@ interface EntityVersioning<ID, NUMBER> {
class UuidEntityVersioning(
override var versionNumber: Int? = null,
versionId: UUID? = null
) : EntityVersioning<UUID, Int?> {
) : EntityVersioning<UUID, Int> {
override var versionId: UUID = versionId ?: UUID.randomUUID()
}
@@ -133,5 +133,5 @@ abstract class UuidEntityExtended<T, UserT : EntityI>(
publishedBy: UserT?
) :
EntityImp<T, UserT>(updatedBy),
EntityVersioning<UUID, Int?> by UuidEntityVersioning(),
EntityVersioning<UUID, Int> by UuidEntityVersioning(),
Published<UserT> by EntityPublishedImp(publishedBy)