Sfoglia il codice sorgente

名字太长简化少写几个字母

hubin 7 anni fa
parent
commit
6141df14e0

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/PaginationInterceptor.java

@@ -89,7 +89,7 @@ public class PaginationInterceptor extends SqlParserHandler implements Intercept
     private boolean localPage = false;
     private boolean localPage = false;
 
 
     /**
     /**
-     * Physical Pagination Interceptor for all the queries with parameter {@link RowBounds}
+     * Physical Page Interceptor for all the queries with parameter {@link RowBounds}
      */
      */
     @Override
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
     public Object intercept(Invocation invocation) throws Throwable {

+ 2 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/DialectFactory.java

@@ -64,14 +64,14 @@ public class DialectFactory {
      * @return
      * @return
      * @throws Exception
      * @throws Exception
      */
      */
-    public static String buildPaginationSql(Pagination page, String buildSql, DbType dbType, String dialectClazz)
+    public static String buildPaginationSql(Page page, String buildSql, DbType dbType, String dialectClazz)
         throws Exception {
         throws Exception {
         // fix #172, 196
         // fix #172, 196
         return getDialect(dbType, dialectClazz).buildPaginationSql(buildSql, PageHelper.offsetCurrent(page), page.getSize());
         return getDialect(dbType, dialectClazz).buildPaginationSql(buildSql, PageHelper.offsetCurrent(page), page.getSize());
     }
     }
 
 
     /**
     /**
-     * Physical Pagination Interceptor for all the queries with parameter
+     * Physical Page Interceptor for all the queries with parameter
      * {@link RowBounds}
      * {@link RowBounds}
      *
      *
      * @param page         翻页对象
      * @param page         翻页对象

+ 11 - 11
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/Pagination.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/Page.java

@@ -31,7 +31,7 @@ import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
  * @author hubin
  * @author hubin
  * @since 2018-06-09
  * @since 2018-06-09
  */
  */
-public class Pagination<T> implements IPage<T>, Serializable {
+public class Page<T> implements IPage<T>, Serializable {
 
 
     private static final long serialVersionUID = 8545996863226528798L;
     private static final long serialVersionUID = 8545996863226528798L;
 
 
@@ -65,7 +65,7 @@ public class Pagination<T> implements IPage<T>, Serializable {
     private List<String> descs;
     private List<String> descs;
 
 
 
 
-    public Pagination() {
+    public Page() {
         // to do nothing
         // to do nothing
     }
     }
 
 
@@ -77,11 +77,11 @@ public class Pagination<T> implements IPage<T>, Serializable {
      * @param current 当前页
      * @param current 当前页
      * @param size    每页显示条数
      * @param size    每页显示条数
      */
      */
-    public Pagination(long current, long size) {
+    public Page(long current, long size) {
         this(current, size, 0L);
         this(current, size, 0L);
     }
     }
 
 
-    public Pagination(long current, long size, Long total) {
+    public Page(long current, long size, Long total) {
         if (current > 1) {
         if (current > 1) {
             this.current = current;
             this.current = current;
         }
         }
@@ -123,7 +123,7 @@ public class Pagination<T> implements IPage<T>, Serializable {
     }
     }
 
 
     @Override
     @Override
-    public Pagination<T> setTotal(Long total) {
+    public Page<T> setTotal(Long total) {
         this.total = total;
         this.total = total;
         return this;
         return this;
     }
     }
@@ -134,7 +134,7 @@ public class Pagination<T> implements IPage<T>, Serializable {
     }
     }
 
 
     @Override
     @Override
-    public Pagination<T> setSize(long size) {
+    public Page<T> setSize(long size) {
         this.size = size;
         this.size = size;
         return this;
         return this;
     }
     }
@@ -145,7 +145,7 @@ public class Pagination<T> implements IPage<T>, Serializable {
     }
     }
 
 
     @Override
     @Override
-    public Pagination<T> setCurrent(long current) {
+    public Page<T> setCurrent(long current) {
         this.current = current;
         this.current = current;
         return this;
         return this;
     }
     }
@@ -160,12 +160,12 @@ public class Pagination<T> implements IPage<T>, Serializable {
         return ascs;
         return ascs;
     }
     }
 
 
-    public Pagination<T> setAscs(List<String> ascs) {
+    public Page<T> setAscs(List<String> ascs) {
         this.ascs = ascs;
         this.ascs = ascs;
         return this;
         return this;
     }
     }
 
 
-    public Pagination<T> setAscs(String... ascs) {
+    public Page<T> setAscs(String... ascs) {
         if (ArrayUtils.isNotEmpty(ascs)) {
         if (ArrayUtils.isNotEmpty(ascs)) {
             this.ascs = Arrays.asList(ascs);
             this.ascs = Arrays.asList(ascs);
         }
         }
@@ -177,12 +177,12 @@ public class Pagination<T> implements IPage<T>, Serializable {
         return descs;
         return descs;
     }
     }
 
 
-    public Pagination<T> setDescs(List<String> descs) {
+    public Page<T> setDescs(List<String> descs) {
         this.descs = descs;
         this.descs = descs;
         return this;
         return this;
     }
     }
 
 
-    public Pagination<T> setDescs(String... descs) {
+    public Page<T> setDescs(String... descs) {
         if (ArrayUtils.isNotEmpty(descs)) {
         if (ArrayUtils.isNotEmpty(descs)) {
             this.descs = Arrays.asList(descs);
             this.descs = Arrays.asList(descs);
         }
         }

+ 2 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/PageHelper.java

@@ -77,7 +77,7 @@ public class PageHelper {
 
 
     /**
     /**
      * <p>
      * <p>
-     * Pagination 分页偏移量
+     * Page 分页偏移量
      * </p>
      * </p>
      */
      */
     public static long offsetCurrent(IPage page) {
     public static long offsetCurrent(IPage page) {
@@ -114,7 +114,7 @@ public class PageHelper {
      * @param size    页大小
      * @param size    页大小
      */
      */
     public static void startPage(long current, long size) {
     public static void startPage(long current, long size) {
-        LOCAL_PAGE.set(new Pagination(current, size));
+        LOCAL_PAGE.set(new Page(current, size));
     }
     }
 
 
     /**
     /**

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Pagination;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
@@ -119,12 +119,12 @@ public class H2UserMapperTest extends BaseTest {
         log(h2User.toString());
         log(h2User.toString());
 
 
         // 分页查询
         // 分页查询
-        IPage<H2User> h2UserPage = userMapper.selectPage(new Pagination<>(1, 10), null);
+        IPage<H2User> h2UserPage = userMapper.selectPage(new Page<>(1, 10), null);
         if (null != h2UserPage) {
         if (null != h2UserPage) {
             System.out.println(h2UserPage.getTotal());
             System.out.println(h2UserPage.getTotal());
             System.out.println(h2UserPage.getSize());
             System.out.println(h2UserPage.getSize());
         }
         }
-        Assert.assertTrue(null != userMapper.selectPage(new Pagination<>(1, 10),
+        Assert.assertTrue(null != userMapper.selectPage(new Page<>(1, 10),
             new QueryWrapper<H2User>().orderByAsc("name")));
             new QueryWrapper<H2User>().orderByAsc("name")));
 
 
         // 查询结果集
         // 查询结果集

+ 2 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Pagination;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.test.base.entity.TestData;
 import com.baomidou.mybatisplus.test.base.entity.TestData;
 import com.baomidou.mybatisplus.test.base.mapper.TestDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.TestDataMapper;
 
 
@@ -79,7 +79,7 @@ public class MysqlTestDataMapperTest {
 
 
     @Test
     @Test
     public void selectPage() {
     public void selectPage() {
-        IPage<TestData> page = new Pagination<>();
+        IPage<TestData> page = new Page<>();
         page.setSize(5).setCurrent(1);
         page.setSize(5).setCurrent(1);
         IPage<TestData> dataPage = testDataMapper.selectPage(page, new QueryWrapper<TestData>().lambda()
         IPage<TestData> dataPage = testDataMapper.selectPage(page, new QueryWrapper<TestData>().lambda()
             .eq(TestData::getTestInt, 1));
             .eq(TestData::getTestInt, 1));