lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FilterNode.filter方法废弃

Browse Source
This commit is contained in:
Redkale
2022-12-07 19:55:21 +08:00
parent 23e68e2d0d
commit 186b6c8649
7 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/redkale/source/AbstractDataSource.java
View File

@@ -544,12 +544,12 @@ public abstract class AbstractDataSource extends AbstractService implements Data
@Override
public <T> T find(final Class<T> 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 <T> CompletableFuture<T> findAsync(final Class<T> 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 <T, V extends Serializable> Set<V> queryColumnSet(final String selectedColumn, final Class<T> 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 <T, V extends Serializable> CompletableFuture<Set<V>> queryColumnSetAsync(final String selectedColumn, final Class<T> 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 <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> 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 <T, V extends Serializable> CompletableFuture<List<V>> queryColumnListAsync(final String selectedColumn, final Class<T> 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 <T> Set<T> querySet(final Class<T> 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 <T> CompletableFuture<Set<T>> querySetAsync(final Class<T> 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 <T> Set<T> querySet(final Class<T> 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 <T> CompletableFuture<Set<T>> querySetAsync(final Class<T> 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 <T> List<T> queryList(final Class<T> 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 <T> CompletableFuture<List<T>> queryListAsync(final Class<T> 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 <T> List<T> queryList(final Class<T> 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 <T> CompletableFuture<List<T>> queryListAsync(final Class<T> 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

10
src/main/java/org/redkale/source/DataSqlSource.java
View File

@@ -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<T> sheet = querySheetCompose(false, true, false, clazz, null, FLIPPER_ONE, FilterNode.filter(column, id)).join();
Sheet<T> 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 <T> CompletableFuture<T[]> findsComposeAsync(final EntityInfo<T> info, final SelectColumn selects, Serializable... pks) {
final Attribute<T, Serializable> 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 <D extends Serializable, T> CompletableFuture<List<T>> findsListAsync(final Class<T> clazz, final Stream<D> pks) {
final EntityInfo<T> 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<K> ids = new ArrayList<>();
keyStream.forEach(k -> ids.add(k));
final Attribute<T, Serializable> primary = info.getPrimary();
List<T> rs = queryList(clazz, FilterNode.filter(primary.field(), ids));
List<T> rs = queryList(clazz, FilterNode.create(primary.field(), ids));
Map<K, T> 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<K> pks = new ArrayList<>();
keyStream.forEach(k -> pks.add(k));
final Attribute<T, Serializable> primary = info.getPrimary();
return queryListAsync(clazz, FilterNode.filter(primary.field(), pks)).thenApply((List<T> rs) -> {
return queryListAsync(clazz, FilterNode.create(primary.field(), pks)).thenApply((List<T> rs) -> {
Map<K, T> map = new LinkedHashMap<>();
if (rs.isEmpty()) return new LinkedHashMap<>();
for (T item : rs) {

17
src/main/java/org/redkale/source/FilterNode.java
View File

@@ -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);
}

2
src/main/java/org/redkale/source/FilterNodeBean.java
View File

@@ -162,7 +162,7 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
}
if (!skip) {
if (this.joinClass == null) {
node = FilterNode.filter(column, express, itemand, val);
node = FilterNode.create(column, express, itemand, val);
} else {
node = FilterJoinNode.create(joinClass, joinColumns, column, express, itemand, val);
}

2
src/main/java/org/redkale/util/AnyValue.java
View File

@@ -851,7 +851,7 @@ public abstract class AnyValue {
sb.append(space).append(" '").append(en.name).append("': '").append(en.value).append("',\r\n");
}
for (Entry<AnyValue> 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();

2
src/test/java/org/redkale/test/source/FilterNodeTest.java
View File

@@ -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);

2
src/test/java/org/redkale/test/source/TestSourceCache.java
View File

@@ -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<TestEntity> sheet = info.getCache().querySheet(null, flipper, node);
System.out.println(sheet);