Browse Source

code style

miemie 2 years ago
parent
commit
0149ed07ca

+ 0 - 11
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/LambdaQueryWrapper.java

@@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -74,17 +73,7 @@ public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryW
         this.sqlFirst = sqlFirst;
     }
 
-    /**
-     * SELECT 部分 SQL 设置
-     *
-     * @param columns 查询字段
-     */
-    @SafeVarargs
     @Override
-    public final LambdaQueryWrapper<T> select(SFunction<T, ?>... columns) {
-        return select(Arrays.asList(columns));
-    }
-
     public LambdaQueryWrapper<T> select(List<SFunction<T, ?>> columns) {
         if (CollectionUtils.isNotEmpty(columns)) {
             this.sqlSelect.setStringValue(columnsToString(false, columns));

+ 10 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/Query.java

@@ -18,6 +18,8 @@ package com.baomidou.mybatisplus.core.conditions.query;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 
 import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Predicate;
 
 /**
@@ -30,7 +32,14 @@ public interface Query<Children, T, R> extends Serializable {
      * ignore
      */
     @SuppressWarnings("unchecked")
-    Children select(R... columns);
+    default Children select(R... columns) {
+        return select(Arrays.asList(columns));
+    }
+
+    /**
+     * ignore
+     */
+    Children select(List<R> columns);
 
     /**
      * ignore

+ 0 - 6
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.java

@@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -80,11 +79,6 @@ public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
     }
 
     @Override
-    @SafeVarargs
-    public final QueryWrapper<T> select(String... columns) {
-        return select(Arrays.asList(columns));
-    }
-
     public QueryWrapper<T> select(List<String> columns) {
         if (CollectionUtils.isNotEmpty(columns)) {
             this.sqlSelect.setStringValue(String.join(StringPool.COMMA, columns));

+ 2 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/query/LambdaQueryChainWrapper.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.conditions.AbstractChainWrapper;
 
+import java.util.List;
 import java.util.function.Predicate;
 
 /**
@@ -59,9 +60,8 @@ public class LambdaQueryChainWrapper<T> extends AbstractChainWrapper<T, SFunctio
         super.wrapperChildren = new LambdaQueryWrapper<>(entityClass);
     }
 
-    @SafeVarargs
     @Override
-    public final LambdaQueryChainWrapper<T> select(SFunction<T, ?>... columns) {
+    public LambdaQueryChainWrapper<T> select(List<SFunction<T, ?>> columns) {
         wrapperChildren.select(columns);
         return typedThis;
     }

+ 4 - 3
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/query/QueryChainWrapper.java

@@ -15,8 +15,6 @@
  */
 package com.baomidou.mybatisplus.extension.conditions.query;
 
-import java.util.function.Predicate;
-
 import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,6 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.extension.conditions.AbstractChainWrapper;
 
+import java.util.List;
+import java.util.function.Predicate;
+
 /**
  * Query Chain Wrapper
  *
@@ -52,7 +53,7 @@ public class QueryChainWrapper<T> extends AbstractChainWrapper<T, String, QueryC
     }
 
     @Override
-    public QueryChainWrapper<T> select(String... columns) {
+    public QueryChainWrapper<T> select(List<String> columns) {
         wrapperChildren.select(columns);
         return typedThis;
     }