Add a utility interface and more idiomatic Kotlin

jeffgbutler · jeffgbutler · commit 2c477e2ca067 · 2019-11-12T17:48:41.000-05:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java
@@ -18,7 +18,6 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.ToIntFunction;
-import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlCriterion;
@@ -28,6 +27,7 @@
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
+import org.mybatis.dynamic.sql.where.WhereApplier;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class DeleteDSL<R> implements Buildable<R> {
@@ -52,8 +52,8 @@ public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition
     }
 
     @SuppressWarnings("unchecked")
-    public DeleteWhereBuilder applyWhere(UnaryOperator<AbstractWhereDSL<?>> whereApplyer) {
-        return (DeleteWhereBuilder) whereApplyer.apply(whereBuilder);
+    public DeleteWhereBuilder applyWhere(WhereApplier whereApplier) {
+        return (DeleteWhereBuilder) whereApplier.apply(whereBuilder);
     }
 
     /**
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java
@@ -17,7 +17,6 @@
 
 import java.util.Objects;
 import java.util.function.Function;
-import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlBuilder;
@@ -26,6 +25,7 @@
 import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
+import org.mybatis.dynamic.sql.where.WhereApplier;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 /**
@@ -58,8 +58,8 @@ public <T> CountWhereBuilder where(BindableColumn<T> column, VisitableCondition<
     }
 
     @SuppressWarnings("unchecked")
-    public CountWhereBuilder applyWhere(UnaryOperator<AbstractWhereDSL<?>> whereApplyer) {
-        return (CountWhereBuilder) whereApplyer.apply(whereBuilder);
+    public CountWhereBuilder applyWhere(WhereApplier whereApplier) {
+        return (CountWhereBuilder) whereApplier.apply(whereBuilder);
     }
 
     @Override
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
@@ -20,7 +20,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
@@ -34,6 +33,7 @@
 import org.mybatis.dynamic.sql.select.join.JoinType;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
+import org.mybatis.dynamic.sql.where.WhereApplier;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class QueryExpressionDSL<R> extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>, R>
@@ -70,8 +70,8 @@ public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, Visitable
     }
 
     @SuppressWarnings("unchecked")
-    public QueryExpressionWhereBuilder applyWhere(UnaryOperator<AbstractWhereDSL<?>> whereApplyer) {
-        return (QueryExpressionWhereBuilder) whereApplyer.apply(whereBuilder);
+    public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
+        return (QueryExpressionWhereBuilder) whereApplier.apply(whereBuilder);
     }
 
     @Override
@@ -334,8 +334,8 @@ public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, Visitable
             return QueryExpressionDSL.this.where(column, condition, subCriteria);
         }
 
-        public QueryExpressionWhereBuilder applyWhere(UnaryOperator<AbstractWhereDSL<?>> whereApplyer) {
-            return QueryExpressionDSL.this.applyWhere(whereApplyer);
+        public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
+            return QueryExpressionDSL.this.applyWhere(whereApplier);
         }
         
         public JoinSpecificationFinisher and(BasicColumn joinColumn, JoinCondition joinCondition) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java
@@ -21,7 +21,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.ToIntFunction;
-import java.util.function.UnaryOperator;
 
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.BindableColumn;
@@ -41,6 +40,7 @@
 import org.mybatis.dynamic.sql.util.ValueMapping;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
+import org.mybatis.dynamic.sql.where.WhereApplier;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class UpdateDSL<R> implements Buildable<R> {
@@ -70,8 +70,8 @@ public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition
     }
 
     @SuppressWarnings("unchecked")
-    public UpdateWhereBuilder applyWhere(UnaryOperator<AbstractWhereDSL<?>> whereApplyer) {
-        return (UpdateWhereBuilder) whereApplyer.apply(whereBuilder);
+    public UpdateWhereBuilder applyWhere(WhereApplier whereApplier) {
+        return (UpdateWhereBuilder) whereApplier.apply(whereBuilder);
     }
 
     /**
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereApplier.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereApplier.java
@@ -0,0 +1,21 @@
+/**
+ *    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.where;
+
+import java.util.function.UnaryOperator;
+
+@FunctionalInterface
+public interface WhereApplier extends UnaryOperator<AbstractWhereDSL<?>> {}
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractWhereDSLExtensions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractWhereDSLExtensions.kt
@@ -19,6 +19,8 @@ import org.mybatis.dynamic.sql.BindableColumn
 import org.mybatis.dynamic.sql.VisitableCondition
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 
+typealias WhereApplier = AbstractWhereDSL<*>.() -> AbstractWhereDSL<*>
+
 fun <T, M : AbstractWhereDSL<M>> AbstractWhereDSL<M>.where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): M {
     val collector = CriteriaCollector()
     collect(collector)
diff --git a/src/test/java/examples/simple/ReusableWhereTest.java b/src/test/java/examples/simple/ReusableWhereTest.java
@@ -37,7 +37,7 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
+import org.mybatis.dynamic.sql.where.WhereApplier;
 
 public class ReusableWhereTest {
 
@@ -69,7 +69,7 @@ public void testCount() {
         try (SqlSession session = sqlSessionFactory.openSession()) {
             PersonMapper mapper = session.getMapper(PersonMapper.class);
 
-            long rows = mapper.count(c -> c.applyWhere(this::commonWhere));
+            long rows = mapper.count(c -> c.applyWhere(commonWhere));
 
             assertThat(rows).isEqualTo(3);
         }
@@ -80,7 +80,7 @@ public void testDelete() {
         try (SqlSession session = sqlSessionFactory.openSession()) {
             PersonMapper mapper = session.getMapper(PersonMapper.class);
 
-            int rows = mapper.delete(c -> c.applyWhere(this::commonWhere));
+            int rows = mapper.delete(c -> c.applyWhere(commonWhere));
 
             assertThat(rows).isEqualTo(3);
         }
@@ -92,7 +92,7 @@ public void testSelect() {
             PersonMapper mapper = session.getMapper(PersonMapper.class);
 
             List<PersonRecord> rows = mapper.select(c ->
-                c.applyWhere(this::commonWhere)
+                c.applyWhere(commonWhere)
                 .orderBy(id));
 
             assertThat(rows.size()).isEqualTo(3);
@@ -106,13 +106,11 @@ public void testUpdate() {
 
             int rows = mapper.update(c ->
                 c.set(occupation).equalToStringConstant("worker")
-                .applyWhere(this::commonWhere));
+                .applyWhere(commonWhere));
 
             assertThat(rows).isEqualTo(3);
         }
     }
 
-    private AbstractWhereDSL<?> commonWhere(AbstractWhereDSL<?> dsl) {
-        return dsl.where(id, isEqualTo(1)).or(occupation, isNull());
-    }
+    private WhereApplier commonWhere =  d -> d.where(id, isEqualTo(1)).or(occupation, isNull());
 }
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/ReusableWhereTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/ReusableWhereTest.kt
@@ -28,7 +28,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.mybatis.dynamic.sql.SqlBuilder.isEqualTo
 import org.mybatis.dynamic.sql.SqlBuilder.isNull
-import org.mybatis.dynamic.sql.where.AbstractWhereDSL
+import org.mybatis.dynamic.sql.util.kotlin.WhereApplier
 import java.io.InputStreamReader
 import java.sql.DriverManager
 
@@ -57,7 +57,7 @@ class ReusableWhereTest {
             val mapper = session.getMapper(PersonMapper::class.java)
 
             val rows = mapper.count {
-                applyWhere (::commonWhere)
+                applyWhere (commonWhere)
             }
 
             assertThat(rows).isEqualTo(3)
@@ -70,7 +70,7 @@ class ReusableWhereTest {
             val mapper = session.getMapper(PersonMapper::class.java)
 
             val rows = mapper.delete {
-                applyWhere (::commonWhere)
+                applyWhere (commonWhere)
             }
 
             assertThat(rows).isEqualTo(3)
@@ -83,7 +83,7 @@ class ReusableWhereTest {
             val mapper = session.getMapper(PersonMapper::class.java)
 
             val rows = mapper.select {
-                applyWhere (::commonWhere)
+                applyWhere (commonWhere)
                 orderBy(id)
             }
 
@@ -98,15 +98,16 @@ class ReusableWhereTest {
 
             val rows = mapper.update {
                 set(occupation).equalToStringConstant("worker")
-                applyWhere (::commonWhere)
+                applyWhere (commonWhere)
             }
 
             assertThat(rows).isEqualTo(3)
         }
     }
 
-    private fun commonWhere(dsl: AbstractWhereDSL<*>): AbstractWhereDSL<*> =
-            dsl.where(id, isEqualTo(1)).or(occupation, isNull());
+    private val commonWhere: WhereApplier = {
+        where(id, isEqualTo(1)).or(occupation, isNull<String>())
+    }
 
     companion object {
         const val JDBC_URL = "jdbc:hsqldb:mem:aname"
