Browse Source

重构 wrapper

hubin 7 years ago
parent
commit
05ab703300

+ 3 - 8
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/MybatisAbstractSQL.java

@@ -20,6 +20,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -235,14 +236,8 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
          * @return
          */
         private List<String> clearNull(List<String> parts) {
-            List<String> temps = new ArrayList<>();
-            for (String part : parts) {
-                if (StringUtils.isEmpty(part)) {
-                    continue;
-                }
-                temps.add(part);
-            }
-            return temps;
+            return parts.stream().filter(part -> !StringUtils.isEmpty(part))
+                .collect(Collectors.toList());
         }
 
         /**

+ 6 - 6
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/SqlPlus.java

@@ -15,6 +15,8 @@
  */
 package com.baomidou.mybatisplus.core.conditions;
 
+import java.util.Arrays;
+
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 /**
@@ -117,12 +119,10 @@ public class SqlPlus extends MybatisAbstractSQL<SqlPlus> {
      */
     private void handlerNull(String columns, String sqlPart) {
         if (StringUtils.isNotEmpty(columns)) {
-            String[] cols = columns.split(",");
-            for (String col : cols) {
-                if (StringUtils.isNotEmpty(col.trim())) {
-                    WHERE(col + sqlPart);
-                }
-            }
+            Arrays.stream(columns.split(","))
+                .filter(col -> StringUtils.isNotEmpty(col.trim()))
+                .map(col -> col + sqlPart)
+                .forEach(this::WHERE);
         }
     }
 }