diff --git a/storage/src/main/java/com/zfoo/storage/anno/StorageInjection.java b/storage/src/main/java/com/zfoo/storage/anno/StorageAutowired.java similarity index 96% rename from storage/src/main/java/com/zfoo/storage/anno/StorageInjection.java rename to storage/src/main/java/com/zfoo/storage/anno/StorageAutowired.java index 675a3866..62a22905 100644 --- a/storage/src/main/java/com/zfoo/storage/anno/StorageInjection.java +++ b/storage/src/main/java/com/zfoo/storage/anno/StorageAutowired.java @@ -28,7 +28,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) @Reflective -public @interface StorageInjection { +public @interface StorageAutowired { String value() default ""; diff --git a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java index 960ba2fa..13dc7448 100644 --- a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java +++ b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java @@ -21,7 +21,7 @@ import com.zfoo.storage.StorageContext; import com.zfoo.storage.anno.GraalvmNativeStorage; import com.zfoo.storage.anno.Id; import com.zfoo.storage.anno.Storage; -import com.zfoo.storage.anno.StorageInjection; +import com.zfoo.storage.anno.StorageAutowired; import com.zfoo.storage.config.StorageConfig; import com.zfoo.storage.interpreter.data.StorageEnum; import com.zfoo.storage.model.StorageDefinition; @@ -139,7 +139,7 @@ public class StorageManager implements IStorageManager { var componentBeans = applicationContext.getBeansWithAnnotation(Component.class); for (var bean : componentBeans.values()) { var clazz = bean.getClass(); - ReflectionUtils.filterFieldsInClass(clazz, field -> field.isAnnotationPresent(StorageInjection.class), field -> { + ReflectionUtils.filterFieldsInClass(clazz, field -> field.isAnnotationPresent(StorageAutowired.class), field -> { Type type = field.getGenericType(); if (!(type instanceof ParameterizedType)) { diff --git a/storage/src/test/java/com/zfoo/storage/StudentManager.java b/storage/src/test/java/com/zfoo/storage/StudentManager.java index 537596ce..2e78959b 100644 --- a/storage/src/test/java/com/zfoo/storage/StudentManager.java +++ b/storage/src/test/java/com/zfoo/storage/StudentManager.java @@ -13,7 +13,7 @@ package com.zfoo.storage; -import com.zfoo.storage.anno.StorageInjection; +import com.zfoo.storage.anno.StorageAutowired; import com.zfoo.storage.manager.IStorage; import com.zfoo.storage.resource.StudentCsvResource; import com.zfoo.storage.resource.StudentResource; @@ -26,9 +26,9 @@ import org.springframework.stereotype.Component; @Component public class StudentManager { - @StorageInjection + @StorageAutowired public IStorage studentResources; - @StorageInjection + @StorageAutowired public IStorage studentCsvResources; } diff --git a/storage/src/test/java/com/zfoo/storage/TestManager.java b/storage/src/test/java/com/zfoo/storage/TestManager.java index ad234ea5..c62fa54a 100644 --- a/storage/src/test/java/com/zfoo/storage/TestManager.java +++ b/storage/src/test/java/com/zfoo/storage/TestManager.java @@ -13,7 +13,7 @@ package com.zfoo.storage; -import com.zfoo.storage.anno.StorageInjection; +import com.zfoo.storage.anno.StorageAutowired; import com.zfoo.storage.manager.IStorage; import com.zfoo.storage.resource.TestResource; import org.springframework.stereotype.Component; @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; @Component public class TestManager { - @StorageInjection + @StorageAutowired public IStorage testResources; }