From 3fdea1b1d822a7ef1d12b7436dd47c6dfd9eeaa1 Mon Sep 17 00:00:00 2001 From: redkale Date: Sat, 27 Jan 2024 08:36:24 +0800 Subject: [PATCH] DynClassDepends --- .../annotation/ConstructorParameters.java | 3 +- .../DynClassDepends.java} | 6 +-- .../org/redkale/cache/spi/CacheAction.java | 6 +-- .../java/org/redkale/convert/Decodeable.java | 4 +- .../java/org/redkale/convert/Encodeable.java | 4 +- src/main/java/org/redkale/convert/Writer.java | 4 +- .../org/redkale/convert/json/JsonWriter.java | 34 +++++++-------- .../java/org/redkale/mq/MessageConsumer.java | 4 +- .../java/org/redkale/mq/ResourceConsumer.java | 4 +- .../org/redkale/net/http/HttpRequest.java | 42 +++++++++---------- src/main/java/org/redkale/net/http/Rest.java | 3 +- .../org/redkale/net/sncp/SncpResponse.java | 4 +- .../org/redkale/source/DataSqlMapper.java | 6 +-- .../org/redkale/source/DataSqlSource.java | 36 ++++++++-------- .../java/org/redkale/util/ThrowSupplier.java | 4 +- src/main/java/org/redkale/util/Utility.java | 6 +-- 16 files changed, 85 insertions(+), 85 deletions(-) rename src/main/java/org/redkale/{asm/AsmDepends.java => annotation/DynClassDepends.java} (73%) diff --git a/src/main/java/org/redkale/annotation/ConstructorParameters.java b/src/main/java/org/redkale/annotation/ConstructorParameters.java index 420fd06cf..c34c8cc35 100644 --- a/src/main/java/org/redkale/annotation/ConstructorParameters.java +++ b/src/main/java/org/redkale/annotation/ConstructorParameters.java @@ -8,7 +8,6 @@ package org.redkale.annotation; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; -import org.redkale.asm.AsmDepends; /** * 类似java.beans.ConstructorProperties, 必须配合Creator使用 @@ -21,7 +20,7 @@ import org.redkale.asm.AsmDepends; @Documented @Target({METHOD, CONSTRUCTOR}) @Retention(RUNTIME) -@AsmDepends +@DynClassDepends public @interface ConstructorParameters { String[] value(); diff --git a/src/main/java/org/redkale/asm/AsmDepends.java b/src/main/java/org/redkale/annotation/DynClassDepends.java similarity index 73% rename from src/main/java/org/redkale/asm/AsmDepends.java rename to src/main/java/org/redkale/annotation/DynClassDepends.java index e0fcf8c8e..4c2ae90cd 100644 --- a/src/main/java/org/redkale/asm/AsmDepends.java +++ b/src/main/java/org/redkale/annotation/DynClassDepends.java @@ -1,14 +1,14 @@ /* * */ -package org.redkale.asm; +package org.redkale.annotation; import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; /** - * 被标记的元素表示会被asm动态字节码调用到 + * 被标记的元素表示会被动态字节码调用 * *

* 详情见: https://redkale.org @@ -20,7 +20,7 @@ import static java.lang.annotation.RetentionPolicy.*; @Documented @Target({TYPE, METHOD, FIELD}) @Retention(SOURCE) -public @interface AsmDepends { +public @interface DynClassDepends { Class[] value() default {}; } diff --git a/src/main/java/org/redkale/cache/spi/CacheAction.java b/src/main/java/org/redkale/cache/spi/CacheAction.java index e21bc567f..0adc4da6c 100644 --- a/src/main/java/org/redkale/cache/spi/CacheAction.java +++ b/src/main/java/org/redkale/cache/spi/CacheAction.java @@ -10,13 +10,13 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import org.redkale.annotation.Nullable; import org.redkale.annotation.Resource; -import org.redkale.asm.AsmDepends; import org.redkale.cache.CacheManager; import org.redkale.convert.json.JsonConvert; import org.redkale.util.Environment; import org.redkale.util.MultiHashKey; import org.redkale.util.ThrowSupplier; import org.redkale.util.TypeToken; +import org.redkale.annotation.DynClassDepends; /** * @@ -29,7 +29,7 @@ import org.redkale.util.TypeToken; * * @since 2.8.0 */ -@AsmDepends +@DynClassDepends public class CacheAction { @Resource @@ -102,7 +102,7 @@ public class CacheAction { this.remoteExpire = createDuration(cached.getRemoteExpire()); } - @AsmDepends + @DynClassDepends public T get(ThrowSupplier supplier, Object... args) { if (async) { ThrowSupplier supplier0 = supplier; diff --git a/src/main/java/org/redkale/convert/Decodeable.java b/src/main/java/org/redkale/convert/Decodeable.java index fff9ba86e..41b0b7a83 100644 --- a/src/main/java/org/redkale/convert/Decodeable.java +++ b/src/main/java/org/redkale/convert/Decodeable.java @@ -6,7 +6,7 @@ package org.redkale.convert; import java.lang.reflect.Type; -import org.redkale.asm.AsmDepends; +import org.redkale.annotation.DynClassDepends; /** * 反序列化操作类 @@ -18,7 +18,7 @@ import org.redkale.asm.AsmDepends; * @param Reader输入的子类 * @param 反解析的数据类型 */ -@AsmDepends +@DynClassDepends public interface Decodeable { /** diff --git a/src/main/java/org/redkale/convert/Encodeable.java b/src/main/java/org/redkale/convert/Encodeable.java index f279f07c2..769db72a5 100644 --- a/src/main/java/org/redkale/convert/Encodeable.java +++ b/src/main/java/org/redkale/convert/Encodeable.java @@ -6,7 +6,7 @@ package org.redkale.convert; import java.lang.reflect.Type; -import org.redkale.asm.AsmDepends; +import org.redkale.annotation.DynClassDepends; /** * 序列化操作类 @@ -18,7 +18,7 @@ import org.redkale.asm.AsmDepends; * @param Writer输出的子类 * @param 序列化的数据类型 */ -@AsmDepends +@DynClassDepends public interface Encodeable { /** diff --git a/src/main/java/org/redkale/convert/Writer.java b/src/main/java/org/redkale/convert/Writer.java index f15ea7c2b..a99092d09 100644 --- a/src/main/java/org/redkale/convert/Writer.java +++ b/src/main/java/org/redkale/convert/Writer.java @@ -7,8 +7,8 @@ package org.redkale.convert; import java.lang.reflect.*; import java.util.function.*; -import org.redkale.asm.AsmDepends; import org.redkale.util.*; +import org.redkale.annotation.DynClassDepends; /** * 序列化的数据输出流 @@ -131,7 +131,7 @@ public abstract class Writer { * * @param clazz 对象的类名 */ - @AsmDepends + @DynClassDepends public final void writeObjectNull(final Class clazz) { writeClassName(null); writeNull(); diff --git a/src/main/java/org/redkale/convert/json/JsonWriter.java b/src/main/java/org/redkale/convert/json/JsonWriter.java index 82afdffdc..618a3a14c 100644 --- a/src/main/java/org/redkale/convert/json/JsonWriter.java +++ b/src/main/java/org/redkale/convert/json/JsonWriter.java @@ -6,8 +6,8 @@ package org.redkale.convert.json; import java.lang.reflect.Type; -import org.redkale.asm.AsmDepends; import org.redkale.convert.*; +import org.redkale.annotation.DynClassDepends; /** * @@ -29,7 +29,7 @@ public abstract class JsonWriter extends Writer { return (JsonWriter) super.withFeatures(features); } - @AsmDepends + @DynClassDepends public boolean isExtFuncEmpty() { return this.objExtFunc == null && this.objFieldFunc == null; } @@ -49,57 +49,57 @@ public abstract class JsonWriter extends Writer { * @param quote 是否加双引号 * @param value 非null且不含需要转义的字符的String值 */ - @AsmDepends + @DynClassDepends public abstract void writeLatin1To(final boolean quote, final String value); - @AsmDepends + @DynClassDepends public abstract void writeFieldShortValue(final byte[] fieldBytes, final short value); - @AsmDepends + @DynClassDepends public abstract void writeFieldIntValue(final byte[] fieldBytes, final int value); - @AsmDepends + @DynClassDepends public abstract void writeFieldLongValue(final byte[] fieldBytes, final long value); - @AsmDepends + @DynClassDepends public abstract void writeFieldLatin1Value(final byte[] fieldBytes, final String value); - @AsmDepends + @DynClassDepends public abstract void writeLastFieldShortValue(final byte[] fieldBytes, final short value); - @AsmDepends + @DynClassDepends public abstract void writeLastFieldIntValue(final byte[] fieldBytes, final int value); - @AsmDepends + @DynClassDepends public abstract void writeLastFieldLongValue(final byte[] fieldBytes, final long value); - @AsmDepends + @DynClassDepends public abstract void writeLastFieldLatin1Value(final byte[] fieldBytes, final String value); //firstFieldBytes 必须带{开头 - @AsmDepends + @DynClassDepends public abstract void writeObjectByOnlyOneLatin1FieldValue(final byte[] firstFieldBytes, final String value); //firstFieldBytes 必须带{开头, lastFieldBytes必须,开头 - @AsmDepends + @DynClassDepends public abstract void writeObjectByOnlyTwoIntFieldValue(final byte[] firstFieldBytes, final int value1, final byte[] lastFieldBytes, final int value2); @Override - @AsmDepends + @DynClassDepends public abstract void writeBoolean(boolean value); @Override - @AsmDepends + @DynClassDepends public abstract void writeInt(int value); @Override - @AsmDepends + @DynClassDepends public abstract void writeLong(long value); public abstract void writeString(final boolean quote, String value); @Override - @AsmDepends + @DynClassDepends public abstract void writeString(String value); @Override //只容许JsonBytesWriter重写此方法 diff --git a/src/main/java/org/redkale/mq/MessageConsumer.java b/src/main/java/org/redkale/mq/MessageConsumer.java index 05ecef472..7646ada1b 100644 --- a/src/main/java/org/redkale/mq/MessageConsumer.java +++ b/src/main/java/org/redkale/mq/MessageConsumer.java @@ -4,9 +4,9 @@ package org.redkale.mq; import org.redkale.annotation.Component; -import org.redkale.asm.AsmDepends; import org.redkale.service.Local; import org.redkale.util.AnyValue; +import org.redkale.annotation.DynClassDepends; /** * MQ消费器, 实现类必须标记{@link org.redkale.mq.ResourceConsumer} @@ -21,7 +21,7 @@ import org.redkale.util.AnyValue; */ @Local @Component -@AsmDepends +@DynClassDepends public interface MessageConsumer { default void init(AnyValue config) { diff --git a/src/main/java/org/redkale/mq/ResourceConsumer.java b/src/main/java/org/redkale/mq/ResourceConsumer.java index a063fc80f..ff701efac 100644 --- a/src/main/java/org/redkale/mq/ResourceConsumer.java +++ b/src/main/java/org/redkale/mq/ResourceConsumer.java @@ -6,8 +6,8 @@ package org.redkale.mq; import java.lang.annotation.*; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import org.redkale.asm.AsmDepends; import org.redkale.convert.ConvertType; +import org.redkale.annotation.DynClassDepends; /** * MQ资源注解, 只能标记在{@link org.redkale.mq.MessageConsumer}子类上 @@ -19,7 +19,7 @@ import org.redkale.convert.ConvertType; * * @since 2.8.0 */ -@AsmDepends +@DynClassDepends @Documented @Target({TYPE}) @Retention(RUNTIME) diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java index 50a7d0fc8..54a58d6a7 100644 --- a/src/main/java/org/redkale/net/http/HttpRequest.java +++ b/src/main/java/org/redkale/net/http/HttpRequest.java @@ -14,13 +14,13 @@ import java.util.*; import java.util.function.Supplier; import java.util.logging.Level; import org.redkale.annotation.Comment; -import org.redkale.asm.AsmDepends; import org.redkale.convert.*; import org.redkale.convert.json.JsonConvert; import org.redkale.net.Request; import org.redkale.util.*; import static org.redkale.util.Utility.isEmpty; import static org.redkale.util.Utility.isNotEmpty; +import org.redkale.annotation.DynClassDepends; /** * Http请求包 与javax.servlet.http.HttpServletRequest 基本类似。
@@ -1181,7 +1181,7 @@ public class HttpRequest extends Request { * * @since 2.4.0 */ - @AsmDepends + @DynClassDepends @SuppressWarnings("unchecked") public int currentIntUserid() { if (currentUserid == CURRUSERID_NIL || currentUserid == null) { @@ -1201,7 +1201,7 @@ public class HttpRequest extends Request { * * @since 2.7.0 */ - @AsmDepends + @DynClassDepends @SuppressWarnings("unchecked") public long currentLongUserid() { if (currentUserid == CURRUSERID_NIL || currentUserid == null) { @@ -1221,7 +1221,7 @@ public class HttpRequest extends Request { * * @since 2.8.0 */ - @AsmDepends + @DynClassDepends @SuppressWarnings("unchecked") public String currentStringUserid() { if (currentUserid == CURRUSERID_NIL || currentUserid == null) { @@ -1240,7 +1240,7 @@ public class HttpRequest extends Request { * * @since 2.1.0 */ - @AsmDepends + @DynClassDepends @SuppressWarnings("unchecked") public T currentUserid(Class type) { if (currentUserid == CURRUSERID_NIL || currentUserid == null) { @@ -2163,7 +2163,7 @@ public class HttpRequest extends Request { * * @return AnyValue */ - @AsmDepends + @DynClassDepends public HttpHeaders getHeaders() { parseHeader(); return headers; @@ -2199,7 +2199,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public String getHeader(String name, String defaultValue) { parseHeader(); return headers.firstValue(name, defaultValue); @@ -2214,7 +2214,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public T getJsonHeader(java.lang.reflect.Type type, String name) { String v = getHeader(name); return isEmpty(v) ? null : jsonConvert.convertFrom(type, v); @@ -2230,7 +2230,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public T getJsonHeader(JsonConvert convert, java.lang.reflect.Type type, String name) { String v = getHeader(name); return isEmpty(v) ? null : convert.convertFrom(type, v); @@ -2244,7 +2244,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public boolean getBooleanHeader(String name, boolean defaultValue) { String value = getHeader(name); return isEmpty(value) ? defaultValue : Boolean.parseBoolean(value); @@ -2258,7 +2258,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public short getShortHeader(String name, short defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2280,7 +2280,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public short getShortHeader(int radix, String name, short defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2301,7 +2301,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public short getShortHeader(String name, int defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2323,7 +2323,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public short getShortHeader(int radix, String name, int defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2344,7 +2344,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public int getIntHeader(String name, int defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2366,7 +2366,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public int getIntHeader(int radix, String name, int defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2387,7 +2387,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public long getLongHeader(String name, long defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2409,7 +2409,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public long getLongHeader(int radix, String name, long defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2430,7 +2430,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public float getFloatHeader(String name, float defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2451,7 +2451,7 @@ public class HttpRequest extends Request { * * @return header值 */ - @AsmDepends + @DynClassDepends public double getDoubleHeader(String name, double defaultValue) { String value = getHeader(name); if (isEmpty(value)) { @@ -2470,7 +2470,7 @@ public class HttpRequest extends Request { * * @return AnyValue */ - @AsmDepends + @DynClassDepends public HttpParameters getParameters() { parseBody(); return params; diff --git a/src/main/java/org/redkale/net/http/Rest.java b/src/main/java/org/redkale/net/http/Rest.java index daf81381e..6aaf1c6f5 100644 --- a/src/main/java/org/redkale/net/http/Rest.java +++ b/src/main/java/org/redkale/net/http/Rest.java @@ -31,6 +31,7 @@ import org.redkale.source.Flipper; import org.redkale.util.*; import org.redkale.util.RedkaleClassLoader.DynBytesClassLoader; import static org.redkale.util.Utility.isEmpty; +import org.redkale.annotation.DynClassDepends; /** *

@@ -293,7 +294,7 @@ public final class Rest { } //仅供Rest动态构建里 currentUserid() 使用 - @AsmDepends + @DynClassDepends public static T orElse(T t, T defValue) { return t == null ? defValue : t; } diff --git a/src/main/java/org/redkale/net/sncp/SncpResponse.java b/src/main/java/org/redkale/net/sncp/SncpResponse.java index 249d63aed..7391644e0 100644 --- a/src/main/java/org/redkale/net/sncp/SncpResponse.java +++ b/src/main/java/org/redkale/net/sncp/SncpResponse.java @@ -8,13 +8,13 @@ package org.redkale.net.sncp; import java.lang.reflect.Type; import java.nio.channels.CompletionHandler; import java.util.concurrent.*; -import org.redkale.asm.AsmDepends; import org.redkale.convert.bson.BsonWriter; import org.redkale.net.Response; import static org.redkale.net.sncp.SncpHeader.KEEPALIVE_OFF; import static org.redkale.net.sncp.SncpHeader.KEEPALIVE_ON; import org.redkale.util.ByteArray; import org.redkale.util.Traces; +import org.redkale.annotation.DynClassDepends; /** * @@ -86,7 +86,7 @@ public class SncpResponse extends Response { return this; } - @AsmDepends + @DynClassDepends public T getParamAsyncHandler() { return (T) this.paramAsyncHandler; } diff --git a/src/main/java/org/redkale/source/DataSqlMapper.java b/src/main/java/org/redkale/source/DataSqlMapper.java index a1893fcf9..225467fe6 100644 --- a/src/main/java/org/redkale/source/DataSqlMapper.java +++ b/src/main/java/org/redkale/source/DataSqlMapper.java @@ -10,11 +10,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; -import org.redkale.asm.AsmDepends; import org.redkale.util.LambdaFunction; import org.redkale.util.LambdaSupplier; import org.redkale.util.SelectColumn; import org.redkale.util.Sheet; +import org.redkale.annotation.DynClassDepends; /** * 类似Mybatis的Mapper接口类, 接口系列和DataSource相似度高
@@ -39,7 +39,7 @@ public interface DataSqlMapper { * * @return DataSqlSource */ - @AsmDepends + @DynClassDepends DataSqlSource dataSource(); /** @@ -48,7 +48,7 @@ public interface DataSqlMapper { * * @return Class */ - @AsmDepends + @DynClassDepends Class entityType(); /** diff --git a/src/main/java/org/redkale/source/DataSqlSource.java b/src/main/java/org/redkale/source/DataSqlSource.java index fd79c735b..e0b12d6cc 100644 --- a/src/main/java/org/redkale/source/DataSqlSource.java +++ b/src/main/java/org/redkale/source/DataSqlSource.java @@ -7,9 +7,9 @@ import java.io.Serializable; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.function.*; -import org.redkale.asm.AsmDepends; import static org.redkale.source.DataResultSet.formatColumnValue; import org.redkale.util.*; +import org.redkale.annotation.DynClassDepends; /** * @@ -21,7 +21,7 @@ import org.redkale.util.*; * @author zhangjx * @since 2.8.0 */ -@AsmDepends +@DynClassDepends public interface DataSqlSource extends DataSource { /** @@ -130,10 +130,10 @@ public interface DataSqlSource extends DataSource { */ public CompletableFuture nativeQueryAsync(String sql, BiConsumer consumer, Function handler, Map params); - @AsmDepends + @DynClassDepends public Sheet nativeQuerySheet(Class type, String sql, Flipper flipper, Map params); - @AsmDepends + @DynClassDepends public CompletableFuture> nativeQuerySheetAsync(Class type, String sql, Flipper flipper, Map params); //----------------------------- 无参数 ----------------------------- @@ -145,37 +145,37 @@ public interface DataSqlSource extends DataSource { return nativeQueryAsync(sql, null, handler); } - @AsmDepends + @DynClassDepends default V nativeQueryOne(Class type, String sql) { return nativeQuery(sql, rset -> EntityBuilder.getOneValue(type, rset)); } - @AsmDepends + @DynClassDepends default CompletableFuture nativeQueryOneAsync(Class type, String sql) { return nativeQueryAsync(sql, rset -> EntityBuilder.getOneValue(type, rset)); } - @AsmDepends + @DynClassDepends default List nativeQueryList(Class type, String sql) { return nativeQuery(sql, rset -> EntityBuilder.getListValue(type, rset)); } - @AsmDepends + @DynClassDepends default CompletableFuture> nativeQueryListAsync(Class type, String sql) { return nativeQueryAsync(sql, rset -> EntityBuilder.getListValue(type, rset)); } - @AsmDepends + @DynClassDepends default Sheet nativeQuerySheet(Class type, String sql, Flipper flipper) { return nativeQuerySheet(type, sql, flipper, Collections.emptyMap()); } - @AsmDepends + @DynClassDepends default CompletableFuture> nativeQuerySheetAsync(Class type, String sql, Flipper flipper) { return nativeQuerySheetAsync(type, sql, flipper, Collections.emptyMap()); } - @AsmDepends + @DynClassDepends default Map nativeQueryMap(Class keyType, Class valType, String sql) { return nativeQuery(sql, rset -> { Map map = new LinkedHashMap<>(); @@ -188,7 +188,7 @@ public interface DataSqlSource extends DataSource { }); } - @AsmDepends + @DynClassDepends default CompletableFuture> nativeQueryMapAsync(Class keyType, Class valType, String sql) { return nativeQueryAsync(sql, rset -> { Map map = new LinkedHashMap<>(); @@ -226,7 +226,7 @@ public interface DataSqlSource extends DataSource { return nativeQueryAsync(sql, null, handler, params); } - @AsmDepends + @DynClassDepends default V nativeQueryOne(Class type, String sql, Map params) { return nativeQuery(sql, rset -> { if (!rset.next()) { @@ -239,7 +239,7 @@ public interface DataSqlSource extends DataSource { }, params); } - @AsmDepends + @DynClassDepends default CompletableFuture nativeQueryOneAsync(Class type, String sql, Map params) { return nativeQueryAsync(sql, rset -> { if (!rset.next()) { @@ -252,7 +252,7 @@ public interface DataSqlSource extends DataSource { }, params); } - @AsmDepends + @DynClassDepends default List nativeQueryList(Class type, String sql, Map params) { return nativeQuery(sql, rset -> { if (EntityBuilder.isSimpleType(type)) { @@ -266,7 +266,7 @@ public interface DataSqlSource extends DataSource { }, params); } - @AsmDepends + @DynClassDepends default CompletableFuture> nativeQueryListAsync(Class type, String sql, Map params) { return nativeQueryAsync(sql, rset -> { if (EntityBuilder.isSimpleType(type)) { @@ -280,7 +280,7 @@ public interface DataSqlSource extends DataSource { }, params); } - @AsmDepends + @DynClassDepends default Map nativeQueryMap(Class keyType, Class valType, String sql, Map params) { return nativeQuery(sql, rset -> { Map map = new LinkedHashMap<>(); @@ -293,7 +293,7 @@ public interface DataSqlSource extends DataSource { }, params); } - @AsmDepends + @DynClassDepends default CompletableFuture> nativeQueryMapAsync(Class keyType, Class valType, String sql, Map params) { return nativeQueryAsync(sql, rset -> { Map map = new LinkedHashMap<>(); diff --git a/src/main/java/org/redkale/util/ThrowSupplier.java b/src/main/java/org/redkale/util/ThrowSupplier.java index 94c8065e4..765bcff6c 100644 --- a/src/main/java/org/redkale/util/ThrowSupplier.java +++ b/src/main/java/org/redkale/util/ThrowSupplier.java @@ -3,7 +3,7 @@ */ package org.redkale.util; -import org.redkale.asm.AsmDepends; +import org.redkale.annotation.DynClassDepends; /** * 抛异常版的Supplier @@ -16,7 +16,7 @@ import org.redkale.asm.AsmDepends; * * @since 2.8.0 */ -@AsmDepends +@DynClassDepends @FunctionalInterface public interface ThrowSupplier { diff --git a/src/main/java/org/redkale/util/Utility.java b/src/main/java/org/redkale/util/Utility.java index cc08a264a..1b094ac94 100644 --- a/src/main/java/org/redkale/util/Utility.java +++ b/src/main/java/org/redkale/util/Utility.java @@ -25,8 +25,8 @@ import java.util.stream.Stream; import java.util.zip.GZIPInputStream; import javax.crypto.*; import javax.crypto.spec.SecretKeySpec; -import org.redkale.asm.AsmDepends; import org.redkale.convert.json.JsonConvert; +import org.redkale.annotation.DynClassDepends; /** * @@ -1545,7 +1545,7 @@ public final class Utility { * * @return Map */ - @AsmDepends + @DynClassDepends public static HashMap ofMap(Object... items) { HashMap map = new LinkedHashMap<>(Math.max(1, items.length / 2)); int len = items.length / 2; @@ -3441,7 +3441,7 @@ public final class Utility { * * @return 对象 */ - @AsmDepends(Copier.class) + @DynClassDepends(Copier.class) public static T convertValue(Type type, Object value) { if (type == null || value == null) { return (T) value;