refactor(基础模块): 优化对clob的支持

zhou-hao · zhou-hao · commit d429295df9fb · 2025-11-08T13:11:59.000+08:00
diff --git a/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/ValueCodec.java b/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/ValueCodec.java
@@ -12,6 +12,10 @@ default E encodeNull(){
 
     D decode(Object data);
 
+    default E encodeNull(ColumnMetadata column){
+        return encodeNull();
+    }
+
     default E encode(Object value, ColumnMetadata column){
         return encode(value);
     }
diff --git a/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/meta/AbstractColumnMetadata.java b/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/meta/AbstractColumnMetadata.java
@@ -58,7 +58,7 @@ public Object decode(Object data) {
     public Object encode(Object data) {
         if (data == null) {
             if (valueCodec != null) {
-                return valueCodec.encodeNull();
+                return valueCodec.encodeNull(this);
             }
             return null;
         }
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValueCodec.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValueCodec.java
@@ -5,6 +5,8 @@
 import lombok.SneakyThrows;
 import org.hswebframework.ezorm.core.ValueCodec;
 import org.hswebframework.ezorm.core.meta.ColumnMetadata;
+import org.hswebframework.ezorm.rdb.executor.NullValue;
+import org.hswebframework.ezorm.rdb.metadata.DataType;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
 import org.hswebframework.ezorm.rdb.utils.FeatureUtils;
 import reactor.core.publisher.Flux;
@@ -21,14 +23,29 @@ public class ClobValueCodec implements ValueCodec {
 
     public static final ClobValueCodec INSTANCE = new ClobValueCodec();
 
+    static boolean isClobType(DataType type) {
+        return type.getSqlType() == JDBCType.LONGVARCHAR ||
+            type.getSqlType() == JDBCType.LONGNVARCHAR ||
+            type.getSqlType() == JDBCType.CLOB;
+    }
+
+    @Override
+    public Object encodeNull(ColumnMetadata column) {
+        if (column instanceof RDBColumnMetadata col) {
+            if (ClobValueCodec.isClobType(col.getType())) {
+                return NullValue.of(LongCharSequence.class, col.getType());
+            }
+            return NullValue.of(col.getType());
+        }
+        return null;
+    }
+
     @Override
     public Object encode(Object value, ColumnMetadata column) {
         Object val = this.encode(value);
         if (val instanceof CharSequence cs && column instanceof RDBColumnMetadata col) {
-            if (col.getType().getSqlType() == JDBCType.LONGVARCHAR ||
-                col.getType().getSqlType() == JDBCType.LONGNVARCHAR ||
-                col.getType().getSqlType() == JDBCType.CLOB) {
-                return new ClobValue(cs);
+            if (ClobValueCodec.isClobType(col.getType())) {
+                return new LongCharSequence(cs);
             }
         }
         return val;
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/JsonValueCodec.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/JsonValueCodec.java
@@ -11,6 +11,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.ezorm.core.ValueCodec;
 import org.hswebframework.ezorm.core.meta.ColumnMetadata;
+import org.hswebframework.ezorm.rdb.executor.NullValue;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
 import org.hswebframework.ezorm.rdb.utils.FeatureUtils;
 import org.reactivestreams.Publisher;
@@ -24,7 +25,6 @@
 import java.nio.ByteBuffer;
 import java.sql.Blob;
 import java.sql.Clob;
-import java.sql.JDBCType;
 import java.util.Collection;
 import java.util.Map;
 import java.util.TimeZone;
@@ -104,15 +104,25 @@ public JsonValueCodec(Class<?> targetType, JavaType type) {
         this.targetType = targetType;
     }
 
+    @Override
+    public Object encodeNull(ColumnMetadata column) {
+        if (column instanceof RDBColumnMetadata col) {
+            // clob 类型
+            if (ClobValueCodec.isClobType(col.getType())) {
+                return NullValue.of(LongCharSequence.class, col.getType());
+            }
+            return NullValue.of(col.getType());
+        }
+        return ValueCodec.super.encodeNull(column);
+    }
+
     @Override
     public Object encode(Object value, ColumnMetadata column) {
         Object data = encode(value);
         if (data instanceof CharSequence cs && column instanceof RDBColumnMetadata col) {
             // clob 类型
-            if (col.getType().getSqlType() == JDBCType.LONGVARCHAR ||
-                col.getType().getSqlType() == JDBCType.LONGNVARCHAR ||
-                col.getType().getSqlType() == JDBCType.CLOB) {
-                return new ClobValue(cs);
+            if (ClobValueCodec.isClobType(col.getType())) {
+                return new LongCharSequence(cs);
             }
         }
         return data;
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/LongCharSequence.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/LongCharSequence.java
@@ -1,18 +1,16 @@
 package org.hswebframework.ezorm.rdb.codec;
 
-import org.reactivestreams.Publisher;
 import reactor.util.annotation.NonNull;
 
-import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.stream.IntStream;
 
-public class ClobValue implements CharSequence {
+public class LongCharSequence implements CharSequence {
 
     private final CharSequence charSequence;
 
-    public ClobValue(CharSequence charSequence) {
+    public LongCharSequence(CharSequence charSequence) {
         this.charSequence = charSequence;
     }
 
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/NullValue.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/NullValue.java
@@ -8,18 +8,21 @@
 @Getter
 @AllArgsConstructor(staticName = "of")
 public class NullValue {
-    @Deprecated
-    private Class type;
 
-    @NonNull
+    private Class<?> type;
+
     private DataType dataType;
 
-    public static NullValue of(DataType dataType){
-        return of(dataType.getJavaType(),dataType);
+    public static NullValue of(DataType dataType) {
+        return of(dataType.getJavaType(), dataType);
+    }
+
+    public Class<?> getType() {
+        return type == null ? dataType.getJavaType() : type;
     }
 
     @Override
     public String toString() {
-        return "null" + (dataType==null?"": (type != null ? "(" + dataType.getId() + ")" : ""));
+        return "null" + (type != null ? "("+type.getSimpleName()+")" : (dataType != null ? "(" + dataType.getId() + ")" : ""));
     }
 }
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/jdbc/JdbcSqlExecutorHelper.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/jdbc/JdbcSqlExecutorHelper.java
@@ -1,12 +1,11 @@
 package org.hswebframework.ezorm.rdb.executor.jdbc;
 
 import lombok.SneakyThrows;
-import org.hswebframework.ezorm.rdb.codec.ClobValue;
+import org.hswebframework.ezorm.rdb.codec.LongCharSequence;
 import org.hswebframework.ezorm.rdb.executor.NullValue;
 
-import javax.sql.rowset.serial.SerialClob;
 import java.io.ByteArrayInputStream;
-import java.io.CharArrayReader;
+import java.io.StringReader;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.Date;
@@ -38,18 +37,22 @@ protected static void preparedStatementParameter(PreparedStatement statement, Ob
         for (Object object : parameter) {
             if (object == null) {
                 statement.setNull(index++, Types.NULL);
-            } else if (object instanceof NullValue) {
-                statement.setNull(index++, ((NullValue) object).getDataType().getSqlType().getVendorTypeNumber());
+            } else if (object instanceof NullValue nullValue) {
+                Class<?> javaType = nullValue.getType();
+                if (LongCharSequence.class == javaType) {
+                    statement.setCharacterStream(index++, new StringReader(""));
+                } else {
+                    statement.setNull(index++, nullValue.getDataType().getSqlType().getVendorTypeNumber());
+                }
             } else if (object instanceof Date) {
                 statement.setTimestamp(index++, new java.sql.Timestamp(((Date) object).getTime()));
             } else if (object instanceof byte[] b) {
                 statement.setBlob(index++, new ByteArrayInputStream(b));
-            } else if (object instanceof ClobValue cb) {
+            } else if (object instanceof LongCharSequence cb) {
                 statement.setCharacterStream(index++, cb.reader());
             } else {
                 statement.setObject(index++, object);
             }
-
         }
     }
 
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/reactive/r2dbc/R2dbcReactiveSqlExecutor.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/reactive/r2dbc/R2dbcReactiveSqlExecutor.java
@@ -5,7 +5,7 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.ezorm.core.CastUtil;
-import org.hswebframework.ezorm.rdb.codec.ClobValue;
+import org.hswebframework.ezorm.rdb.codec.LongCharSequence;
 import org.hswebframework.ezorm.rdb.executor.BatchSqlRequest;
 import org.hswebframework.ezorm.rdb.executor.DefaultColumnWrapperContext;
 import org.hswebframework.ezorm.rdb.executor.NullValue;
@@ -251,11 +251,15 @@ protected Statement prepareStatement(Statement statement, SqlRequest request) {
         for (Object parameter : request.getParameters()) {
             if (parameter == null) {
                 bindNull(statement, index, String.class);
-            } else if (parameter instanceof NullValue) {
-                bindNull(statement, index, ((NullValue) parameter).getDataType().getJavaType());
+            } else if (parameter instanceof NullValue nullValue) {
+                Class<?> javaType = nullValue.getType();
+                if (javaType == LongCharSequence.class) {
+                    javaType = Clob.class;
+                }
+                bindNull(statement, index, javaType);
             } else {
                 // convert clob
-                if (parameter instanceof ClobValue cb) {
+                if (parameter instanceof LongCharSequence cb) {
                     parameter = Clob.from(Mono.just(cb.source()));
                 }
                 bind(statement, index, parameter);
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/metadata/RDBColumnMetadata.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/metadata/RDBColumnMetadata.java
@@ -221,7 +221,7 @@ public RDBColumnMetadata clone() {
     public Object encode(Object data) {
         if (data == null || data instanceof NullValue) {
             if (valueCodec != null) {
-                Object newVal = valueCodec.encodeNull();
+                Object newVal = valueCodec.encodeNull(this);
                 if (newVal != null) {
                     return newVal;
                 }
diff --git a/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/BasicCommonTests.java b/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/BasicCommonTests.java
diff --git a/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/BasicReactiveTests.java b/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/BasicReactiveTests.java
diff --git a/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleR2dbcConnectionProvider.java b/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleR2dbcConnectionProvider.java

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ default E encodeNull(){`
`12`	`12`
`13`	`13`	`D decode(Object data);`
`14`	`14`
	`15`	`+ default E encodeNull(ColumnMetadata column){`
	`16`	`+ return encodeNull();`
	`17`	`+ }`
	`18`	`+`
`15`	`19`	`default E encode(Object value, ColumnMetadata column){`
`16`	`20`	`return encode(value);`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public Object decode(Object data) {`
`58`	`58`	`public Object encode(Object data) {`
`59`	`59`	`if (data == null) {`
`60`	`60`	`if (valueCodec != null) {`
`61`		`- return valueCodec.encodeNull();`
	`61`	`+ return valueCodec.encodeNull(this);`
`62`	`62`	`}`
`63`	`63`	`return null;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public RDBColumnMetadata clone() {`
`221`	`221`	`public Object encode(Object data) {`
`222`	`222`	`if (data == null \|\| data instanceof NullValue) {`
`223`	`223`	`if (valueCodec != null) {`
`224`		`- Object newVal = valueCodec.encodeNull();`
	`224`	`+ Object newVal = valueCodec.encodeNull(this);`
`225`	`225`	`if (newVal != null) {`
`226`	`226`	`return newVal;`
`227`	`227`	`}`