diff --git a/src/main/java/org/redkale/source/AbstractDataSource.java b/src/main/java/org/redkale/source/AbstractDataSource.java index bf6184248..399926ecf 100644 --- a/src/main/java/org/redkale/source/AbstractDataSource.java +++ b/src/main/java/org/redkale/source/AbstractDataSource.java @@ -544,12 +544,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data @Override public T find(final Class clazz, final String column, final Serializable colval) { - return find(clazz, null, FilterNode.filter(column, colval)); + return find(clazz, null, FilterNode.create(column, colval)); } @Override public CompletableFuture findAsync(final Class clazz, final String column, final Serializable colval) { - return findAsync(clazz, null, FilterNode.filter(column, colval)); + return findAsync(clazz, null, FilterNode.create(column, colval)); } @Override @@ -635,12 +635,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data //-----------------------list set---------------------------- @Override public Set queryColumnSet(final String selectedColumn, final Class clazz, final String column, final Serializable colval) { - return queryColumnSet(selectedColumn, clazz, null, FilterNode.filter(column, colval)); + return queryColumnSet(selectedColumn, clazz, null, FilterNode.create(column, colval)); } @Override public CompletableFuture> queryColumnSetAsync(final String selectedColumn, final Class clazz, final String column, final Serializable colval) { - return queryColumnSetAsync(selectedColumn, clazz, null, FilterNode.filter(column, colval)); + return queryColumnSetAsync(selectedColumn, clazz, null, FilterNode.create(column, colval)); } @Override @@ -675,12 +675,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data @Override public List queryColumnList(final String selectedColumn, final Class clazz, final String column, final Serializable colval) { - return queryColumnList(selectedColumn, clazz, null, FilterNode.filter(column, colval)); + return queryColumnList(selectedColumn, clazz, null, FilterNode.create(column, colval)); } @Override public CompletableFuture> queryColumnListAsync(final String selectedColumn, final Class clazz, final String column, final Serializable colval) { - return queryColumnListAsync(selectedColumn, clazz, null, FilterNode.filter(column, colval)); + return queryColumnListAsync(selectedColumn, clazz, null, FilterNode.create(column, colval)); } @Override @@ -832,12 +832,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data */ @Override public Set querySet(final Class clazz, final String column, final Serializable colval) { - return querySet(clazz, (SelectColumn) null, null, FilterNode.filter(column, colval)); + return querySet(clazz, (SelectColumn) null, null, FilterNode.create(column, colval)); } @Override public CompletableFuture> querySetAsync(final Class clazz, final String column, final Serializable colval) { - return querySetAsync(clazz, (SelectColumn) null, null, FilterNode.filter(column, colval)); + return querySetAsync(clazz, (SelectColumn) null, null, FilterNode.create(column, colval)); } @Override @@ -911,12 +911,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data @Override public Set querySet(final Class clazz, final Flipper flipper, final String column, final Serializable colval) { - return querySet(clazz, null, flipper, FilterNode.filter(column, colval)); + return querySet(clazz, null, flipper, FilterNode.create(column, colval)); } @Override public CompletableFuture> querySetAsync(final Class clazz, final Flipper flipper, final String column, final Serializable colval) { - return querySetAsync(clazz, null, flipper, FilterNode.filter(column, colval)); + return querySetAsync(clazz, null, flipper, FilterNode.create(column, colval)); } @Override @@ -961,12 +961,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data */ @Override public List queryList(final Class clazz, final String column, final Serializable colval) { - return queryList(clazz, (SelectColumn) null, null, FilterNode.filter(column, colval)); + return queryList(clazz, (SelectColumn) null, null, FilterNode.create(column, colval)); } @Override public CompletableFuture> queryListAsync(final Class clazz, final String column, final Serializable colval) { - return queryListAsync(clazz, (SelectColumn) null, null, FilterNode.filter(column, colval)); + return queryListAsync(clazz, (SelectColumn) null, null, FilterNode.create(column, colval)); } @Override @@ -1040,12 +1040,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data @Override public List queryList(final Class clazz, final Flipper flipper, final String column, final Serializable colval) { - return queryList(clazz, null, flipper, FilterNode.filter(column, colval)); + return queryList(clazz, null, flipper, FilterNode.create(column, colval)); } @Override public CompletableFuture> queryListAsync(final Class clazz, final Flipper flipper, final String column, final Serializable colval) { - return queryListAsync(clazz, null, flipper, FilterNode.filter(column, colval)); + return queryListAsync(clazz, null, flipper, FilterNode.create(column, colval)); } @Override diff --git a/src/main/java/org/redkale/source/DataSqlSource.java b/src/main/java/org/redkale/source/DataSqlSource.java index e15f52b26..5470039ca 100644 --- a/src/main/java/org/redkale/source/DataSqlSource.java +++ b/src/main/java/org/redkale/source/DataSqlSource.java @@ -1565,7 +1565,7 @@ public abstract class DataSqlSource extends AbstractDataSource implements Functi String column = info.getPrimary().field(); int c = 0; for (Serializable id : pks) { - Sheet sheet = querySheetCompose(false, true, false, clazz, null, FLIPPER_ONE, FilterNode.filter(column, id)).join(); + Sheet sheet = querySheetCompose(false, true, false, clazz, null, FLIPPER_ONE, FilterNode.create(column, id)).join(); T value = sheet.isEmpty() ? null : sheet.list().get(0); if (value != null) c += cache.update(value); } @@ -1862,7 +1862,7 @@ public abstract class DataSqlSource extends AbstractDataSource implements Functi protected CompletableFuture findsComposeAsync(final EntityInfo info, final SelectColumn selects, Serializable... pks) { final Attribute primary = info.getPrimary(); - return queryListAsync(info.getType(), selects, null, FilterNode.filter(info.getPrimarySQLColumn(), FilterExpress.IN, pks)).thenApply(list -> { + return queryListAsync(info.getType(), selects, null, FilterNode.create(info.getPrimarySQLColumn(), FilterExpress.IN, pks)).thenApply(list -> { T[] rs = info.getArrayer().apply(pks.length); for (int i = 0; i < rs.length; i++) { T t = null; @@ -1888,7 +1888,7 @@ public abstract class DataSqlSource extends AbstractDataSource implements Functi public CompletableFuture> findsListAsync(final Class clazz, final Stream pks) { final EntityInfo info = loadEntityInfo(clazz); Serializable[] ids = pks.toArray(v -> new Serializable[v]); - return queryListAsync(info.getType(), null, null, FilterNode.filter(info.getPrimarySQLColumn(), FilterExpress.IN, ids)); + return queryListAsync(info.getType(), null, null, FilterNode.create(info.getPrimarySQLColumn(), FilterExpress.IN, ids)); } @Override @@ -2210,7 +2210,7 @@ public abstract class DataSqlSource extends AbstractDataSource implements Functi final ArrayList ids = new ArrayList<>(); keyStream.forEach(k -> ids.add(k)); final Attribute primary = info.getPrimary(); - List rs = queryList(clazz, FilterNode.filter(primary.field(), ids)); + List rs = queryList(clazz, FilterNode.create(primary.field(), ids)); Map map = new LinkedHashMap<>(); if (rs.isEmpty()) return new LinkedHashMap<>(); for (T item : rs) { @@ -2226,7 +2226,7 @@ public abstract class DataSqlSource extends AbstractDataSource implements Functi final ArrayList pks = new ArrayList<>(); keyStream.forEach(k -> pks.add(k)); final Attribute primary = info.getPrimary(); - return queryListAsync(clazz, FilterNode.filter(primary.field(), pks)).thenApply((List rs) -> { + return queryListAsync(clazz, FilterNode.create(primary.field(), pks)).thenApply((List rs) -> { Map map = new LinkedHashMap<>(); if (rs.isEmpty()) return new LinkedHashMap<>(); for (T item : rs) { diff --git a/src/main/java/org/redkale/source/FilterNode.java b/src/main/java/org/redkale/source/FilterNode.java index 9a76bc04c..ca9f76f47 100644 --- a/src/main/java/org/redkale/source/FilterNode.java +++ b/src/main/java/org/redkale/source/FilterNode.java @@ -299,32 +299,29 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 return rs; } - @Deprecated //@deprecated @since 2.7.0 使用 filter 方法替换 public static FilterNode create(String column, Serializable value) { - return filter(column, null, value); + return create(column, null, value); } - @Deprecated //@deprecated @since 2.7.0 使用 filter 方法替换 public static FilterNode create(String column, FilterExpress express, Serializable value) { - return filter(column, express, true, value); + return create(column, express, true, value); } - @Deprecated //@deprecated @since 2.7.0 使用 filter 方法替换 public static FilterNode create(String column, FilterExpress express, boolean itemand, Serializable value) { return new FilterNode(column, express, itemand, value); } - //@since 2.6.0 create不利于import static + @Deprecated //@deprecated @since 2.8.0 public static FilterNode filter(String column, Serializable value) { - return filter(column, null, value); + return create(column, null, value); } - //@since 2.6.0 create不利于import static + @Deprecated //@deprecated @since 2.8.0 public static FilterNode filter(String column, FilterExpress express, Serializable value) { - return filter(column, express, true, value); + return create(column, express, true, value); } - //@since 2.6.0 create不利于import static + @Deprecated //@deprecated @since 2.8.0 public static FilterNode filter(String column, FilterExpress express, boolean itemand, Serializable value) { return new FilterNode(column, express, itemand, value); } diff --git a/src/main/java/org/redkale/source/FilterNodeBean.java b/src/main/java/org/redkale/source/FilterNodeBean.java index e15c4a6d2..442fe72be 100644 --- a/src/main/java/org/redkale/source/FilterNodeBean.java +++ b/src/main/java/org/redkale/source/FilterNodeBean.java @@ -162,7 +162,7 @@ public final class FilterNodeBean implements Comparable en : getAnyEntrys()) { - sb.append(space).append(" '").append(en.name).append("': '").append(en.value.toString(indent + 4)).append("',\r\n"); + sb.append(space).append(" '").append(en.name).append("': ").append(en.value.toString(indent + 4)).append(",\r\n"); } sb.append(space).append('}'); return sb.toString(); diff --git a/src/test/java/org/redkale/test/source/FilterNodeTest.java b/src/test/java/org/redkale/test/source/FilterNodeTest.java index cd4191c29..0a7532fe0 100644 --- a/src/test/java/org/redkale/test/source/FilterNodeTest.java +++ b/src/test/java/org/redkale/test/source/FilterNodeTest.java @@ -105,7 +105,7 @@ public class FilterNodeTest { FilterNode joinNode1 = FilterJoinNode.create(UserTestTable.class, new String[]{"userid", "username"}, "username", LIKE, bean.username) .or(FilterJoinNode.create(UserTestTable.class, new String[]{"userid", "username"}, "createtime", GREATERTHAN, bean.createtime)); FilterNode joinNode2 = FilterJoinNode.create(CarTypeTestTable.class, "cartype", "typename", LIKE, bean.typename); - final FilterNode node = CarTestBean.caridTransient() ? (joinNode2.or(joinNode1)) : FilterNode.filter("carid", GREATERTHAN, bean.carid).and(joinNode1).or(joinNode2); + final FilterNode node = CarTestBean.caridTransient() ? (joinNode2.or(joinNode1)) : FilterNode.create("carid", GREATERTHAN, bean.carid).and(joinNode1).or(joinNode2); final FilterNode beanNode = FilterNodeBean.createFilterNode(bean); System.out.println("node.string = " + node); System.out.println("bean.string = " + beanNode); diff --git a/src/test/java/org/redkale/test/source/TestSourceCache.java b/src/test/java/org/redkale/test/source/TestSourceCache.java index bfab1285c..d77e53fec 100644 --- a/src/test/java/org/redkale/test/source/TestSourceCache.java +++ b/src/test/java/org/redkale/test/source/TestSourceCache.java @@ -66,7 +66,7 @@ public class TestSourceCache { final Flipper flipper = new Flipper(2); flipper.setSort("userid DESC, createtime DESC"); - final FilterNode node = FilterNode.filter("userid", FilterExpress.GREATERTHAN, 1000).and("username", FilterExpress.LIKE, "用户"); + final FilterNode node = FilterNode.create("userid", FilterExpress.GREATERTHAN, 1000).and("username", FilterExpress.LIKE, "用户"); System.out.println("node = " + node); Sheet sheet = info.getCache().querySheet(null, flipper, node); System.out.println(sheet);