third_codes/mybatis-plus-join
1
0
Fork 0
mirror of https://gitee.com/best_handsome/mybatis-plus-join synced 2025-07-25 00:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix https://github.com/yulichang/mybatis-plus-join/issues/110

Browse Source
This commit is contained in:
yulichang 2024-01-30 20:50:45 +08:00
parent a0c8d9c797
commit 750b216156
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
View File

@ -12,7 +12,7 @@ import java.lang.annotation.*;
@Documented @Documented
@SuppressWarnings("unused") @SuppressWarnings("unused")
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE}) @Target(ElementType.FIELD)
public @interface EntityMapping { public @interface EntityMapping {
/** /**

4
mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
View File

@ -10,9 +10,9 @@ import java.lang.annotation.*;
* @since 1.2.0 * @since 1.2.0
*/ */
@Documented @Documented
@SuppressWarnings({"unused"}) @SuppressWarnings("unused")
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE}) @Target(ElementType.FIELD)
public @interface FieldMapping { public @interface FieldMapping {
/** /**

5
mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
View File

@ -40,7 +40,6 @@ import org.springframework.core.annotation.Order;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.function.BiPredicate; import java.util.function.BiPredicate;
@ -155,8 +154,8 @@ public class MybatisPlusJoinAutoConfiguration {
} }
@Override @Override
public <T> Map<String, T> getBeansOfType(Class<T> clazz) { public <T> void getBeansOfType(Class<T> clazz) {
return getBeanFactory().getBeansOfType(clazz); getBeanFactory().getBeansOfType(clazz);
} }
private ListableBeanFactory getBeanFactory() { private ListableBeanFactory getBeanFactory() {

13
mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
View File

@ -8,8 +8,8 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSession;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
/** /**
* spring容器工具类 * spring容器工具类
@ -29,15 +29,14 @@ public class SpringContentUtils {
} }
public static <T> T getBean(Class<T> clazz) { 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> void getBeansOfType(Class<T> clazz) {
public static <T> Map<String, T> getBeansOfType(Class<T> clazz) { Optional.ofNullable(springContext).ifPresent(c -> c.getBeansOfType(clazz));
return SpringContentUtils.springContext.getBeansOfType(clazz);
} }
@SuppressWarnings("unchecked") @SuppressWarnings({"unchecked", "deprecation"})
public static <T> T getMapper(Class<?> clazz) { public static <T> T getMapper(Class<?> clazz) {
if (Objects.isNull(springContext)) { if (Objects.isNull(springContext)) {
SqlSession session = SqlHelper.sqlSession(clazz); SqlSession session = SqlHelper.sqlSession(clazz);
@ -57,6 +56,6 @@ public class SpringContentUtils {
<T> T getBean(Class<T> clazz); <T> T getBean(Class<T> clazz);
<T> Map<String, T> getBeansOfType(Class<T> clazz); <T> void getBeansOfType(Class<T> clazz);
} }
} }

4
mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
View File

@ -44,8 +44,8 @@ public class XPluginImpl implements Plugin {
} }
@Override @Override
public <T> Map<String, T> getBeansOfType(Class<T> clazz) { public <T> void getBeansOfType(Class<T> clazz) {
return context.getBeansMapOfType(clazz); context.getBeansMapOfType(clazz);
} }
}); });
// 读取配置 // 读取配置