Fix Generate UUID if null is defined as ID

This commit is contained in:
flecomte committed 2020-07-10 22:43:58 +02:00
1 parent 5023f229ca
commit 8bb3b61f2d
2 files changed
+4 -4

No files matched your search

@@ -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()
}
@@ -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)