格式化秋秋的代码

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

@@ -15,13 +15,6 @@
  */
 package com.baomidou.mybatisplus.core.conditions.query;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
@@ -31,6 +24,14 @@ import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.Property;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static java.util.stream.Collectors.joining;
+
 /**
  * <p>
  * Lambda 语法使用 Wrapper
@@ -56,7 +57,7 @@ public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryW
     LambdaQueryWrapper(T entity, AtomicInteger paramNameSeq, Map<String, Object> paramNameValuePairs,
                        MergeSegments mergeSegments) {
         this.entity = entity;
-        if(entity!=null){
+        if (entity != null) {
             this.entityClass = (Class<T>) entity.getClass();
         }
         this.paramNameSeq = paramNameSeq;
@@ -67,13 +68,14 @@ public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryW
     @Override
     public String getSqlSelect() {
         if (CollectionUtils.isEmpty(queryColumn)) {
-            if(entityClass!=null) {
-                queryColumn = Arrays.asList(TableInfoHelper.getTableColumns(entityClass,excludeColumn.toArray(new String[0])));
+            if (entityClass != null) {
+                queryColumn = Arrays.asList(TableInfoHelper.getTableColumns(entityClass, excludeColumn.toArray(new String[0])));
             }
-        }else{
-            return SqlUtils.stripSqlInjection(queryColumn.stream().filter($this -> !excludeColumn.contains($this)).collect(Collectors.joining(StringPool.COMMA)));
+        } else {
+            return SqlUtils.stripSqlInjection(queryColumn.stream()
+                .filter(i -> !excludeColumn.contains(i)).collect(joining(StringPool.COMMA)));
         }
-        return CollectionUtils.isEmpty(queryColumn) ? null:queryColumn.stream().collect(Collectors.joining(StringPool.COMMA));
+        return CollectionUtils.isEmpty(queryColumn) ? null : String.join(StringPool.COMMA, queryColumn);
     }
 
     /**
@@ -100,8 +102,8 @@ public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryW
      */
     @SafeVarargs
     public final LambdaQueryWrapper<T> excludeColumns(Class<T> entityClass, Property<T, ?>... excludeColumns) {
-        Assert.notNull(entityClass,"entityClass is not null");
-        Assert.notEmpty(excludeColumns,"excludeColumns is not empty");
+        Assert.notNull(entityClass, "entityClass is not null");
+        Assert.notEmpty(excludeColumns, "excludeColumns is not empty");
         this.entityClass = entityClass;
         for (Property<T, ?> column : excludeColumns) {
             excludeColumn.add(this.columnToString(column));
@@ -111,13 +113,14 @@ public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryW
 
     /**
      * 排除字段
+     *
      * @param excludeColumns 排除字段列表
      */
     @SafeVarargs
     @SuppressWarnings(value = "unchecked")
     public final LambdaQueryWrapper<T> excludeColumns(Property<T, ?>... excludeColumns) {
-        Assert.notNull(entity,"entity is not null");
-        return excludeColumns((Class<T>) entity.getClass(),excludeColumns);
+        Assert.notNull(entity, "entity is not null");
+        return excludeColumns((Class<T>) entity.getClass(), excludeColumns);
     }
 
     @Override

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

@@ -15,11 +15,6 @@
  */
 package com.baomidou.mybatisplus.core.conditions.query;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
@@ -28,6 +23,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * <p>
  * Entity 对象封装操作类
@@ -51,7 +51,7 @@ public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
 
 
     public QueryWrapper() {
-        this(null,  null);
+        this(null, null);
     }
 
     public QueryWrapper(T entity) {
@@ -76,15 +76,16 @@ public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
     @Override
     public String getSqlSelect() {
         //TODO 这里看要不要兼容下原来的sqlSelect，进行切割
-        if(ArrayUtils.isNotEmpty(sqlSelect)){
+        if (ArrayUtils.isNotEmpty(sqlSelect)) {
             List<String> excludeColumnList = Arrays.asList(excludeColumns);
-            sqlSelect = Arrays.stream(sqlSelect).filter($this->!excludeColumnList.contains($this)).toArray(String[]::new);
-        }else{
-            if(entityClass!=null){
+            sqlSelect = Arrays.stream(sqlSelect).filter(i -> !excludeColumnList.contains(i)).toArray(String[]::new);
+        } else {
+            if (entityClass != null) {
                 sqlSelect = TableInfoHelper.getTableColumns(entityClass, excludeColumns);
             }
         }
-        return ArrayUtils.isNotEmpty(sqlSelect) ? SqlUtils.stripSqlInjection(Arrays.stream(sqlSelect).collect(Collectors.joining(StringPool.COMMA))) : null;
+        return ArrayUtils.isNotEmpty(sqlSelect) ?
+            SqlUtils.stripSqlInjection(String.join(StringPool.COMMA, sqlSelect)) : null;
     }
 
     public QueryWrapper<T> select(String... sqlSelect) {
@@ -96,12 +97,13 @@ public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
 
     /**
      * 排除字段
-     * @param entityClass 实体类
+     *
+     * @param entityClass    实体类
      * @param excludeColumns 排除字段列表
      */
-    public QueryWrapper<T> excludeColumns(Class<T> entityClass,String... excludeColumns) {
-        Assert.notNull(entityClass,"entityClass is not null");
-        Assert.notEmpty(excludeColumns,"excludeColumns is not empty");
+    public QueryWrapper<T> excludeColumns(Class<T> entityClass, String... excludeColumns) {
+        Assert.notNull(entityClass, "entityClass is not null");
+        Assert.notEmpty(excludeColumns, "excludeColumns is not empty");
         this.excludeColumns = excludeColumns;
         this.entityClass = entityClass;
         return typedThis;
@@ -109,12 +111,13 @@ public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
 
     /**
      * 排除字段
+     *
      * @param excludeColumns 排除字段列表
      */
     @SuppressWarnings(value = "unchecked")
     public QueryWrapper<T> excludeColumns(String... excludeColumns) {
-        Assert.notNull(entity,"entity is not null");
-        return excludeColumns((Class<T>) entity.getClass(),excludeColumns);
+        Assert.notNull(entity, "entity is not null");
+        return excludeColumns((Class<T>) entity.getClass(), excludeColumns);
     }
 
     /**