Fix Generate UUID if null is defined as ID

src/main/kotlin/fr/postgresjson/entity/immutable/ImmutableEntity.kt

@@ -17,7 +17,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,9 +26,11 @@ 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 {

src/main/kotlin/fr/postgresjson/entity/mutable/MutableEntity.kt

@@ -17,7 +17,7 @@ interface IdEntityI : EntityRefI<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 UuidEntity(id: UUID? = null) : UuidEntityI, Entity<UUID>(id ?: UUID.randomUUID())
 open class IdEntity(override var id: Int? = null) : IdEntityI, Entity<Int>(id)
 
 /* Version */
@@ -28,8 +28,10 @@ interface EntityVersioning<ID, NUMBER> {
 
 class UuidEntityVersioning(
     override var versionNumber: Int? = null,
-    override var versionId: UUID = UUID.randomUUID()
-) : EntityVersioning<UUID, Int>
+    versionId: UUID? = null
+) : EntityVersioning<UUID, Int> {
+    override var versionId: UUID = versionId ?: UUID.randomUUID()
+}
 
 /* Dates */
 interface EntityCreatedAt {