Browse Source

3.0 分包 - solve test case package issue; fix most failed test cases

yuxiaobin 7 years ago
parent
commit
6766412e4a
100 changed files with 366 additions and 268 deletions
  1. 1 0
      mybatis-plus-extension/build.gradle
  2. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/CrudTest.java
  3. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/EntityWrapperTest.java
  4. 11 6
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/GlobalConfigurationTest.java
  5. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/IdWorkerTest.java
  6. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/MybatisMapperRefreshTest.java
  7. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/StringUtilsTest.java
  8. 5 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/activerecord/ActiveRecordTest.java
  9. 9 5
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2LogicDeleteTest.java
  10. 7 7
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MapUnderline2CamelTest.java
  11. 6 6
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjAndVersionAndOptLockTest.java
  12. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjectHandler.java
  13. 7 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjectHandlerTest.java
  14. 9 5
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MvcCaseTest.java
  15. 7 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2Pagination4SqlTest.java
  16. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2SqlRunnerTest.java
  17. 7 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAddrJoinTest.java
  18. 9 5
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAutoincrementTest.java
  19. 7 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserDateVersionTest.java
  20. 9 5
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserExtendsTest.java
  21. 7 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoOptLockTest.java
  22. 9 5
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoVersionTest.java
  23. 3 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserTest.java
  24. 7 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2uuidTest.java
  25. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/AbstractH2UserTest.java
  26. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/H2Test.java
  27. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBConfig.java
  28. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpH2Config.java
  29. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpMysqlConfig.java
  30. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBTomcatjdbcH2Config.java
  31. 5 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisConfigMetaObjOptLockConfig.java
  32. 4 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusConfig.java
  33. 5 5
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusConfigMapUnderline2Camel.java
  34. 3 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusLoginDeleteConfig.java
  35. 5 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusMetaObjConfig.java
  36. 3 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusNoOptLockConfig.java
  37. 3 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusSequenceConfig.java
  38. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceConfig.java
  39. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceSequenceConfig.java
  40. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/SuSuperEntity.java
  41. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/SuperEntity.java
  42. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserDateVersionMapper.java
  43. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserExtendsMapper.java
  44. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserLogicDeleteMapper.java
  45. 5 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserMapper.java
  46. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserMetaobjMapper.java
  47. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserNoVersionMapper.java
  48. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceExtendsMapper.java
  49. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceMapper.java
  50. 5 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserVersionAndLogicDeleteMapper.java
  51. 16 0
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2uuidMapper.java
  52. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/SuperMapper.java
  53. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseIntVersionEntity.java
  54. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseSequenceEntity.java
  55. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2Addr.java
  56. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2User.java
  57. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserDateVersion.java
  58. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserIntVersionExtendTO.java
  59. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserLogicDelete.java
  60. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserMetaObj.java
  61. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserNoVersion.java
  62. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSeq.java
  63. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequence.java
  64. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequenceExtendTO.java
  65. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserVersionAndLogicDeleteEntity.java
  66. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2uuid.java
  67. 6 6
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/hikaricp/H2HikaricpTest.java
  68. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserExtendsService.java
  69. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserLogicDeleteService.java
  70. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserMetaobjService.java
  71. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserNoVersionService.java
  72. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceExtendsService.java
  73. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceService.java
  74. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserService.java
  75. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserExtendsServiceImpl.java
  76. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserLogicDeleteServiceImpl.java
  77. 5 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserMetaobjServiceImpl.java
  78. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserNoVersionServiceImpl.java
  79. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceExtendsServiceImpl.java
  80. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceServiceImpl.java
  81. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserServiceImpl.java
  82. 7 7
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/tomcatjdbc/TomcatJdbcH2Test.java
  83. 6 6
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/CircularLabelsTest.java
  84. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/LogicDeleteTest.java
  85. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyBaseMapper.java
  86. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyMetaObjectHandler.java
  87. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MySqlInjector.java
  88. 4 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/NoXMLTest.java
  89. 5 3
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/ServiceImplTest.java
  90. 3 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/SqlRunnerTest.java
  91. 7 4
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/TransactionalTest.java
  92. 13 7
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/URPTest.java
  93. 9 5
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/UserMapperTest.java
  94. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/NotPK.java
  95. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/PhoneNumber.java
  96. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Role.java
  97. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Test.java
  98. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/User.java
  99. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/mapper/NotPKMapper.java
  100. 2 2
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/mapper/RoleMapper.java

