Better usage of Kotlin self type

jeffgbutler · jeffgbutler · commit eb4ab2c07f82 · 2019-11-23T14:13:33.000-05:00
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt
@@ -24,85 +24,90 @@ import org.mybatis.dynamic.sql.util.Buildable
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 
 abstract class KotlinBaseBuilder<M, W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<M, W, B>> : Buildable<M> {
-    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>): B {
-        getWhere().where(column, condition)
-        return getThis()
-    }
-
-    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B {
-        getWhere().where(column, condition, collect)
-        return getThis()
-    }
-
-    fun applyWhere(whereApplier: WhereApplier): B {
-        getWhere().applyWhere(whereApplier)
-        return getThis()
-    }
-
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>): B {
-        getWhere().and(column, condition)
-        return getThis()
-    }
-
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B {
-        getWhere().and(column, condition, collect)
-        return getThis()
-    }
-
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>): B {
-        getWhere().or(column, condition)
-        return getThis()
-    }
-
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B {
-        getWhere().or(column, condition, collect)
-        return getThis()
-    }
+    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
+        applySelf {
+            getWhere().where(column, condition)
+        }
+
+    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B =
+        applySelf {
+            getWhere().where(column, condition, collect)
+        }
+
+    fun applyWhere(whereApplier: WhereApplier): B =
+        applySelf {
+            getWhere().applyWhere(whereApplier)
+        }
+
+    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
+        applySelf {
+            getWhere().and(column, condition)
+        }
+
+    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B =
+        applySelf {
+            getWhere().and(column, condition, collect)
+        }
+
+    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
+        applySelf {
+            getWhere().or(column, condition)
+        }
+
+    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B =
+        applySelf {
+            getWhere().or(column, condition, collect)
+        }
+
+    protected fun applySelf(block: B.() -> Unit): B =
+        self().apply { block() }
+
+    protected abstract fun self(): B
 
     protected abstract fun getWhere(): W
-    protected abstract fun getThis(): B
 }
 
-abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, SelectModel>, W: AbstractWhereDSL<W>, B : KotlinBaseJoiningBuilder<T, W, B>>(private val dsl: AbstractQueryExpressionDSL<T, SelectModel>) :
-    KotlinBaseBuilder<SelectModel, W, B>() {
-
-    fun join(table: SqlTable, receiver: JoinReceiver) =
-            apply {
-                dsl.join(table, receiver)
-            }
-
-    fun join(table: SqlTable, alias: String, receiver: JoinReceiver) =
-            apply {
-                dsl.join(table, alias, receiver)
-            }
-
-    fun fullJoin(table: SqlTable, receiver: JoinReceiver) =
-            apply {
-                dsl.fullJoin(table, receiver)
-            }
-
-    fun fullJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
-            apply {
-                dsl.fullJoin(table, alias, receiver)
-            }
-
-    fun leftJoin(table: SqlTable, receiver: JoinReceiver) =
-            apply {
-                dsl.leftJoin(table, receiver)
-            }
-
-    fun leftJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
-            apply {
-                dsl.leftJoin(table, alias, receiver)
-            }
-
-    fun rightJoin(table: SqlTable, receiver: JoinReceiver) =
-            apply {
-                dsl.rightJoin(table, receiver)
-            }
-
-    fun rightJoin(table: SqlTable, alias: String, receiver: JoinReceiver) =
-            apply {
-                dsl.rightJoin(table, alias, receiver)
-            }
+abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, SelectModel>, W : AbstractWhereDSL<W>, B : KotlinBaseJoiningBuilder<T, W, B>>(
+    private val dsl: AbstractQueryExpressionDSL<T, SelectModel>
+) : KotlinBaseBuilder<SelectModel, W, B>() {
+
+    fun join(table: SqlTable, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.join(table, receiver)
+        }
+
+    fun join(table: SqlTable, alias: String, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.join(table, alias, receiver)
+        }
+
+    fun fullJoin(table: SqlTable, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.fullJoin(table, receiver)
+        }
+
+    fun fullJoin(table: SqlTable, alias: String, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.fullJoin(table, alias, receiver)
+        }
+
+    fun leftJoin(table: SqlTable, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.leftJoin(table, receiver)
+        }
+
+    fun leftJoin(table: SqlTable, alias: String, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.leftJoin(table, alias, receiver)
+        }
+
+    fun rightJoin(table: SqlTable, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.rightJoin(table, receiver)
+        }
+
+    fun rightJoin(table: SqlTable, alias: String, receiver: JoinReceiver): B =
+        applySelf {
+            dsl.rightJoin(table, alias, receiver)
+        }
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinCountBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinCountBuilder.kt
@@ -30,5 +30,5 @@ class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>) :
 
     override fun getWhere(): CountDSL<SelectModel>.CountWhereBuilder = dsl.where()
 
-    override fun getThis() = this
+    override fun self() = this
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinDeleteBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinDeleteBuilder.kt
@@ -30,5 +30,5 @@ class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
 
     override fun getWhere(): DeleteDSL<DeleteModel>.DeleteWhereBuilder = dsl.where()
 
-    override fun getThis(): KotlinDeleteBuilder = this
+    override fun self() = this
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinQueryBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinQueryBuilder.kt
@@ -54,5 +54,5 @@ class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>) :
 
     override fun getWhere(): QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder = dsl.where()
 
-    override fun getThis() = this
+    override fun self() = this
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt
@@ -38,5 +38,5 @@ class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) :
 
     override fun getWhere(): UpdateDSL<UpdateModel>.UpdateWhereBuilder = dsl.where()
 
-    override fun getThis(): KotlinUpdateBuilder = this
+    override fun self() = this
 }

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>) :`
`30`	`30`
`31`	`31`	`override fun getWhere(): CountDSL<SelectModel>.CountWhereBuilder = dsl.where()`
`32`	`32`
`33`		`- override fun getThis() = this`
	`33`	`+ override fun self() = this`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :`
`30`	`30`
`31`	`31`	`override fun getWhere(): DeleteDSL<DeleteModel>.DeleteWhereBuilder = dsl.where()`
`32`	`32`
`33`		`- override fun getThis(): KotlinDeleteBuilder = this`
	`33`	`+ override fun self() = this`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,5 @@ class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>) :`
`54`	`54`
`55`	`55`	`override fun getWhere(): QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder = dsl.where()`
`56`	`56`
`57`		`- override fun getThis() = this`
	`57`	`+ override fun self() = this`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,5 @@ class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) :`
`38`	`38`
`39`	`39`	`override fun getWhere(): UpdateDSL<UpdateModel>.UpdateWhereBuilder = dsl.where()`
`40`	`40`
`41`		`- override fun getThis(): KotlinUpdateBuilder = this`
	`41`	`+ override fun self() = this`
`42`	`42`	`}`