From f8fbabaef974ee848559f942f8dd453a0b4f95b5 Mon Sep 17 00:00:00 2001 From: redkale Date: Fri, 9 Aug 2024 15:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/boot/AppConfig.java | 9 ++++----- .../inject/ResourceAnnotationLoader.java | 17 +++++++++++++++-- .../org/redkale/inject/ResourceFactory.java | 10 +++++----- .../org/redkale/inject/ResourceTypeLoader.java | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/redkale/boot/AppConfig.java b/src/main/java/org/redkale/boot/AppConfig.java index bbe098afd..a182fb17b 100644 --- a/src/main/java/org/redkale/boot/AppConfig.java +++ b/src/main/java/org/redkale/boot/AppConfig.java @@ -3,10 +3,6 @@ */ package org.redkale.boot; -import static org.redkale.boot.Application.*; -import static org.redkale.util.RedkaleClassLoader.putReflectionClass; -import static org.redkale.util.RedkaleClassLoader.putReflectionPublicConstructors; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -24,10 +20,13 @@ import java.util.List; import java.util.Properties; import java.util.Set; import java.util.logging.SimpleFormatter; +import static org.redkale.boot.Application.*; import org.redkale.source.DataSources; import org.redkale.util.AnyValue; import org.redkale.util.AnyValueWriter; import org.redkale.util.RedkaleClassLoader; +import static org.redkale.util.RedkaleClassLoader.putReflectionClass; +import static org.redkale.util.RedkaleClassLoader.putReflectionPublicConstructors; import org.redkale.util.RedkaleException; import org.redkale.util.Utility; @@ -40,7 +39,7 @@ class AppConfig { /** * 当前进程的配置文件, 类型:String、URI、File、Path
- * 一般命名为: application.xml、application.onlyLogProps, 若配置文件不是本地文件, 则File、Path类型的值为null + * 一般命名为: application.xml、application.properties, 若配置文件不是本地文件, 则File、Path类型的值为null */ static final String PARAM_APP_CONF_FILE = "APP_CONF_FILE"; diff --git a/src/main/java/org/redkale/inject/ResourceAnnotationLoader.java b/src/main/java/org/redkale/inject/ResourceAnnotationLoader.java index 3455397ff..6cea31eba 100644 --- a/src/main/java/org/redkale/inject/ResourceAnnotationLoader.java +++ b/src/main/java/org/redkale/inject/ResourceAnnotationLoader.java @@ -68,7 +68,16 @@ import java.lang.reflect.Field; * @param Annotation */ public interface ResourceAnnotationLoader { - + /** + * 自定义的对象注入 + * + * @param factory ResourceFactory + * @param srcResourceName 依附对象的资源名 + * @param srcObj 资源依附对象 + * @param annotation 注解 + * @param field 字段对象 + * @param attachment 附加对象 + */ public void load( ResourceFactory factory, String srcResourceName, @@ -76,6 +85,10 @@ public interface ResourceAnnotationLoader { T annotation, Field field, Object attachment); - + /** + * 注入加载器对应的注解类型 + * + * @return 类型 + */ public Class annotationType(); } diff --git a/src/main/java/org/redkale/inject/ResourceFactory.java b/src/main/java/org/redkale/inject/ResourceFactory.java index 159bcf96e..ce1e4b90e 100644 --- a/src/main/java/org/redkale/inject/ResourceFactory.java +++ b/src/main/java/org/redkale/inject/ResourceFactory.java @@ -1191,7 +1191,7 @@ public final class ResourceFactory { /** * 注入资源对象 * - * @param srcResourceName 资源名 + * @param srcResourceName 依附对象的资源名 * @param srcObj 资源依附对象 * @return 是否成功注入 */ @@ -1203,7 +1203,7 @@ public final class ResourceFactory { * 注入资源对象 * * @param 泛型 - * @param srcResourceName 资源名 + * @param srcResourceName 依附对象的资源名 * @param srcObj 资源依附对象 * @param attachment 附加对象 * @return 是否成功注入 @@ -1215,7 +1215,7 @@ public final class ResourceFactory { /** * 注入资源对象 * - * @param srcResourceName 资源名 + * @param srcResourceName 依附对象的资源名 * @param srcObj 资源依附对象 * @param consumer 字段处理函数 * @return 是否成功注入 @@ -1228,7 +1228,7 @@ public final class ResourceFactory { * 注入资源对象 * * @param 泛型 - * @param srcResourceName 资源名 + * @param srcResourceName 依附对象的资源名 * @param srcObj 资源依附对象 * @param attachment 附加对象 * @param consumer 字段处理函数 @@ -1246,7 +1246,7 @@ public final class ResourceFactory { * 注入资源对象 * * @param 泛型 - * @param srcResourceName 资源名 + * @param srcResourceName 依附对象的资源名 * @param srcObj 资源依附对象 * @param attachment 附加对象 * @param consumer 字段处理函数 diff --git a/src/main/java/org/redkale/inject/ResourceTypeLoader.java b/src/main/java/org/redkale/inject/ResourceTypeLoader.java index 0cd068a98..644c56a9b 100644 --- a/src/main/java/org/redkale/inject/ResourceTypeLoader.java +++ b/src/main/java/org/redkale/inject/ResourceTypeLoader.java @@ -68,7 +68,7 @@ public interface ResourceTypeLoader { * * @param factory ResourceFactory * @param srcResourceName 依附对象的资源名 - * @param srcObj 依附对象 + * @param srcObj 资源依附对象 * @param resourceName 资源名 * @param field 字段对象 * @param attachment 附加对象