改个名

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/kotlin/AbstractLambdaWrapperKt.kt → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/kotlin/AbstractKtWrapper.kt

@@ -29,7 +29,7 @@ import kotlin.reflect.KProperty
  * @author yangyuhan
  * @since 2018-11-07
  */
-abstract class AbstractLambdaWrapperKt<T, This : AbstractLambdaWrapperKt<T, This>> : AbstractWrapper<T, KProperty<*>, This>() {
+abstract class AbstractKtWrapper<T, This : AbstractKtWrapper<T, This>> : AbstractWrapper<T, KProperty<*>, This>() {
 
     private var columnMap: Map<String, String>? = null
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/kotlin/LambdaQueryWrapperkt.kt → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/kotlin/KtQueryWrapper.kt

@@ -29,7 +29,7 @@ import kotlin.reflect.KProperty
  * @author yangyuhan
  * @since 2018-11-02
  */
-class LambdaQueryWrapperkt<T : Any> : AbstractLambdaWrapperKt<T, LambdaQueryWrapperkt<T>> {
+class KtQueryWrapper<T : Any> : AbstractKtWrapper<T, KtQueryWrapper<T>> {
 
     /**
      * 查询字段
@@ -58,14 +58,14 @@ class LambdaQueryWrapperkt<T : Any> : AbstractLambdaWrapperKt<T, LambdaQueryWrap
      * @param columns 查询字段
      */
     @SafeVarargs
-    fun select(vararg columns: KProperty<*>): LambdaQueryWrapperkt<T> {
+    fun select(vararg columns: KProperty<*>): KtQueryWrapper<T> {
         if (ArrayUtils.isNotEmpty(columns)) {
             this.sqlSelect = this.columnsToString(*columns)
         }
         return typedThis
     }
 
-    fun select(predicate: Predicate<TableFieldInfo>): LambdaQueryWrapperkt<T> {
+    fun select(predicate: Predicate<TableFieldInfo>): KtQueryWrapper<T> {
         return select(entityClass, predicate)
     }
 
@@ -82,7 +82,7 @@ class LambdaQueryWrapperkt<T : Any> : AbstractLambdaWrapperKt<T, LambdaQueryWrap
      * @param predicate 过滤方式
      * @return this
      */
-    fun select(entityClass: Class<T>, predicate: Predicate<TableFieldInfo>): LambdaQueryWrapperkt<T> {
+    fun select(entityClass: Class<T>, predicate: Predicate<TableFieldInfo>): KtQueryWrapper<T> {
         this.entityClass = entityClass
         this.sqlSelect = TableInfoHelper.getTableInfo(checkEntityClass).chooseSelect(predicate)
         return typedThis
@@ -96,7 +96,7 @@ class LambdaQueryWrapperkt<T : Any> : AbstractLambdaWrapperKt<T, LambdaQueryWrap
      * 用于生成嵌套 sql
      * 故 sqlSelect 不向下传递
      */
-    override fun instance(paramNameSeq: AtomicInteger, paramNameValuePairs: Map<String, Any>): LambdaQueryWrapperkt<T> {
-        return LambdaQueryWrapperkt(entity, entityClass, null, paramNameSeq, paramNameValuePairs, MergeSegments())
+    override fun instance(paramNameSeq: AtomicInteger, paramNameValuePairs: Map<String, Any>): KtQueryWrapper<T> {
+        return KtQueryWrapper(entity, entityClass, null, paramNameSeq, paramNameValuePairs, MergeSegments())
     }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/kotlin/LambdaUpdateWrapperKt.kt → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/kotlin/KtUpdateWrapper.kt

@@ -30,7 +30,7 @@ import kotlin.reflect.KProperty
  * @author yangyuhan
  * @since 2018-11-02
  */
-class LambdaUpdateWrapperKt<T : Any> : AbstractLambdaWrapperKt<T, LambdaUpdateWrapperKt<T>> {
+class KtUpdateWrapper<T : Any> : AbstractKtWrapper<T, KtUpdateWrapper<T>> {
 
     /**
      * SQL 更新字段内容，例如：name='1',age=2
@@ -58,18 +58,18 @@ class LambdaUpdateWrapperKt<T : Any> : AbstractLambdaWrapperKt<T, LambdaUpdateWr
         } else SqlUtils.stripSqlInjection(sqlSet.stream().collect(joining(StringPool.COMMA)))
     }
 
-    operator fun set(column: KProperty<*>, `val`: Any): LambdaUpdateWrapperKt<T> {
+    operator fun set(column: KProperty<*>, `val`: Any): KtUpdateWrapper<T> {
         return this.set(true, column, `val`)
     }
 
-    operator fun set(condition: Boolean, column: KProperty<*>, `val`: Any): LambdaUpdateWrapperKt<T> {
+    operator fun set(condition: Boolean, column: KProperty<*>, `val`: Any): KtUpdateWrapper<T> {
         if (condition) {
             sqlSet.add(String.format("%s=%s", columnToString(column), formatSql("{0}", `val`)))
         }
         return typedThis
     }
 
-    override fun instance(paramNameSeq: AtomicInteger, paramNameValuePairs: Map<String, Any>): LambdaUpdateWrapperKt<T> {
-        return LambdaUpdateWrapperKt(entity, paramNameSeq, paramNameValuePairs, MergeSegments())
+    override fun instance(paramNameSeq: AtomicInteger, paramNameValuePairs: Map<String, Any>): KtUpdateWrapper<T> {
+        return KtUpdateWrapper(entity, paramNameSeq, paramNameValuePairs, MergeSegments())
     }
 }

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/kotlin/WrapperTest.kt

@@ -29,14 +29,14 @@ class WrapperTest {
     @Test
     fun testLambdaQuery() {
         TableInfoHelper.initTableInfo(null, User::class.java)
-        val queryWrapper = LambdaQueryWrapperkt(User()).eq(User::name, "sss").eq(User::roleId, "sss2")
+        val queryWrapper = KtQueryWrapper(User()).eq(User::name, "sss").eq(User::roleId, "sss2")
         logSqlSegment("测试 LambdaKt", queryWrapper)
     }
 
     @Test
     fun testLambdaUpdate() {
         TableInfoHelper.initTableInfo(null, User::class.java)
-        val updateWrapperKt = LambdaUpdateWrapperKt(User()).eq(User::name, "sss").eq(User::roleId, "sss2")
+        val updateWrapperKt = KtUpdateWrapper(User()).eq(User::name, "sss").eq(User::roleId, "sss2")
         logSqlSegment("测试 LambdaKt", updateWrapperKt)
     }
 }