From 15c97ddc18252de3d0788fe206ba6b77aa6aacdc Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Thu, 2 Aug 2018 13:51:41 +0800
Subject: [PATCH]

---
 src/org/redkale/source/DataSqlSource.java | 16 +++----
 src/org/redkale/util/SelectColumn.java    | 52 +++++++++++++++++++++++
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/org/redkale/source/DataSqlSource.java b/src/org/redkale/source/DataSqlSource.java
index 125519b72..04c10dce0 100644
--- a/src/org/redkale/source/DataSqlSource.java
+++ b/src/org/redkale/source/DataSqlSource.java
@@ -890,22 +890,22 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
 
     @Override
     public <T> int updateColumn(final T bean, final String... columns) {
-        return updateColumn(bean, SelectColumn.createIncludes(columns));
+        return updateColumn(bean, SelectColumn.includes(columns));
     }
 
     @Override
     public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final String... columns) {
-        return updateColumnAsync(bean, SelectColumn.createIncludes(columns));
+        return updateColumnAsync(bean, SelectColumn.includes(columns));
     }
 
     @Override
     public <T> int updateColumn(final T bean, final FilterNode node, final String... columns) {
-        return updateColumn(bean, node, SelectColumn.createIncludes(columns));
+        return updateColumn(bean, node, SelectColumn.includes(columns));
     }
 
     @Override
     public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final FilterNode node, final String... columns) {
-        return updateColumnAsync(bean, node, SelectColumn.createIncludes(columns));
+        return updateColumnAsync(bean, node, SelectColumn.includes(columns));
     }
 
     @Override
@@ -1717,7 +1717,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
 
     @Override
     public <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
-        final List<T> list = queryList(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node);
+        final List<T> list = queryList(clazz, SelectColumn.includes(selectedColumn), flipper, node);
         final List<V> rs = new ArrayList<>();
         if (list.isEmpty()) return rs;
         final EntityInfo<T> info = loadEntityInfo(clazz);
@@ -1730,7 +1730,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
 
     @Override
     public <T, V extends Serializable> CompletableFuture<List<V>> queryColumnListAsync(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
-        return queryListAsync(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node).thenApply((List<T> list) -> {
+        return queryListAsync(clazz, SelectColumn.includes(selectedColumn), flipper, node).thenApply((List<T> list) -> {
             final List<V> rs = new ArrayList<>();
             if (list.isEmpty()) return rs;
             final EntityInfo<T> info = loadEntityInfo(clazz);
@@ -1766,7 +1766,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
 
     @Override
     public <T, V extends Serializable> Sheet<V> queryColumnSheet(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
-        Sheet<T> sheet = querySheet(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node);
+        Sheet<T> sheet = querySheet(clazz, SelectColumn.includes(selectedColumn), flipper, node);
         final Sheet<V> rs = new Sheet<>();
         if (sheet.isEmpty()) return rs;
         rs.setTotal(sheet.getTotal());
@@ -1782,7 +1782,7 @@ public abstract class DataSqlSource<DBChannel> extends AbstractService implement
 
     @Override
     public <T, V extends Serializable> CompletableFuture<Sheet<V>> queryColumnSheetAsync(final String selectedColumn, final Class<T> clazz, final Flipper flipper, final FilterNode node) {
-        return querySheetAsync(clazz, SelectColumn.createIncludes(selectedColumn), flipper, node).thenApply((Sheet<T> sheet) -> {
+        return querySheetAsync(clazz, SelectColumn.includes(selectedColumn), flipper, node).thenApply((Sheet<T> sheet) -> {
             final Sheet<V> rs = new Sheet<>();
             if (sheet.isEmpty()) return rs;
             rs.setTotal(sheet.getTotal());
diff --git a/src/org/redkale/util/SelectColumn.java b/src/org/redkale/util/SelectColumn.java
index 21e1cd497..282a78f08 100644
--- a/src/org/redkale/util/SelectColumn.java
+++ b/src/org/redkale/util/SelectColumn.java
@@ -70,6 +70,7 @@ public class SelectColumn implements Predicate<String> {
     }
 
     /**
+     * @deprecated
      * class中的字段名
      *
      * @param columns 包含的字段名集合
@@ -81,6 +82,18 @@ public class SelectColumn implements Predicate<String> {
     }
 
     /**
+     * class中的字段名
+     *
+     * @param columns 包含的字段名集合
+     *
+     * @return SelectColumn
+     */
+    public static SelectColumn includes(String... columns) {
+        return new SelectColumn(columns, false);
+    }
+
+    /**
+     * @deprecated
      * class中的字段名
      *
      * @param cols    包含的字段名集合
@@ -93,6 +106,20 @@ public class SelectColumn implements Predicate<String> {
     }
 
     /**
+     * class中的字段名
+     *
+     * @param cols    包含的字段名集合
+     * @param columns 包含的字段名集合
+     *
+     * @return SelectColumn
+     */
+    public static SelectColumn includes(String[] cols, String... columns) {
+        return new SelectColumn(Utility.append(cols, columns), false);
+    }
+
+    /**
+     * @deprecated
+     *
      * class中的字段名
      *
      * @param columns 排除的字段名集合
@@ -104,6 +131,18 @@ public class SelectColumn implements Predicate<String> {
     }
 
     /**
+     * class中的字段名
+     *
+     * @param columns 排除的字段名集合
+     *
+     * @return SelectColumn
+     */
+    public static SelectColumn excludes(String... columns) {
+        return new SelectColumn(columns, true);
+    }
+
+    /**
+     * @deprecated
      * class中的字段名
      *
      * @param cols    排除的字段名集合
@@ -115,6 +154,19 @@ public class SelectColumn implements Predicate<String> {
         return new SelectColumn(Utility.append(cols, columns), true);
     }
 
+    /**
+     *
+     * class中的字段名
+     *
+     * @param cols    排除的字段名集合
+     * @param columns 排除的字段名集合
+     *
+     * @return SelectColumn
+     */
+    public static SelectColumn excludes(String[] cols, String... columns) {
+        return new SelectColumn(Utility.append(cols, columns), true);
+    }
+
     @Override
     public boolean test(final String column) {
         if (this.columns != null) {