+ 1 - 0
mybatis-plus-extension/build.gradle

@@ -11,6 +11,7 @@ dependencies {
     provided rootProject.ext.dependencies["spring-jdbc"]
     testCompile group: 'org.springframework', name: 'spring-web', version: '4.3.5.RELEASE'
 
+    testCompile 'javax.servlet:servlet-api:2.5'
 
     testCompile 'junit:junit:4.12'
     testCompile rootProject.ext.dependencies["lombok"]

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/CrudTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/CrudTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test;
+package com.baomidou.mybatisplus.extension.test;
 
 import java.io.InputStream;
 

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/EntityWrapperTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/EntityWrapperTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test;
+package com.baomidou.mybatisplus.extension.test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,7 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.enums.SqlLike;
 import com.baomidou.mybatisplus.core.metadata.Column;
 import com.baomidou.mybatisplus.core.metadata.Columns;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
 
 /**
  * <p>

+ 11 - 6
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/GlobalConfigurationTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/GlobalConfigurationTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test;
+package com.baomidou.mybatisplus.extension.test;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -27,11 +27,16 @@ import org.junit.Assert;
 
 import com.baomidou.mybatisplus.core.conditions.Condition;
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.NotPK;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.Test;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.NotPKMapper;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.RoleMapper;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.TestMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.NotPK;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.NotPKMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.RoleMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.TestMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.NotPK;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.NotPKMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.RoleMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.TestMapper;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/IdWorkerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/IdWorkerTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test;
+package com.baomidou.mybatisplus.extension.test;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -28,7 +28,7 @@ import java.util.concurrent.Future;
 import org.junit.Assert;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplys.extension.test.plugins.RandomUtils;
+import com.baomidou.mybatisplus.extension.test.plugins.RandomUtils;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/MybatisMapperRefreshTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/MybatisMapperRefreshTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test;
+package com.baomidou.mybatisplus.extension.test;
 
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -23,7 +23,8 @@ import org.springframework.core.io.Resource;
 import com.baomidou.mybatisplus.core.pagination.Pagination;
 import com.baomidou.mybatisplus.core.toolkit.SystemClock;
 import com.baomidou.mybatisplus.extension.spring.MybatisMapperRefresh;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
 
 
 /**

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/StringUtilsTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/StringUtilsTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test;
+package com.baomidou.mybatisplus.extension.test;
 
 import org.junit.Assert;
 import org.junit.Test;

+ 5 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/activerecord/ActiveRecordTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/activerecord/ActiveRecordTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.activerecord;
+package com.baomidou.mybatisplus.extension.test.activerecord;
 
 import java.util.List;
 import java.util.Map;
@@ -23,8 +23,10 @@ import org.apache.ibatis.jdbc.SQL;
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.Test;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
 
 
 /**

+ 9 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2LogicDeleteTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2LogicDeleteTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -19,10 +19,14 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.config.ServiceConfig;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserLogicDelete;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserLogicDeleteService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserLogicDeleteService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserLogicDeleteService;
 
 /**
  * <p>

+ 7 - 7
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2MapUnderline2CamelTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MapUnderline2CamelTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -19,12 +19,12 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.config.DBConfig;
-import com.baomidou.mybatisplys.extension.test.h2.config.MybatisPlusConfigMapUnderline2Camel;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.DBConfig;
+import com.baomidou.mybatisplus.extension.test.h2.config.MybatisPlusConfigMapUnderline2Camel;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
 
 /**
  * <p>

+ 6 - 6
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2MetaObjAndVersionAndOptLockTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjAndVersionAndOptLockTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -24,11 +24,11 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.config.DBConfig;
-import com.baomidou.mybatisplys.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.DBConfig;
+import com.baomidou.mybatisplus.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
 
 /**
  * <p>

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2MetaObjectHandler.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjectHandler.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 /**
  * Copyright (c) 2011-2020, hubin (jobob@qq.com).
  * <p>

+ 7 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2MetaObjectHandlerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjectHandlerTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -18,9 +18,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
 
 /**
  * <p>

+ 9 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2MvcCaseTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MvcCaseTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -21,10 +21,14 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.AbstractH2UserTest;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
 
 /**
  * <p>

+ 7 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2Pagination4SqlTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2Pagination4SqlTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -13,9 +13,12 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2SqlRunnerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2SqlRunnerTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -20,9 +20,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
 
 /**
  * <p>

+ 7 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2UserAddrJoinTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAddrJoinTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -19,9 +19,12 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
 
 /**
  * <p>

+ 9 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2UserAutoincrementTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAutoincrementTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -17,10 +17,14 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserMetaobjService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserMetaobjService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserMetaobjService;
 
 /**
  * <p>

+ 7 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2UserDateVersionTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserDateVersionTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -21,9 +21,12 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserDateVersionMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserDateVersion;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserDateVersionMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserDateVersionMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
 
 /**
  * <p>

+ 9 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2UserExtendsTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserExtendsTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -22,10 +22,14 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.config.ServiceConfig;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserExtendsService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserExtendsService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserExtendsService;
 
 /**
  * <p>

+ 7 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2UserNoOptLockTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoOptLockTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -23,9 +23,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
 
 /**
  * <p>

+ 9 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2UserNoVersionTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoVersionTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -22,10 +22,14 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserNoVersionService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserNoVersionService;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserNoVersionService;
 
 /**
  * <p>

+ 3 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2UserTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -21,8 +21,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.metadata.Column;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.base.AbstractH2UserTest;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
 
 /**
  * <p>

+ 7 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/H2uuidTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2uuidTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2;
+package com.baomidou.mybatisplus.extension.test.h2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -17,9 +17,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2uuidMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2uuid;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2uuidMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2uuidMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/base/AbstractH2UserTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/AbstractH2UserTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.base;
+package com.baomidou.mybatisplus.extension.test.h2.base;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.core.pagination.PageHelper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/base/H2Test.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/H2Test.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.base;
+package com.baomidou.mybatisplus.extension.test.h2.base;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -11,7 +11,7 @@ import java.util.Date;
 
 import org.junit.Assert;
 
-import com.baomidou.mybatisplys.extension.test.h2.H2UserNoOptLockTest;
+import com.baomidou.mybatisplus.extension.test.h2.H2UserNoOptLockTest;
 
 /**
  * <p>

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/DBConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import java.sql.SQLException;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/DBHikaricpH2Config.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpH2Config.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import java.sql.SQLException;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/DBHikaricpMysqlConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpMysqlConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import java.sql.SQLException;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/DBTomcatjdbcH2Config.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBTomcatjdbcH2Config.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import java.sql.SQLException;
 

+ 5 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/MybatisConfigMetaObjOptLockConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisConfigMetaObjOptLockConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import javax.sql.DataSource;
 
@@ -18,7 +18,8 @@ import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
 
 /**
  * <p>
@@ -29,7 +30,7 @@ import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
  * @date 2017/6/29
  */
 @Configuration
-@MapperScan("com.baomidou.mybatisplus.test.h2.entity.mapper")
+@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
 public class MybatisConfigMetaObjOptLockConfig {
 
     @Bean("mybatisSqlSession")
@@ -37,7 +38,7 @@ public class MybatisConfigMetaObjOptLockConfig {
         MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
         sqlSessionFactory.setDataSource(dataSource);
 //        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.test.h2.entity.persistent");
+        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
         configuration.setJdbcTypeForNull(JdbcType.NULL);

+ 4 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/MybatisPlusConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import javax.sql.DataSource;
 
@@ -17,7 +17,8 @@ import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
 
 /**
  * <p>
@@ -28,7 +29,7 @@ import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
  * @date 2017/4/1
  */
 @Configuration
-@MapperScan("com.baomidou.mybatisplys.extension.test.h2.entity.mapper")
+@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
 public class MybatisPlusConfig {
 
     @Bean("mybatisSqlSession")

+ 5 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/MybatisPlusConfigMapUnderline2Camel.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusConfigMapUnderline2Camel.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import javax.sql.DataSource;
 
@@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
 
 /**
  * <p>
@@ -30,8 +30,8 @@ import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
  * @date 2017/4/1
  */
 @Configuration
-@MapperScan("com.baomidou.mybatisplus.test.h2.entity.mapper")
-@ComponentScan("com.baomidou.mybatisplus.extension.test.h2.service")
+@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
+@ComponentScan("com.baomidou.mybatisplus.extension.test.h2.service.impl")
 public class MybatisPlusConfigMapUnderline2Camel {
 
     @Bean("mybatisSqlSession")
@@ -39,7 +39,7 @@ public class MybatisPlusConfigMapUnderline2Camel {
         MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
         sqlSessionFactory.setDataSource(dataSource);
 //        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.test.h2.entity.persistent");
+        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
         MybatisConfiguration configuration = new MybatisConfiguration();
 //        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
 //        org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();

+ 3 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/MybatisPlusLoginDeleteConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusLoginDeleteConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import javax.sql.DataSource;
 
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
  * @date 2017/6/15
  */
 @Configuration
-@MapperScan("com.baomidou.mybatisplus.test.h2.entity.mapper")
+@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
 public class MybatisPlusLoginDeleteConfig {
 
     @Bean("mybatisSqlSession")
@@ -37,7 +37,7 @@ public class MybatisPlusLoginDeleteConfig {
         MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
         sqlSessionFactory.setDataSource(dataSource);
 //        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.test.h2.entity.persistent");
+        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
         configuration.setJdbcTypeForNull(JdbcType.NULL);

+ 5 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/MybatisPlusMetaObjConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusMetaObjConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import javax.sql.DataSource;
 
@@ -16,7 +16,8 @@ import com.baomidou.mybatisplus.core.metadata.GlobalConfiguration;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
 
 /**
  * <p>
@@ -27,7 +28,7 @@ import com.baomidou.mybatisplys.extension.test.h2.H2MetaObjectHandler;
  * @date 2017/4/1
  */
 @Configuration
-@MapperScan("com.baomidou.mybatisplus.test.h2.entity.mapper")
+@MapperScan("com.baomidou.mybatisplus.extension.test.h2")
 public class MybatisPlusMetaObjConfig {
 
     @Bean("mybatisSqlSession")
@@ -35,7 +36,7 @@ public class MybatisPlusMetaObjConfig {
         MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
         sqlSessionFactory.setDataSource(dataSource);
 //        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.test.h2.entity.persistent");
+        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
         configuration.setJdbcTypeForNull(JdbcType.NULL);

+ 3 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/MybatisPlusNoOptLockConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusNoOptLockConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import javax.sql.DataSource;
 
@@ -26,7 +26,7 @@ import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
  * @date 2017/4/1
  */
 @Configuration
-@MapperScan("com.baomidou.mybatisplus.test.h2.entity.mapper")
+@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
 public class MybatisPlusNoOptLockConfig {
 
     @Bean("mybatisSqlSession")
@@ -34,7 +34,7 @@ public class MybatisPlusNoOptLockConfig {
         MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
         sqlSessionFactory.setDataSource(dataSource);
 //        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.test.h2.entity.persistent");
+        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
         configuration.setJdbcTypeForNull(JdbcType.NULL);

+ 3 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/MybatisPlusSequenceConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusSequenceConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import javax.sql.DataSource;
 
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
  * @date 2017/6/26
  */
 @Configuration
-@MapperScan("com.baomidou.mybatisplus.test.h2.entity.mapper")
+@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
 public class MybatisPlusSequenceConfig {
 
     @Bean("mybatisSqlSession")
@@ -37,7 +37,7 @@ public class MybatisPlusSequenceConfig {
         MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
         sqlSessionFactory.setDataSource(dataSource);
 //        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.test.h2.entity.persistent");
+        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
         configuration.setJdbcTypeForNull(JdbcType.NULL);

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/ServiceConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/config/ServiceSequenceConfig.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceSequenceConfig.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.config;
+package com.baomidou.mybatisplus.extension.test.h2.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/SuSuperEntity.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/SuSuperEntity.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity;
+package com.baomidou.mybatisplus.extension.test.h2.entity;
 
 import java.util.Date;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/SuperEntity.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/SuperEntity.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.entity;
+package com.baomidou.mybatisplus.extension.test.h2.entity;
 
 import java.io.Serializable;
 

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserDateVersionMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserDateVersionMapper.java

@@ -1,11 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserDateVersion;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserExtendsMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserExtendsMapper.java

@@ -1,11 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserLogicDeleteMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserLogicDeleteMapper.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
@@ -6,7 +6,8 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserLogicDelete;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
 
 /**
  * <p>

+ 5 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserMapper.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import java.util.List;
 import java.util.Map;
@@ -9,8 +9,10 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserMetaobjMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserMetaobjMapper.java

@@ -1,11 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserNoVersionMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserNoVersionMapper.java

@@ -1,11 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserSequenceExtendsMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceExtendsMapper.java

@@ -1,11 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserSequenceMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceMapper.java

@@ -1,11 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserSequence;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
 
 /**
  * <p>

+ 5 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/H2UserVersionAndLogicDeleteMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserVersionAndLogicDeleteMapper.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 import java.util.List;
 
@@ -9,8 +9,10 @@ import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
 
 /**
  * <p>

+ 16 - 0
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2uuidMapper.java

@@ -0,0 +1,16 @@
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
+
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
+
+/**
+ * <p>
+ * 测试 uuid 主键
+ * </p>
+ *
+ * @author hubin
+ * @date 2017-06-28
+ */
+public interface H2uuidMapper extends SuperMapper<H2uuid> {
+
+}

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/mapper/SuperMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/SuperMapper.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.mapper;
+package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
 
 /**
  * <p>

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/BaseIntVersionEntity.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseIntVersionEntity.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.io.Serializable;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/BaseSequenceEntity.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseSequenceEntity.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2Addr.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2Addr.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2User.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2User.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -22,7 +22,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplys.extension.test.h2.entity.SuperEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserDateVersion.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserDateVersion.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserIntVersionExtendTO.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserIntVersionExtendTO.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.math.BigDecimal;
 import java.util.Date;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserLogicDelete.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserLogicDelete.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserMetaObj.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserMetaObj.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -22,7 +22,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplys.extension.test.h2.entity.SuperEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserNoVersion.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserNoVersion.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserSeq.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSeq.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserSequence.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequence.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.math.BigDecimal;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserSequenceExtendTO.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequenceExtendTO.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.math.BigDecimal;
 

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2UserVersionAndLogicDeleteEntity.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserVersionAndLogicDeleteEntity.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -24,7 +24,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplys.extension.test.h2.entity.SuperEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
+import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/entity/persistent/H2uuid.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2uuid.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.entity.persistent;
+package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
 
 import java.io.Serializable;
 

+ 6 - 6
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/hikaricp/H2HikaricpTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/hikaricp/H2HikaricpTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.hikaricp;
+package com.baomidou.mybatisplus.extension.test.h2.hikaricp;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -15,11 +15,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.config.DBHikaricpH2Config;
-import com.baomidou.mybatisplys.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.DBHikaricpH2Config;
+import com.baomidou.mybatisplus.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/IH2UserExtendsService.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserExtendsService.java

@@ -1,7 +1,7 @@
-package com.baomidou.mybatisplys.extension.test.h2.service;
+package com.baomidou.mybatisplus.extension.test.h2.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/IH2UserLogicDeleteService.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserLogicDeleteService.java

@@ -1,7 +1,7 @@
-package com.baomidou.mybatisplys.extension.test.h2.service;
+package com.baomidou.mybatisplus.extension.test.h2.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserLogicDelete;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/IH2UserMetaobjService.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserMetaobjService.java

@@ -1,7 +1,8 @@
-package com.baomidou.mybatisplys.extension.test.h2.service;
+package com.baomidou.mybatisplus.extension.test.h2.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/IH2UserNoVersionService.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserNoVersionService.java

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.service;
+package com.baomidou.mybatisplus.extension.test.h2.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/IH2UserSequenceExtendsService.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceExtendsService.java

@@ -1,7 +1,7 @@
-package com.baomidou.mybatisplys.extension.test.h2.service;
+package com.baomidou.mybatisplus.extension.test.h2.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/IH2UserSequenceService.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceService.java

@@ -1,7 +1,7 @@
-package com.baomidou.mybatisplys.extension.test.h2.service;
+package com.baomidou.mybatisplus.extension.test.h2.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserSequence;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/IH2UserService.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserService.java

@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.service;
+package com.baomidou.mybatisplus.extension.test.h2.service;
 
 import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/impl/H2UserExtendsServiceImpl.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserExtendsServiceImpl.java

@@ -1,11 +1,11 @@
-package com.baomidou.mybatisplys.extension.test.h2.service.impl;
+package com.baomidou.mybatisplus.extension.test.h2.service.impl;
 
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserExtendsMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserExtendsService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserExtendsMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserExtendsService;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/impl/H2UserLogicDeleteServiceImpl.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserLogicDeleteServiceImpl.java

@@ -1,12 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.service.impl;
+package com.baomidou.mybatisplus.extension.test.h2.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserLogicDeleteMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserLogicDelete;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserLogicDeleteService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserLogicDeleteMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserLogicDeleteService;
 
 /**
  * <p>

+ 5 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/impl/H2UserMetaobjServiceImpl.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserMetaobjServiceImpl.java

@@ -1,11 +1,12 @@
-package com.baomidou.mybatisplys.extension.test.h2.service.impl;
+package com.baomidou.mybatisplus.extension.test.h2.service.impl;
 
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserMetaobjService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserMetaobjService;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/impl/H2UserNoVersionServiceImpl.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserNoVersionServiceImpl.java

@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.service.impl;
+package com.baomidou.mybatisplus.extension.test.h2.service.impl;
 
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserNoVersionService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserNoVersionService;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/impl/H2UserSequenceExtendsServiceImpl.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceExtendsServiceImpl.java

@@ -1,11 +1,11 @@
-package com.baomidou.mybatisplys.extension.test.h2.service.impl;
+package com.baomidou.mybatisplus.extension.test.h2.service.impl;
 
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserSequenceExtendsMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserSequenceExtendsService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserSequenceExtendsMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserSequenceExtendsService;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/impl/H2UserSequenceServiceImpl.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceServiceImpl.java

@@ -1,11 +1,11 @@
-package com.baomidou.mybatisplys.extension.test.h2.service.impl;
+package com.baomidou.mybatisplus.extension.test.h2.service.impl;
 
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserSequenceMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserSequence;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserSequenceService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserSequenceMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserSequenceService;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/service/impl/H2UserServiceImpl.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserServiceImpl.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.h2.service.impl;
+package com.baomidou.mybatisplus.extension.test.h2.service.impl;
 
 import java.util.List;
 import java.util.Map;
@@ -23,9 +23,9 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplys.extension.test.h2.service.IH2UserService;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
 
 /**
  * <p>

+ 7 - 7
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/h2/tomcatjdbc/TomcatJdbcH2Test.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/tomcatjdbc/TomcatJdbcH2Test.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplys.extension.test.h2.tomcatjdbc;
+package com.baomidou.mybatisplus.extension.test.h2.tomcatjdbc;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -15,12 +15,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplys.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplys.extension.test.h2.config.DBHikaricpH2Config;
-import com.baomidou.mybatisplys.extension.test.h2.config.DBTomcatjdbcH2Config;
-import com.baomidou.mybatisplys.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
-import com.baomidou.mybatisplys.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
-import com.baomidou.mybatisplys.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
+import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
+import com.baomidou.mybatisplus.extension.test.h2.config.DBHikaricpH2Config;
+import com.baomidou.mybatisplus.extension.test.h2.config.DBTomcatjdbcH2Config;
+import com.baomidou.mybatisplus.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
+import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
+import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
 
 /**
  * <p>

+ 6 - 6
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/CircularLabelsTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/CircularLabelsTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -22,11 +22,11 @@ import java.util.List;
 import org.apache.ibatis.session.SqlSession;
 
 import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.Test;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.TestMapper;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.TestMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
 
 /**
  * <p>

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/LogicDeleteTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/LogicDeleteTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import java.util.HashMap;
 import java.util.List;
@@ -25,9 +25,9 @@ import org.junit.Test;
 import com.baomidou.mybatisplus.core.conditions.Condition;
 import com.baomidou.mybatisplus.core.metadata.GlobalConfiguration;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
 
 /**
  * <p>

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/MyBaseMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyBaseMapper.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/MyMetaObjectHandler.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyMetaObjectHandler.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import org.apache.ibatis.reflection.MetaObject;
 

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/MySqlInjector.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MySqlInjector.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.apache.ibatis.mapping.SqlSource;
@@ -38,7 +38,7 @@ public class MySqlInjector extends AutoSqlInjector {
                        Class<?> modelClass, TableInfo table) {
         /* 添加一个自定义方法 */
         deleteAllUser(mapperClass, modelClass, table);
-        // 测试 com.baomidou.mybatisplus.test.mysql.MetaObjectHandlerTest
+        // 测试 com.baomidou.mybatisplus.extension.test.mysql.MetaObjectHandlerTest
         deleteLogicById(mapperClass, modelClass, table);
     }
 

+ 4 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/NoXMLTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/NoXMLTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import java.util.HashMap;
 import java.util.List;
@@ -24,9 +24,9 @@ import org.apache.ibatis.session.SqlSession;
 
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.Test;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.TestMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.TestMapper;
 
 /**
  * <p>

+ 5 - 3
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/ServiceImplTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/ServiceImplTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -21,8 +21,10 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.baomidou.mybatisplys.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplys.extension.test.mysql.service.IUserService;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.service.IUserService;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.service.IUserService;
 
 /**
  * <p>

+ 3 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/SqlRunnerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/SqlRunnerTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import java.util.List;
 import java.util.Map;
@@ -24,8 +24,9 @@ import org.junit.Test;
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
 
 
 /**

+ 7 - 4
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/TransactionalTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/TransactionalTest.java

@@ -13,15 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import org.apache.ibatis.session.SqlSession;
 import org.junit.Test;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
 
 /**
  * <p>

+ 13 - 7
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/URPTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/URPTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import java.util.List;
 
@@ -23,12 +23,18 @@ import org.junit.Test;
 
 import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.PhoneNumber;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.Role;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.RoleMapper;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.PhoneNumber;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.RoleMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.PhoneNumber;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.RoleMapper;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
 
 /**
  * <p>

+ 9 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/UserMapperTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/UserMapperTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql;
+package com.baomidou.mybatisplus.extension.test.mysql;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,10 +28,14 @@ import com.baomidou.mybatisplus.core.metadata.GlobalConfiguration;
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.core.pagination.Pagination;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplys.extension.test.CrudTest;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.Role;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplys.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
+import com.baomidou.mybatisplus.extension.test.CrudTest;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
+import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
 
 /**
  * <p>

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/entity/NotPK.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/NotPK.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql.entity;
+package com.baomidou.mybatisplus.extension.test.mysql.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/entity/PhoneNumber.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/PhoneNumber.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql.entity;
+package com.baomidou.mybatisplus.extension.test.mysql.entity;
 
 /**
  * <p>

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/entity/Role.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Role.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql.entity;
+package com.baomidou.mybatisplus.extension.test.mysql.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/entity/Test.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Test.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql.entity;
+package com.baomidou.mybatisplus.extension.test.mysql.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/entity/User.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/User.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql.entity;
+package com.baomidou.mybatisplus.extension.test.mysql.entity;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
@@ -68,7 +68,7 @@ public class User implements Serializable {
     private Integer version;
 
     // 或@TableField(el = "role,jdbcType=BIGINT)
-    @TableField(el = "phone, typeHandler=com.baomidou.mybatisplus.test.mysql.typehandler.PhoneTypeHandler")
+    @TableField(el = "phone, typeHandler=com.baomidou.mybatisplus.extension.test.mysql.typehandler.PhoneTypeHandler")
     private PhoneNumber phone;
 
     public User() {

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/mapper/NotPKMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/mapper/NotPKMapper.java

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplys.extension.test.mysql.mapper;
+package com.baomidou.mybatisplus.extension.test.mysql.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.NotPK;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.NotPK;
 
 /**
  * <p>

+ 2 - 2
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplys/extension/test/mysql/mapper/RoleMapper.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/mapper/RoleMapper.java

@@ -1,7 +1,7 @@
-package com.baomidou.mybatisplys.extension.test.mysql.mapper;
+package com.baomidou.mybatisplus.extension.test.mysql.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplys.extension.test.mysql.entity.Role;
+import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
 
 /**
  * @author junyu

Some files were not shown because too many files changed in this diff