From 1db9a92786b423b92d58fdad9d9354469a39632a Mon Sep 17 00:00:00 2001 From: kirito <731036390@qq.com> Date: Mon, 5 Jun 2023 17:10:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DStreamScannerRegistrar?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=8C=85=E6=97=B6basePackages=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE=E4=B8=8D=E5=90=88=E9=80=82?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StreamScannerConfigurer.java | 12 +++-- .../configuration/StreamScannerRegistrar.java | 4 ++ ...uginByAnnotationAndInterfaceClassTest.java | 10 ++-- ...ableMybatisPlusPluginByAnnotationTest.java | 8 +-- ...tisPlusPluginByBasePackageClassesTest.java | 8 +-- ...isPlusPluginByBasePackagesGeneralTest.java | 10 ++-- ...leMybatisPlusPluginByBasePackagesTest.java | 10 ++-- .../EnableMybatisPlusPluginByClassesTest.java | 8 +-- ...MybatisPlusPluginByInterfaceClassTest.java | 10 ++-- .../EnableMybatisPlusPluginByValueTest.java | 10 ++-- .../EnableMybatisPlusPluginTest.java | 8 +-- .../annotation/pojo/po/RoleInfo.java | 44 ++++++++++++++++ .../annotation/pojo/po/UserInfo.java | 51 +++++++++++++++++++ .../annotation/pojo/po/UserRole.java | 36 +++++++++++++ .../annotation/pojo/po/inner/AddressInfo.java | 43 ++++++++++++++++ .../annotation/pojo/po/package-info.java | 17 +++++++ 16 files changed, 243 insertions(+), 46 deletions(-) create mode 100644 stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/RoleInfo.java create mode 100644 stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserInfo.java create mode 100644 stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserRole.java create mode 100644 stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/inner/AddressInfo.java create mode 100644 stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/package-info.java diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java index 07a3613c..7283b643 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java @@ -50,6 +50,8 @@ public class StreamScannerConfigurer implements BeanFactoryPostProcessor { private Class annotation; /** scan interface */ private Class interfaceClass; + /** if basePackages is empty. */ + private boolean emptyBasePackages; public void setBasePackages(Set basePackages) { this.basePackages = basePackages; @@ -66,6 +68,10 @@ public class StreamScannerConfigurer implements BeanFactoryPostProcessor { public void setInterfaceClass(Class interfaceClass) { this.interfaceClass = interfaceClass; } + + public void setEmptyBasePackages(boolean emptyBasePackages) { + this.emptyBasePackages = emptyBasePackages; + } private void registerEntityClasses(Collection> entityClasses) { if (!CollectionUtils.isEmpty(entityClasses)) { @@ -93,12 +99,8 @@ public class StreamScannerConfigurer implements BeanFactoryPostProcessor { private void defaultScanConfig() { // default scan @TableName - if (CollectionUtils.isEmpty(basePackages) && annotation == null && interfaceClass == null) { + if (emptyBasePackages && annotation == null && interfaceClass == null) { annotation = TableName.class; } - // if no base package specified, scan project package - if (CollectionUtils.isEmpty(basePackages)) { - basePackages.add(""); - } } } diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java index 4389ad75..484a2bba 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java @@ -66,6 +66,10 @@ public class StreamScannerRegistrar implements ImportBeanDefinitionRegistrar { .filter(Objects::nonNull) .map(ClassUtils::getPackageName) .collect(Collectors.toSet())); + if (basePackages.isEmpty()) { + basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName())); + builder.addPropertyValue("emptyBasePackages", true); + } builder.addPropertyValue("basePackages", basePackages); Set> classes = diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java index 7be3aa32..a36e656e 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java @@ -16,14 +16,14 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.mapper.IGenerateMapper; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ @EnableAutoConfiguration @EnableMybatisPlusPlugin( - basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po", + basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po", annotation = GenerateMapper.class, interfaceClass = IGenerateMapper.class) public class EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java index 8c2dfad7..bb1dcb74 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java @@ -16,13 +16,13 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java index e3561bea..93104f02 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java @@ -16,12 +16,12 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java index b12cf6a6..5600c7f7 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java @@ -16,12 +16,12 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @author KamTo Hung */ @EnableAutoConfiguration -@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.*.pojo.po") +@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.*.pojo.po") public class EnableMybatisPlusPluginByBasePackagesGeneralTest extends AbstractMybatisPlusTestApplication { diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java index 665d5a58..a983db92 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java @@ -16,12 +16,12 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @author KamTo Hung */ @EnableAutoConfiguration -@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po") +@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po") public class EnableMybatisPlusPluginByBasePackagesTest extends AbstractMybatisPlusTestApplication { @Test diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java index 80710f52..574164ed 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java @@ -16,12 +16,12 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java index 9280a542..9effb341 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java @@ -16,13 +16,13 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.mapper.IGenerateMapper; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ @EnableAutoConfiguration @EnableMybatisPlusPlugin( - basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po", + basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po", interfaceClass = IGenerateMapper.class) public class EnableMybatisPlusPluginByInterfaceClassTest extends AbstractMybatisPlusTestApplication { diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java index 56dbc048..ba3f51d9 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java @@ -16,12 +16,12 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @author KamTo Hung */ @EnableAutoConfiguration -@EnableMybatisPlusPlugin("org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po") +@EnableMybatisPlusPlugin("org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po") public class EnableMybatisPlusPluginByValueTest extends AbstractMybatisPlusTestApplication { @Test diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java index 6a46ed11..9a23dc5e 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java @@ -16,12 +16,12 @@ */ package org.dromara.streamquery.stream.plugin.mybatisplus.annotation; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole; +import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin; import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole; -import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/RoleInfo.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/RoleInfo.java new file mode 100644 index 00000000..94ec3168 --- /dev/null +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/RoleInfo.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po; + +import lombok.Data; +import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +/** + * RoleInfo + * + * @author VampireAchao Cizai_ + * @since 2022/5/23 + */ +@Data +@GenerateMapper +@TableName("role_info") +@KeySequence(dbType = DbType.H2) +public class RoleInfo { + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + private String roleName; +} diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserInfo.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserInfo.java new file mode 100644 index 00000000..e4e9e2af --- /dev/null +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserInfo.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po; + +import java.time.LocalDateTime; + +import lombok.Data; +import org.dromara.streamquery.stream.plugin.mybatisplus.engine.mapper.IGenerateMapper; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; + +/** + * UserInfo + * + * @author VampireAchao Cizai_ + * @since 2022/5/21 + */ +@Data +@TableName("user_info") +public class UserInfo implements IGenerateMapper { + + private static final long serialVersionUID = -7219188882388819210L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private String name; + private Integer age; + private String email; + // @Version private Integer version; + + @TableLogic(value = "'2001-01-01 00:00:00'", delval = "NOW()") + private LocalDateTime gmtDeleted; +} diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserRole.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserRole.java new file mode 100644 index 00000000..7a68d932 --- /dev/null +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserRole.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po; + +import lombok.Data; + +import com.baomidou.mybatisplus.annotation.TableName; + +/** + * UserRole + * + * @author VampireAchao Cizai_ + * @since 2022/5/23 + */ +@Data +@TableName("user_role") +public class UserRole { + + private Long id; + private Long userId; + private String roleId; +} diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/inner/AddressInfo.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/inner/AddressInfo.java new file mode 100644 index 00000000..be30e109 --- /dev/null +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/inner/AddressInfo.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner; + +import lombok.Data; +import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; + +/** + * AddressInfo + * + * @author KamToHung + */ +@Data +@GenerateMapper +public class AddressInfo { + + @TableId(type = IdType.ASSIGN_ID) + private String id; + + private String address; + + @Data + public static class InnerAddressInfo { + private String id; + } +} diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/package-info.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/package-info.java new file mode 100644 index 00000000..28f792f9 --- /dev/null +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/package-info.java @@ -0,0 +1,17 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po; -- Gitee