remove id in EntityI interface & remove usless EntitiesCollections

This commit is contained in:
2019-10-02 11:16:28 +02:00
parent 6641ed78e7
commit 2a738e0595
12 changed files with 83 additions and 176 deletions

View File

@@ -17,7 +17,7 @@ class Function(val definition: Function, override val connection: Connection): E
/**
* Select One entity with list of parameters
*/
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<R>,
values: List<Any?>,
block: (QueryResult, R?) -> Unit
@@ -28,13 +28,13 @@ class Function(val definition: Function, override val connection: Connection): E
return connection.select(sql, typeReference, values, block)
}
inline fun <reified R: EntityI<*>> selectOne(
inline fun <reified R: EntityI> selectOne(
values: List<Any?> = emptyList(),
noinline block: SelectOneCallback<R> = {}
): R? =
select(object: TypeReference<R>() {}, values, block)
inline fun <reified R: EntityI<*>> selectOne(
inline fun <reified R: EntityI> selectOne(
value: R,
noinline block: SelectOneCallback<R> = {}
): R? =
@@ -43,7 +43,7 @@ class Function(val definition: Function, override val connection: Connection): E
/**
* Select One entity with named parameters
*/
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<R>,
values: Map<String, Any?>,
block: (QueryResult, R?) -> Unit
@@ -54,13 +54,13 @@ class Function(val definition: Function, override val connection: Connection): E
return connection.select(sql, typeReference, values, block)
}
inline fun <reified R: EntityI<*>> selectOne(
inline fun <reified R: EntityI> selectOne(
values: Map<String, Any?>,
noinline block: SelectOneCallback<R> = {}
): R? =
select(object: TypeReference<R>() {}, values, block)
inline fun <reified R: EntityI<*>> selectOne(
inline fun <reified R: EntityI> selectOne(
vararg values: Pair<String, Any?>,
noinline block: SelectOneCallback<R> = {}
): R? =
@@ -71,7 +71,7 @@ class Function(val definition: Function, override val connection: Connection): E
/**
* Select list of entities with list of parameters
*/
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<List<R>>,
values: List<Any?>,
block: (QueryResult, List<R>) -> Unit
@@ -82,7 +82,7 @@ class Function(val definition: Function, override val connection: Connection): E
return connection.select(sql, typeReference, values, block)
}
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
values: List<Any?> = emptyList(),
noinline block: SelectCallback<R> = {}
): List<R> =
@@ -91,7 +91,7 @@ class Function(val definition: Function, override val connection: Connection): E
/**
* Select list of entities with named parameters
*/
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
typeReference: TypeReference<List<R>>,
values: Map<String, Any?>,
block: (QueryResult, List<R>) -> Unit
@@ -102,13 +102,13 @@ class Function(val definition: Function, override val connection: Connection): E
return connection.select(sql, typeReference, values, block)
}
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
values: Map<String, Any?>,
noinline block: SelectCallback<R> = {}
): List<R> =
select(object: TypeReference<List<R>>() {}, values, block)
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
vararg values: Pair<String, Any?>,
noinline block: SelectCallback<R> = {}
): List<R> =
@@ -119,7 +119,7 @@ class Function(val definition: Function, override val connection: Connection): E
/**
* Select Multiple with pagination
*/
override fun <R: EntityI<*>> select(
override fun <R: EntityI> select(
page: Int,
limit: Int,
typeReference: TypeReference<List<R>>,
@@ -137,7 +137,7 @@ class Function(val definition: Function, override val connection: Connection): E
return connection.select(sql, page, limit, typeReference, values, block)
}
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
page: Int,
limit: Int,
values: Map<String, Any?> = emptyMap(),
@@ -145,7 +145,7 @@ class Function(val definition: Function, override val connection: Connection): E
): Paginated<R> =
select(page, limit, object: TypeReference<List<R>>() {}, values, block)
inline fun <reified R: EntityI<*>> select(
inline fun <reified R: EntityI> select(
page: Int,
limit: Int,
vararg values: Pair<String, Any?>,