update postgresjson

This commit is contained in:
2019-08-27 12:33:32 +02:00
parent 67665350eb
commit ff76bd55ef
29 changed files with 139 additions and 119 deletions

View File

@@ -15,4 +15,4 @@ class Article(
UuidEntity(id),
EntityVersioning<UUID, Int> by UuidEntityVersioning(),
EntityCreatedAt by EntityCreatedAtImp(),
CreatedBy<Citizen> by EntityCreatedByImp(createdBy)
EntityCreatedBy<Citizen> by EntityCreatedByImp(createdBy)

View File

@@ -12,7 +12,7 @@ class Constitution(
): UuidEntity(id),
EntityVersioning<UUID, Int> by UuidEntityVersioning(),
EntityCreatedAt by EntityCreatedAtImp(),
CreatedBy<Citizen> by EntityCreatedByImp(createdBy) {
EntityCreatedBy<Citizen> by EntityCreatedByImp(createdBy) {
init{
titles.forEachIndexed { index, title ->
@@ -28,5 +28,5 @@ class Constitution(
createdBy: Citizen? = null
): UuidEntity(id),
EntityCreatedAt by EntityCreatedAtImp(),
CreatedBy<Citizen> by EntityCreatedByImp(createdBy)
EntityCreatedBy<Citizen> by EntityCreatedByImp(createdBy)
}

View File

@@ -1,22 +1,20 @@
package fr.dcproject.entity
import fr.postgresjson.entity.EntityCreatedAt
import fr.postgresjson.entity.EntityCreatedAtImp
import fr.postgresjson.entity.EntityI
import fr.postgresjson.entity.UuidEntity
import fr.postgresjson.entity.*
import java.util.*
interface ExtraI <T: EntityI<UUID>>:
EntityI<UUID>,
EntityCreatedAt {
var citizen: Citizen
EntityCreatedAt,
EntityCreatedBy<Citizen>{
var target: T
}
abstract class Extra<T: EntityI<UUID>>(
id: UUID? = UUID.randomUUID(),
override var citizen: Citizen
createdBy: Citizen
):
ExtraI<T>,
UuidEntity(id),
EntityCreatedAt by EntityCreatedAtImp()
EntityCreatedAt by EntityCreatedAtImp(),
EntityCreatedBy<Citizen> by EntityCreatedByImp(createdBy)

View File

@@ -4,6 +4,6 @@ import java.util.*
class Follow <T: UuidEntity> (
id: UUID = UUID.randomUUID(),
citizen: Citizen,
createdBy: Citizen,
override var target: T
): Extra<T>(id, citizen)
): Extra<T>(id, createdBy)