From 750b216156313223c117f46b7e5ca15f00528578 Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Tue, 30 Jan 2024 20:50:45 +0800 Subject: [PATCH] fix https://github.com/yulichang/mybatis-plus-join/issues/110 --- .../github/yulichang/annotation/EntityMapping.java | 2 +- .../github/yulichang/annotation/FieldMapping.java | 4 ++-- .../MybatisPlusJoinAutoConfiguration.java | 5 ++--- .../yulichang/toolkit/SpringContentUtils.java | 13 ++++++------- .../mybatisplusjoin/solon/plugin/XPluginImpl.java | 4 ++-- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java index 74e30ef..5af8df4 100644 --- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java +++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java @@ -12,7 +12,7 @@ import java.lang.annotation.*; @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 index 3ae7f4e..2ecf851 100644 --- 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 @@ import java.lang.annotation.*; * @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/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java index 37a17c1..fc68082 100644 --- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java +++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java @@ -40,7 +40,6 @@ import org.springframework.core.annotation.Order; 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 class MybatisPlusJoinAutoConfiguration { } @Override - public Map getBeansOfType(Class clazz) { - return getBeanFactory().getBeansOfType(clazz); + public void getBeansOfType(Class 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 index 5cbd1f2..8f42e60 100644 --- 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.AccessLevel; 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 class SpringContentUtils { } public static T getBean(Class clazz) { - return SpringContentUtils.springContext.getBean(clazz); + return Optional.ofNullable(springContext).map(c -> c.getBean(clazz)).orElse(null); } - @SuppressWarnings("UnusedReturnValue") - public static Map getBeansOfType(Class clazz) { - return SpringContentUtils.springContext.getBeansOfType(clazz); + public static void getBeansOfType(Class clazz) { + Optional.ofNullable(springContext).ifPresent(c -> c.getBeansOfType(clazz)); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "deprecation"}) public static T getMapper(Class clazz) { if (Objects.isNull(springContext)) { SqlSession session = SqlHelper.sqlSession(clazz); @@ -57,6 +56,6 @@ public class SpringContentUtils { T getBean(Class clazz); - Map getBeansOfType(Class clazz); + void getBeansOfType(Class clazz); } } diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java index fac0584..38b46a4 100644 --- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java +++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java @@ -44,8 +44,8 @@ public class XPluginImpl implements Plugin { } @Override - public Map getBeansOfType(Class clazz) { - return context.getBeansMapOfType(clazz); + public void getBeansOfType(Class clazz) { + context.getBeansMapOfType(clazz); } }); // 读取配置