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

移除FilterNode中的itemand属性

Browse Source
This commit is contained in:
redkale
2023-07-29 22:17:36 +08:00
parent 07585a01ed
commit 4804eed0a7
3 changed files with 25 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/redkale/source/FilterJoinNode.java
View File

@@ -31,7 +31,7 @@ public class FilterJoinNode extends FilterNode {
public FilterJoinNode() { public FilterJoinNode() {
} }
protected FilterJoinNode(Class joinClass, String[] joinColumns, String column, FilterExpress express, boolean itemand, Serializable value) { protected FilterJoinNode(Class joinClass, String[] joinColumns, String column, FilterExpress express, Serializable value) {
Objects.requireNonNull(joinClass); Objects.requireNonNull(joinClass);
Objects.requireNonNull(joinColumns); Objects.requireNonNull(joinColumns);
if (express == null && value != null) { if (express == null && value != null) {
@@ -47,12 +47,11 @@ public class FilterJoinNode extends FilterNode {
this.joinColumns = joinColumns; this.joinColumns = joinColumns;
this.column = column; this.column = column;
this.express = express == null ? EQUAL : express; this.express = express == null ? EQUAL : express;
this.itemand = itemand;
this.value = value; this.value = value;
} }
protected FilterJoinNode(FilterJoinNode node) { protected FilterJoinNode(FilterJoinNode node) {
this(node.joinClass, node.joinColumns, node.column, node.express, node.itemand, node.value); this(node.joinClass, node.joinColumns, node.column, node.express, node.value);
this.joinEntity = node.joinEntity; this.joinEntity = node.joinEntity;
this.or = node.or; this.or = node.or;
this.nodes = node.nodes; this.nodes = node.nodes;
@@ -66,20 +65,12 @@ public class FilterJoinNode extends FilterNode {
return create(joinClass, new String[]{joinColumn}, column, express, value); return create(joinClass, new String[]{joinColumn}, column, express, value);
} }
public static FilterJoinNode create(Class joinClass, String joinColumn, String column, FilterExpress express, boolean itemand, Serializable value) {
return create(joinClass, new String[]{joinColumn}, column, express, itemand, value);
}
public static FilterJoinNode create(Class joinClass, String[] joinColumns, String column, Serializable value) { public static FilterJoinNode create(Class joinClass, String[] joinColumns, String column, Serializable value) {
return create(joinClass, joinColumns, column, null, value); return create(joinClass, joinColumns, column, null, value);
} }
public static FilterJoinNode create(Class joinClass, String[] joinColumns, String column, FilterExpress express, Serializable value) { public static FilterJoinNode create(Class joinClass, String[] joinColumns, String column, FilterExpress express, Serializable value) {
return create(joinClass, joinColumns, column, express, true, value); return new FilterJoinNode(joinClass, joinColumns, column, express, value);
}
public static FilterJoinNode create(Class joinClass, String[] joinColumns, String column, FilterExpress express, boolean itemand, Serializable value) {
return new FilterJoinNode(joinClass, joinColumns, column, express, itemand, value);
} }
@Override @Override
@@ -117,7 +108,6 @@ public class FilterJoinNode extends FilterNode {
this.nodes = new FilterNode[]{new FilterJoinNode(this), node}; this.nodes = new FilterNode[]{new FilterJoinNode(this), node};
this.column = null; this.column = null;
this.express = null; this.express = null;
this.itemand = true;
this.value = null; this.value = null;
this.joinClass = null; this.joinClass = null;
this.joinEntity = null; this.joinEntity = null;

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

@@ -33,8 +33,6 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
protected Serializable value; protected Serializable value;
protected boolean itemand;
//---------------------------------------------- //----------------------------------------------
protected boolean or; protected boolean or;
@@ -43,7 +41,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
public FilterNode() { public FilterNode() {
} }
protected FilterNode(String col, FilterExpress exp, boolean itemand, Serializable val) { protected FilterNode(String col, FilterExpress exp, Serializable val) {
Objects.requireNonNull(col); Objects.requireNonNull(col);
if (exp == null) { if (exp == null) {
if (val instanceof Range) { if (val instanceof Range) {
@@ -78,7 +76,6 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
this.column = col; this.column = col;
this.express = exp == null ? EQUAL : exp; this.express = exp == null ? EQUAL : exp;
this.itemand = itemand;
this.value = val; this.value = val;
} }
@@ -91,7 +88,6 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
node.column = this.column; node.column = this.column;
node.express = this.express; node.express = this.express;
node.value = this.value; node.value = this.value;
node.itemand = this.itemand;
node.or = this.or; node.or = this.or;
if (this.nodes != null) { if (this.nodes != null) {
node.nodes = new FilterNode[this.nodes.length]; node.nodes = new FilterNode[this.nodes.length];
@@ -154,11 +150,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public final FilterNode and(String column, FilterExpress express, Serializable value) { public final FilterNode and(String column, FilterExpress express, Serializable value) {
return and(column, express, true, value); return and(new FilterNode(column, express, value));
}
public final FilterNode and(String column, FilterExpress express, boolean itemand, Serializable value) {
return and(new FilterNode(column, express, itemand, value));
} }
public final <T extends Serializable> FilterNode and(LambdaSupplier<T> func) { public final <T extends Serializable> FilterNode and(LambdaSupplier<T> func) {
@@ -166,11 +158,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public final <T extends Serializable> FilterNode and(LambdaSupplier<T> func, FilterExpress express) { public final <T extends Serializable> FilterNode and(LambdaSupplier<T> func, FilterExpress express) {
return and(func, express, true); return and(new FilterNode(LambdaSupplier.readColumn(func), express, func.get()));
}
public final <T extends Serializable> FilterNode and(LambdaSupplier<T> func, FilterExpress express, boolean itemand) {
return and(new FilterNode(LambdaSupplier.readColumn(func), express, itemand, func.get()));
} }
public final <T> FilterNode and(LambdaFunction<T, ?> func, Serializable value) { public final <T> FilterNode and(LambdaFunction<T, ?> func, Serializable value) {
@@ -178,11 +166,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public final <T> FilterNode and(LambdaFunction<T, ?> func, FilterExpress express, Serializable value) { public final <T> FilterNode and(LambdaFunction<T, ?> func, FilterExpress express, Serializable value) {
return and(func, express, true, value); return and(new FilterNode(LambdaFunction.readColumn(func), express, value));
}
public final <T> FilterNode and(LambdaFunction<T, ?> func, FilterExpress express, boolean itemand, Serializable value) {
return and(new FilterNode(LambdaFunction.readColumn(func), express, itemand, value));
} }
public final FilterNode or(FilterNode node) { public final FilterNode or(FilterNode node) {
@@ -194,11 +178,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public final FilterNode or(String column, FilterExpress express, Serializable value) { public final FilterNode or(String column, FilterExpress express, Serializable value) {
return or(column, express, true, value); return or(new FilterNode(column, express, value));
}
public final FilterNode or(String column, FilterExpress express, boolean itemand, Serializable value) {
return or(new FilterNode(column, express, itemand, value));
} }
public final <T extends Serializable> FilterNode or(LambdaSupplier<T> func) { public final <T extends Serializable> FilterNode or(LambdaSupplier<T> func) {
@@ -206,11 +186,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public final <T extends Serializable> FilterNode or(LambdaSupplier<T> func, FilterExpress express) { public final <T extends Serializable> FilterNode or(LambdaSupplier<T> func, FilterExpress express) {
return or(func, express, true); return or(new FilterNode(LambdaSupplier.readColumn(func), express, func.get()));
}
public final <T extends Serializable> FilterNode or(LambdaSupplier<T> func, FilterExpress express, boolean itemand) {
return or(new FilterNode(LambdaSupplier.readColumn(func), express, itemand, func.get()));
} }
public final <T> FilterNode or(LambdaFunction<T, ?> func, Serializable value) { public final <T> FilterNode or(LambdaFunction<T, ?> func, Serializable value) {
@@ -218,11 +194,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public final <T> FilterNode or(LambdaFunction<T, ?> func, FilterExpress express, Serializable value) { public final <T> FilterNode or(LambdaFunction<T, ?> func, FilterExpress express, Serializable value) {
return or(func, express, true, value); return or(new FilterNode(LambdaFunction.readColumn(func), express, value));
}
public final <T> FilterNode or(LambdaFunction<T, ?> func, FilterExpress express, boolean itemand, Serializable value) {
return or(new FilterNode(LambdaFunction.readColumn(func), express, itemand, value));
} }
protected FilterNode any(FilterNode node, boolean signor) { protected FilterNode any(FilterNode node, boolean signor) {
@@ -233,7 +205,6 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
if (this.column == null) { if (this.column == null) {
this.column = node.column; this.column = node.column;
this.express = node.express; this.express = node.express;
this.itemand = node.itemand;
this.value = node.value; this.value = node.value;
return this; return this;
} }
@@ -246,13 +217,12 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
this.nodes = Utility.append(this.nodes, node); this.nodes = Utility.append(this.nodes, node);
return this; return this;
} }
FilterNode newnode = new FilterNode(this.column, this.express, this.itemand, this.value); FilterNode newnode = new FilterNode(this.column, this.express, this.value);
newnode.or = this.or; newnode.or = this.or;
newnode.nodes = this.nodes; newnode.nodes = this.nodes;
this.nodes = new FilterNode[]{newnode, node}; this.nodes = new FilterNode[]{newnode, node};
this.column = null; this.column = null;
this.express = null; this.express = null;
this.itemand = true;
this.or = signor; this.or = signor;
this.value = null; this.value = null;
return this; return this;
@@ -388,11 +358,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public static FilterNode create(String column, FilterExpress express, Serializable value) { public static FilterNode create(String column, FilterExpress express, Serializable value) {
return create(column, express, true, value); return new FilterNode(column, express, value);
}
public static FilterNode create(String column, FilterExpress express, boolean itemand, Serializable value) {
return new FilterNode(column, express, itemand, value);
} }
public static <T extends Serializable> FilterNode create(LambdaSupplier<T> func) { public static <T extends Serializable> FilterNode create(LambdaSupplier<T> func) {
@@ -400,11 +366,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public static <T extends Serializable> FilterNode create(LambdaSupplier<T> func, FilterExpress express) { public static <T extends Serializable> FilterNode create(LambdaSupplier<T> func, FilterExpress express) {
return create(func, express, true); return new FilterNode(LambdaSupplier.readColumn(func), express, func.get());
}
public static <T extends Serializable> FilterNode create(LambdaSupplier<T> func, FilterExpress express, boolean itemand) {
return new FilterNode(LambdaSupplier.readColumn(func), express, itemand, func.get());
} }
public static <T> FilterNode create(LambdaFunction<T, ?> func, Serializable value) { public static <T> FilterNode create(LambdaFunction<T, ?> func, Serializable value) {
@@ -412,11 +374,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
public static <T> FilterNode create(LambdaFunction<T, ?> func, FilterExpress express, Serializable value) { public static <T> FilterNode create(LambdaFunction<T, ?> func, FilterExpress express, Serializable value) {
return create(func, express, true, value); return new FilterNode(LambdaFunction.readColumn(func), express, value);
}
public static <T> FilterNode create(LambdaFunction<T, ?> func, FilterExpress express, boolean itemand, Serializable value) {
return new FilterNode(LambdaFunction.readColumn(func), express, itemand, value);
} }
@Deprecated(since = "2.8.0") @Deprecated(since = "2.8.0")
@@ -426,12 +384,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
@Deprecated(since = "2.8.0") @Deprecated(since = "2.8.0")
public static FilterNode filter(String column, FilterExpress express, Serializable value) { public static FilterNode filter(String column, FilterExpress express, Serializable value) {
return create(column, express, true, value); return new FilterNode(column, express, value);
}
@Deprecated(since = "2.8.0")
public static FilterNode filter(String column, FilterExpress express, boolean itemand, Serializable value) {
return new FilterNode(column, express, itemand, value);
} }
private boolean needSplit(final Object val0) { private boolean needSplit(final Object val0) {
@@ -486,7 +439,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
continue; continue;
} }
if (sb.length() > 2) { if (sb.length() > 2) {
sb.append(itemand ? " AND " : " OR "); sb.append(" AND ");
} }
sb.append(cs); sb.append(cs);
} }
@@ -510,7 +463,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
continue; continue;
} }
if (sb.length() > 2) { if (sb.length() > 2) {
sb.append(itemand ? " AND " : " OR "); sb.append(" AND ");
} }
sb.append(cs); sb.append(cs);
} }
@@ -656,18 +609,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
final Predicate<T> one = filter; final Predicate<T> one = filter;
final Predicate<T> two = f; final Predicate<T> two = f;
filter = (filter == null) ? f : (!itemand ? new Predicate<T>() { filter = (filter == null) ? f : new Predicate<T>() {
@Override
public boolean test(T t) {
return one.test(t) || two.test(t);
}
@Override
public String toString() {
return "(" + one + " OR " + two + ")";
}
} : new Predicate<T>() {
@Override @Override
public boolean test(T t) { public boolean test(T t) {
@@ -678,7 +620,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
public String toString() { public String toString() {
return "(" + one + " AND " + two + ")"; return "(" + one + " AND " + two + ")";
} }
}); };
} }
return filter; return filter;
} else if (val0.getClass().isArray()) { } else if (val0.getClass().isArray()) {
@@ -753,18 +695,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
} }
final Predicate<T> one = filter; final Predicate<T> one = filter;
final Predicate<T> two = f; final Predicate<T> two = f;
filter = (filter == null) ? f : (!itemand ? new Predicate<T>() { filter = (filter == null) ? f : new Predicate<T>() {
@Override
public boolean test(T t) {
return one.test(t) || two.test(t);
}
@Override
public String toString() {
return "(" + one + " OR " + two + ")";
}
} : new Predicate<T>() {
@Override @Override
public boolean test(T t) { public boolean test(T t) {
@@ -775,7 +706,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
public String toString() { public String toString() {
return "(" + one + " AND " + two + ")"; return "(" + one + " AND " + two + ")";
} }
}); };
} }
return filter; return filter;
} }
@@ -2125,7 +2056,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
continue; continue;
} }
if (sb.length() > 2) { if (sb.length() > 2) {
sb.append(itemand ? " AND " : " OR "); sb.append(" AND ");
} }
sb.append(cs); sb.append(cs);
} }
@@ -2149,7 +2080,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
continue; continue;
} }
if (sb.length() > 2) { if (sb.length() > 2) {
sb.append(itemand ? " AND " : " OR "); sb.append(" AND ");
} }
sb.append(cs); sb.append(cs);
} }
@@ -2307,14 +2238,6 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则
this.express = express; this.express = express;
} }
public final boolean isItemand() {
return itemand;
}
public final void setItemand(boolean itemand) {
this.itemand = itemand;
}
public final FilterNode[] getNodes() { public final FilterNode[] getNodes() {
return nodes; return nodes;
} }

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

@@ -34,8 +34,6 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
private FilterExpress express; private FilterExpress express;
private boolean itemand;
private boolean or; private boolean or;
private FilterNodeBean[] nodeBeans; private FilterNodeBean[] nodeBeans;
@@ -56,7 +54,6 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
this.beanAttr = bean == null ? null : bean.beanAttr; this.beanAttr = bean == null ? null : bean.beanAttr;
this.column = bean == null ? null : bean.column; this.column = bean == null ? null : bean.column;
this.express = bean == null ? null : bean.express; this.express = bean == null ? null : bean.express;
this.itemand = bean == null ? true : bean.itemand;
this.joinClass = bean == null ? null : bean.joinClass; this.joinClass = bean == null ? null : bean.joinClass;
this.joinColumns = bean == null ? null : bean.joinColumns; this.joinColumns = bean == null ? null : bean.joinColumns;
this.least = bean == null ? 1 : bean.least; this.least = bean == null ? 1 : bean.least;
@@ -119,7 +116,6 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
this.beanAttr = node.beanAttr; this.beanAttr = node.beanAttr;
this.column = node.column; this.column = node.column;
this.express = node.express; this.express = node.express;
this.itemand = node.itemand;
this.joinClass = node.joinClass; this.joinClass = node.joinClass;
this.joinColumns = node.joinColumns; this.joinColumns = node.joinColumns;
this.least = node.least; this.least = node.least;
@@ -182,9 +178,9 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
} }
if (!skip) { if (!skip) {
if (this.joinClass == null) { if (this.joinClass == null) {
node = FilterNode.create(column, express, itemand, val); node = FilterNode.create(column, express, val);
} else { } else {
node = FilterJoinNode.create(joinClass, joinColumns, column, express, itemand, val); node = FilterJoinNode.create(joinClass, joinColumns, column, express, val);
} }
} }
} }