Improve Kotlin Support

CHANGELOG.md

@@ -9,7 +9,7 @@ GitHub milestone: [https://github.com/mybatis/mybatis-dynamic-sql/issues?q=miles
 ### Added
 
 - Added support for reusing WHERE clauses among count, delete, select, and update statements ([#152](https://github.com/mybatis/mybatis-dynamic-sql/pull/152))
-
+- Improved Kotlin support. Previously, several overloaded methods could collide causing queries to be fragile and very dependent on having the correct imports in a Kotlin file. With this improved support there is no longer any ambiguity. ([#154](https://github.com/mybatis/mybatis-dynamic-sql/pull/154))
 
 ### Bugs Fixed
 

pom.xml

@@ -43,6 +43,7 @@
     <sonar.sources>pom.xml,src/main/java,src/main/kotlin</sonar.sources>
     <sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
     <jacoco.version>0.8.4</jacoco.version>
+    <kotlin.code.style>official</kotlin.code.style>
   </properties>
 
   <build>

src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java

@@ -51,9 +51,8 @@ public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition
         return whereBuilder;
     }
 
-    @SuppressWarnings("unchecked")
     public DeleteWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return (DeleteWhereBuilder) whereApplier.apply(whereBuilder);
+        return whereBuilder.applyWhere(whereApplier);
     }
 
     /**
@@ -99,7 +98,7 @@ public class DeleteWhereBuilder extends AbstractWhereDSL<DeleteWhereBuilder> imp
         private DeleteWhereBuilder() {
             super();
         }
-        
+
         @Override
         public R build() {
             return DeleteDSL.this.build();

src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java

@@ -57,9 +57,8 @@ public <T> CountWhereBuilder where(BindableColumn<T> column, VisitableCondition<
         return whereBuilder;
     }
 
-    @SuppressWarnings("unchecked")
     public CountWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return (CountWhereBuilder) whereApplier.apply(whereBuilder);
+        return whereBuilder.applyWhere(whereApplier);
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java

@@ -69,9 +69,8 @@ public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, Visitable
         return whereBuilder;
     }
 
-    @SuppressWarnings("unchecked")
     public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return (QueryExpressionWhereBuilder) whereApplier.apply(whereBuilder);
+        return whereBuilder.applyWhere(whereApplier);
     }
 
     @Override

src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java

@@ -69,9 +69,8 @@ public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition
         return whereBuilder;
     }
 
-    @SuppressWarnings("unchecked")
     public UpdateWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return (UpdateWhereBuilder) whereApplier.apply(whereBuilder);
+        return whereBuilder.applyWhere(whereApplier);
     }
 
     /**

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java

@@ -44,7 +44,12 @@ public <S> T where(BindableColumn<S> column, VisitableCondition<S> condition, Li
         addCriterion(column, condition, subCriteria);
         return getThis();
     }
-
+
+    @SuppressWarnings("unchecked")
+    public T applyWhere(WhereApplier whereApplier) {
+        return (T) whereApplier.apply(this);
+    }
+
     public <S> T and(BindableColumn<S> column, VisitableCondition<S> condition) {
         addCriterion("and", column, condition); //$NON-NLS-1$
         return getThis();

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt

@@ -0,0 +1,108 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.util.kotlin
+
+import org.mybatis.dynamic.sql.BindableColumn
+import org.mybatis.dynamic.sql.SqlTable
+import org.mybatis.dynamic.sql.VisitableCondition
+import org.mybatis.dynamic.sql.select.AbstractQueryExpressionDSL
+import org.mybatis.dynamic.sql.select.SelectModel
+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()
+    }
+
+    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)
+            }
+}

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinCountBuilder.kt

@@ -0,0 +1,34 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.util.kotlin
+
+import org.mybatis.dynamic.sql.select.CountDSL
+import org.mybatis.dynamic.sql.select.SelectModel
+import org.mybatis.dynamic.sql.util.Buildable
+
+typealias CountCompleter = KotlinCountBuilder.() -> Buildable<SelectModel>
+
+class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>) :
+    KotlinBaseJoiningBuilder<CountDSL<SelectModel>, CountDSL<SelectModel>.CountWhereBuilder, KotlinCountBuilder>(dsl) {
+
+    fun allRows() = this
+
+    override fun  build(): SelectModel = dsl.build()
+
+    override fun getWhere(): CountDSL<SelectModel>.CountWhereBuilder = dsl.where()
+
+    override fun getThis() = this
+}

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinDeleteBuilder.kt

@@ -0,0 +1,34 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.util.kotlin
+
+import org.mybatis.dynamic.sql.delete.DeleteDSL
+import org.mybatis.dynamic.sql.delete.DeleteModel
+import org.mybatis.dynamic.sql.util.Buildable
+
+typealias DeleteCompleter = KotlinDeleteBuilder.() -> Buildable<DeleteModel>
+
+class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
+        KotlinBaseBuilder<DeleteModel, DeleteDSL<DeleteModel>.DeleteWhereBuilder, KotlinDeleteBuilder>() {
+
+    fun allRows() = this
+
+    override fun build(): DeleteModel = dsl.build()
+
+    override fun getWhere(): DeleteDSL<DeleteModel>.DeleteWhereBuilder = dsl.where()
+
+    override fun getThis(): KotlinDeleteBuilder = this
+}