fix #110

yulichang · Jan 30, 2024 · 750b216 · 750b216
1 parent a0c8d9c
commit 750b216
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/...tis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java b/...tis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
@@ -12,7 +12,7 @@
 @Documented
 @SuppressWarnings("unused")
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target(ElementType.FIELD)
 public @interface EntityMapping {
 
     /**

diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
@@ -10,9 +10,9 @@
  * @since 1.2.0
  */
 @Documented
-@SuppressWarnings({"unused"})
+@SuppressWarnings("unused")
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target(ElementType.FIELD)
 public @interface FieldMapping {
 
     /**

diff --git a/...er/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/...er/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -40,7 +40,6 @@
 
 import javax.sql.DataSource;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiPredicate;
 
@@ -155,8 +154,8 @@ public <T> T getBean(Class<T> clazz) {
         }
 
         @Override
-        public <T> Map<String, T> getBeansOfType(Class<T> clazz) {
-            return getBeanFactory().getBeansOfType(clazz);
+        public <T> void getBeansOfType(Class<T> clazz) {
+            getBeanFactory().getBeansOfType(clazz);
         }
 
         private ListableBeanFactory getBeanFactory() {

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
@@ -8,8 +8,8 @@
 import lombok.NoArgsConstructor;
 import org.apache.ibatis.session.SqlSession;
 
-import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * spring容器工具类
@@ -29,15 +29,14 @@ public static void setSpringContext(SpringContext springContext) {
     }
 
     public static <T> T getBean(Class<T> clazz) {
-        return SpringContentUtils.springContext.getBean(clazz);
+        return Optional.ofNullable(springContext).map(c -> c.getBean(clazz)).orElse(null);
     }
 
-    @SuppressWarnings("UnusedReturnValue")
-    public static <T> Map<String, T> getBeansOfType(Class<T> clazz) {
-        return SpringContentUtils.springContext.getBeansOfType(clazz);
+    public static <T> void getBeansOfType(Class<T> clazz) {
+        Optional.ofNullable(springContext).ifPresent(c -> c.getBeansOfType(clazz));
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "deprecation"})
     public static <T> T getMapper(Class<?> clazz) {
         if (Objects.isNull(springContext)) {
             SqlSession session = SqlHelper.sqlSession(clazz);
@@ -57,6 +56,6 @@ public interface SpringContext {
 
         <T> T getBean(Class<T> clazz);
 
-        <T> Map<String, T> getBeansOfType(Class<T> clazz);
+        <T> void getBeansOfType(Class<T> clazz);
     }
 }
diff --git a/...n-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/...n-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -44,8 +44,8 @@ public <T> T getBean(Class<T> clazz) {
             }
 
             @Override
-            public <T> Map<String, T> getBeansOfType(Class<T> clazz) {
-                return context.getBeansMapOfType(clazz);
+            public <T> void getBeansOfType(Class<T> clazz) {
+                context.getBeansMapOfType(clazz);
             }
         });
         // 读取配置