From e44afc92087f0dbc8b51c2a98634f675eb908068 Mon Sep 17 00:00:00 2001 From: redkale Date: Thu, 16 Nov 2023 09:41:06 +0800 Subject: [PATCH] =?UTF-8?q?FilterKey=E6=9B=B4=E5=90=8D=E4=B8=BAFilterColVa?= =?UTF-8?q?lue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{FilterKey.java => FilterColValue.java} | 8 ++--- .../{FilterValue.java => FilterExpValue.java} | 12 ++++---- .../java/org/redkale/source/FilterNode.java | 30 +++++++++---------- .../java/org/redkale/source/FilterNodes.java | 12 ++++---- 4 files changed, 31 insertions(+), 31 deletions(-) rename src/main/java/org/redkale/source/{FilterKey.java => FilterColValue.java} (72%) rename src/main/java/org/redkale/source/{FilterValue.java => FilterExpValue.java} (74%) diff --git a/src/main/java/org/redkale/source/FilterKey.java b/src/main/java/org/redkale/source/FilterColValue.java similarity index 72% rename from src/main/java/org/redkale/source/FilterKey.java rename to src/main/java/org/redkale/source/FilterColValue.java index a2190325e..9b29e13b5 100644 --- a/src/main/java/org/redkale/source/FilterKey.java +++ b/src/main/java/org/redkale/source/FilterColValue.java @@ -10,8 +10,8 @@ import org.redkale.annotation.ConstructorParameters; import org.redkale.convert.ConvertColumn; /** - * FilterKey主要用于自身字段间的表达式, 如： a.recordid = a.parentid , a.parentid就需要FilterKey来表示 new FilterKey("parentid") - *
+ * 主要用于自身字段间的表达式, 如： a.recordid = a.parentid , a.parentid就需要FilterColValue来表示 new FilterColValue("parentid") +
* 注意：该类型不支持表达式：FV_XXX、BETWEEN、NOTBETWEEN、IN、NOTIN * *

@@ -19,13 +19,13 @@ import org.redkale.convert.ConvertColumn; * * @author zhangjx */ -public class FilterKey implements java.io.Serializable { +public class FilterColValue implements java.io.Serializable { @ConvertColumn(index = 1) private final String column; @ConstructorParameters({"column"}) - public FilterKey(String column) { + public FilterColValue(String column) { this.column = Objects.requireNonNull(column); } diff --git a/src/main/java/org/redkale/source/FilterValue.java b/src/main/java/org/redkale/source/FilterExpValue.java similarity index 74% rename from src/main/java/org/redkale/source/FilterValue.java rename to src/main/java/org/redkale/source/FilterExpValue.java index 20090ca4c..4e4db2e3e 100644 --- a/src/main/java/org/redkale/source/FilterValue.java +++ b/src/main/java/org/redkale/source/FilterExpValue.java @@ -16,7 +16,7 @@ import org.redkale.convert.ConvertColumn; * * @author zhangjx */ -public class FilterValue implements java.io.Serializable { +public class FilterExpValue implements java.io.Serializable { @ConvertColumn(index = 1) private Number left; @@ -27,18 +27,18 @@ public class FilterValue implements java.io.Serializable { @ConvertColumn(index = 3) private Number right; - public FilterValue() { + public FilterExpValue() { } - public FilterValue(Number left, Number right) { + public FilterExpValue(Number left, Number right) { this(left, FilterExpress.EQ, right); } - public FilterValue(Number left, FilterExpress express) { + public FilterExpValue(Number left, FilterExpress express) { this(left, express, 0); } - public FilterValue(Number left, FilterExpress express, Number right) { + public FilterExpValue(Number left, FilterExpress express, Number right) { this.left = left; this.express = FilterNodes.oldExpress(express); this.right = right; @@ -70,6 +70,6 @@ public class FilterValue implements java.io.Serializable { @Override public String toString() { - return FilterValue.class.getSimpleName() + "[left=" + getLeft() + ", express=" + getExpress() + ", right=" + getRight() + "]"; + return FilterExpValue.class.getSimpleName() + "[left=" + getLeft() + ", express=" + getExpress() + ", right=" + getRight() + "]"; } } diff --git a/src/main/java/org/redkale/source/FilterNode.java b/src/main/java/org/redkale/source/FilterNode.java index 6164e5ba2..d98e202dc 100644 --- a/src/main/java/org/redkale/source/FilterNode.java +++ b/src/main/java/org/redkale/source/FilterNode.java @@ -709,27 +709,27 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则 return and(new FilterNode(LambdaFunction.readColumn(func), NOT_OPAND, value)); } - public FilterNode fvmode(String column, FilterValue value) { + public FilterNode fvmode(String column, FilterExpValue value) { return and(new FilterNode(column, FV_MOD, value)); } - public FilterNode fvmode(LambdaSupplier func) { + public FilterNode fvmode(LambdaSupplier func) { return and(new FilterNode(LambdaSupplier.readColumn(func), FV_MOD, func.get())); } - public FilterNode fvmode(LambdaFunction func, F value) { + public FilterNode fvmode(LambdaFunction func, F value) { return and(new FilterNode(LambdaFunction.readColumn(func), FV_MOD, value)); } - public FilterNode fvdiv(String column, FilterValue value) { + public FilterNode fvdiv(String column, FilterExpValue value) { return and(new FilterNode(column, FV_DIV, value)); } - public FilterNode fvdiv(LambdaSupplier func) { + public FilterNode fvdiv(LambdaSupplier func) { return and(new FilterNode(LambdaSupplier.readColumn(func), FV_DIV, func.get())); } - public FilterNode fvdiv(LambdaFunction func, F value) { + public FilterNode fvdiv(LambdaFunction func, F value) { return and(new FilterNode(LambdaFunction.readColumn(func), FV_DIV, value)); } @@ -967,12 +967,12 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则 return null; } if (express == FV_MOD || express == FV_DIV) { - FilterValue fv = (FilterValue) val0; + FilterExpValue fv = (FilterExpValue) val0; return new StringBuilder().append(info.getSQLColumn(talis, column)).append(' ').append(express.value()).append(' ').append(fv.getLeft()) .append(' ').append(fv.getExpress().value()).append(' ').append(fv.getRight()); } - final boolean fk = (val0 instanceof FilterKey); - CharSequence val = fk ? info.getSQLColumn(talis, ((FilterKey) val0).getColumn()) : formatToString(express, info.getSQLValue(column, (Serializable) val0)); + final boolean fk = (val0 instanceof FilterColValue); + CharSequence val = fk ? info.getSQLColumn(talis, ((FilterColValue) val0).getColumn()) : formatToString(express, info.getSQLValue(column, (Serializable) val0)); if (val == null) { return null; } @@ -996,7 +996,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则 } else if (express == IG_EQ || express == IG_NOT_EQ || express == IG_LIKE || express == IG_NOT_LIKE) { sb.append("LOWER(").append(info.getSQLColumn(talis, column)).append(')'); if (fk) { - val = "LOWER(" + info.getSQLColumn(talis, ((FilterKey) val0).getColumn()) + ')'; + val = "LOWER(" + info.getSQLColumn(talis, ((FilterColValue) val0).getColumn()) + ')'; } } else { sb.append(info.getSQLColumn(talis, column)); @@ -1374,10 +1374,10 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则 } } final Serializable val = (Serializable) val0; - final boolean fk = (val instanceof FilterKey); - final Attribute fkattr = fk ? cache.getAttribute(((FilterKey) val).getColumn()) : null; + final boolean fk = (val instanceof FilterColValue); + final Attribute fkattr = fk ? cache.getAttribute(((FilterColValue) val).getColumn()) : null; if (fk && fkattr == null) { - throw new SourceException(cache.getType() + " not found column(" + ((FilterKey) val).getColumn() + ")"); + throw new SourceException(cache.getType() + " not found column(" + ((FilterColValue) val).getColumn() + ")"); } switch (express) { case EQ: @@ -1598,7 +1598,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则 }; case FV_MOD: - FilterValue fv0 = (FilterValue) val; + FilterExpValue fv0 = (FilterExpValue) val; switch (fv0.getExpress()) { case EQ: return new Predicate() { @@ -1682,7 +1682,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口， 否则 throw new SourceException("(" + fv0 + ")'s express illegal, must be =, !=, <, >, <=, >="); } case FV_DIV: - FilterValue fv1 = (FilterValue) val; + FilterExpValue fv1 = (FilterExpValue) val; switch (fv1.getExpress()) { case EQ: return new Predicate() { diff --git a/src/main/java/org/redkale/source/FilterNodes.java b/src/main/java/org/redkale/source/FilterNodes.java index 6a4982ff6..7336dbe24 100644 --- a/src/main/java/org/redkale/source/FilterNodes.java +++ b/src/main/java/org/redkale/source/FilterNodes.java @@ -479,27 +479,27 @@ public final class FilterNodes { return new FilterNode(LambdaFunction.readColumn(func), NOT_OPAND, value); } - public static FilterNode fvmode(String column, FilterValue value) { + public static FilterNode fvmode(String column, FilterExpValue value) { return new FilterNode(column, FV_MOD, value); } - public static FilterNode fvmode(LambdaSupplier func) { + public static FilterNode fvmode(LambdaSupplier func) { return new FilterNode(LambdaSupplier.readColumn(func), FV_MOD, func.get()); } - public static FilterNode fvmode(LambdaFunction func, F value) { + public static FilterNode fvmode(LambdaFunction func, F value) { return new FilterNode(LambdaFunction.readColumn(func), FV_MOD, value); } - public static FilterNode fvdiv(String column, FilterValue value) { + public static FilterNode fvdiv(String column, FilterExpValue value) { return new FilterNode(column, FV_DIV, value); } - public static FilterNode fvdiv(LambdaSupplier func) { + public static FilterNode fvdiv(LambdaSupplier func) { return new FilterNode(LambdaSupplier.readColumn(func), FV_DIV, func.get()); } - public static FilterNode fvdiv(LambdaFunction func, F value) { + public static FilterNode fvdiv(LambdaFunction func, F value) { return new FilterNode(LambdaFunction.readColumn(func), FV_DIV, value); }