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

rename interface UpdatedBy to EntityUpdatedBy

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-08-27 22:57:49 +02:00
parent 65d8e00902
commit 215c054f27
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/fr/postgresjson/connexion/Function.kt
View File

@@ -195,11 +195,11 @@ class Function(val definition: Function, override val connection: Connection): E
val parameters = definition.getParametersIndexedByName() val parameters = definition.getParametersIndexedByName()
val placeholders = values val placeholders = values
.filter { entry -> .filter { entry ->
val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} not exist") val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} of function ${definition.name} not exist")
parameter.default === null || entry.value !== null parameter.default === null || entry.value !== null
} }
.map { entry -> .map { entry ->
val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} not exist") val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} of function ${definition.name} not exist")
""""${parameter.name}" := :${parameter.name}::${parameter.type}""" """"${parameter.name}" := :${parameter.name}::${parameter.type}"""
} }

12
src/main/kotlin/fr/postgresjson/entity/Entity.kt
View File

@@ -45,21 +45,21 @@ class EntityUpdatedAtImp: EntityUpdatedAt {
} }
/* Author */ /* Author */
interface CreatedBy<T: EntityI<*>> { interface EntityCreatedBy<T: EntityI<*>> {
var createdBy: T? var createdBy: T?
} }
interface UpdatedBy<T: EntityI<*>> { interface EntityUpdatedBy<T: EntityI<*>> {
var updatedBy: T? var updatedBy: T?
} }
class EntityCreatedByImp<UserT: EntityI<*>>( class EntityCreatedByImp<UserT: EntityI<*>>(
override var createdBy: UserT? override var createdBy: UserT?
): CreatedBy<UserT> ): EntityCreatedBy<UserT>
class EntityUpdatedByImp<UserT: EntityI<*>>( class EntityUpdatedByImp<UserT: EntityI<*>>(
override var updatedBy: UserT? override var updatedBy: UserT?
): UpdatedBy<UserT> ): EntityUpdatedBy<UserT>
/* Published */ /* Published */
interface Published<UserT: EntityI<*>> { interface Published<UserT: EntityI<*>> {
@@ -79,8 +79,8 @@ abstract class EntityImp<T, UserT: EntityI<*>>(
): Entity<T>(), ): Entity<T>(),
EntityCreatedAt by EntityCreatedAtImp(), EntityCreatedAt by EntityCreatedAtImp(),
EntityUpdatedAt by EntityUpdatedAtImp(), EntityUpdatedAt by EntityUpdatedAtImp(),
CreatedBy<UserT> by EntityCreatedByImp(updatedBy), EntityCreatedBy<UserT> by EntityCreatedByImp(updatedBy),
UpdatedBy<UserT> by EntityUpdatedByImp(updatedBy) EntityUpdatedBy<UserT> by EntityUpdatedByImp(updatedBy)
abstract class UuidEntityExtended<T, UserT: EntityI<*>>( abstract class UuidEntityExtended<T, UserT: EntityI<*>>(
updatedBy: UserT?, updatedBy: UserT?,

4
src/test/kotlin/fr/postgresjson/EntityTest.kt
View File

@@ -18,8 +18,8 @@ class EntityTest() {
assertTrue(obj is EntityI<Int?>) assertTrue(obj is EntityI<Int?>)
assertTrue(obj is Entity<Int?>) assertTrue(obj is Entity<Int?>)
assertTrue(obj is Published<User>) assertTrue(obj is Published<User>)
assertTrue(obj is CreatedBy<User>) assertTrue(obj is EntityCreatedBy<User>)
assertTrue(obj is UpdatedBy<User>) assertTrue(obj is EntityUpdatedBy<User>)
assertTrue(obj is EntityCreatedAt) assertTrue(obj is EntityCreatedAt)
assertTrue(obj is EntityUpdatedAt) assertTrue(obj is EntityUpdatedAt)
} }