From 528f2b6daa7652257c875b6d1c1f9720e91b7e48 Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Thu, 1 Aug 2019 01:36:08 +0200
Subject: [PATCH] feature: remove User interface

---
 .../kotlin/fr/postgresjson/entity/Entity.kt    | 18 ++++++++----------
 src/test/kotlin/fr/postgresjson/EntityTest.kt  |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/kotlin/fr/postgresjson/entity/Entity.kt b/src/main/kotlin/fr/postgresjson/entity/Entity.kt
index 83778d3..f788517 100644
--- a/src/main/kotlin/fr/postgresjson/entity/Entity.kt
+++ b/src/main/kotlin/fr/postgresjson/entity/Entity.kt
@@ -47,45 +47,43 @@ class EntityCreatedAtImp: EntityCreatedAt {
 class EntityUpdatedAtImp: EntityUpdatedAt {
     override var updatedAt: DateTime? = null
 }
-interface User<T>: EntityI<T> {
-}
 
 /* Author */
-interface CreatedBy<T: User<*>> {
+interface CreatedBy<T: EntityI<*>> {
     var createdBy: T?
 }
 
-interface UpdatedBy<T: User<*>> {
+interface UpdatedBy<T: EntityI<*>> {
     var updatedBy: T?
 }
 
-class EntityCreatedByImp<UserT: User<*>>: CreatedBy<UserT> {
+class EntityCreatedByImp<UserT: EntityI<*>>: CreatedBy<UserT> {
     override var createdBy: UserT? = null
 }
 
-class EntityUpdatedByImp<UserT: User<*>>: UpdatedBy<UserT> {
+class EntityUpdatedByImp<UserT: EntityI<*>>: UpdatedBy<UserT> {
     override var updatedBy: UserT? = null
 }
 
 /* Published */
-interface Published<UserT: User<*>> {
+interface Published<UserT: EntityI<*>> {
     var publishedAt: DateTime?
     var publishedBy: UserT?
 }
 
-class EntityPublishedImp<UserT: User<*>>: Published<UserT> {
+class EntityPublishedImp<UserT: EntityI<*>>: Published<UserT> {
     override var publishedAt: DateTime? = null
     override var publishedBy: UserT? = null
 }
 
 /* Implementation */
-abstract class EntityImp<T, UserT: User<*>>: Entity<T>(),
+abstract class EntityImp<T, UserT: EntityI<*>>: Entity<T>(),
     EntityCreatedAt by EntityCreatedAtImp(),
     EntityUpdatedAt by EntityUpdatedAtImp(),
     CreatedBy<UserT> by EntityCreatedByImp(),
     UpdatedBy<UserT> by EntityUpdatedByImp()
 
-abstract class EntityExtended<T, UserT: User<*>>:
+abstract class EntityExtended<T, UserT: EntityI<*>>:
     EntityImp<T, UserT>(),
     EntityVersioningIncrement by EntityVersioningIncrementImp(),
     Published<UserT> by EntityPublishedImp()
diff --git a/src/test/kotlin/fr/postgresjson/EntityTest.kt b/src/test/kotlin/fr/postgresjson/EntityTest.kt
index 8e0840f..441873e 100644
--- a/src/test/kotlin/fr/postgresjson/EntityTest.kt
+++ b/src/test/kotlin/fr/postgresjson/EntityTest.kt
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.TestInstance
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class EntityTest() {
-    private class User(override var id: Int?): fr.postgresjson.entity.User<Int?>
+    private class User(override var id: Int?): EntityI<Int?>
     private class ObjTest(var name: String): EntityExtended<Int?, User>()
 
     @Test