#50

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.8.6</version>
+    <version>2.8.7</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.8.6</version>
+        <version>2.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.8.6</version>
+        <version>2.8.7</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.8.6</version>
+        <version>2.8.7</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java

@@ -2,32 +2,29 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 
-import java.util.Optional;
-
 public class PageRequest extends org.springframework.data.domain.PageRequest {
 
     @Getter
     @Setter
     private int current;
 
     @Setter
-    @Getter
     private int pageSize;
 
     @Getter
-    private final RequestFilter requestFilter = new RequestFilter();
+    private Sort sort;
 
+    @Getter
+    private final RequestFilter requestFilter = new RequestFilter();
 
-    private org.springframework.data.domain.PageRequest pageRequest;
 
     public PageRequest(int current, int pageSize, Sort sort) {
         super(current, pageSize, sort);
         this.current = current;
         this.pageSize = pageSize;
-        this.pageRequest = org.springframework.data.domain.PageRequest.of(current, pageSize, sort);
+        this.sort = sort;
     }
 
 
@@ -39,6 +36,7 @@ public String getStringFilter(String key) {
         return requestFilter.getStringFilter(key);
     }
 
+
     public String getStringFilter(String key, String defaultValue) {
         return requestFilter.getStringFilter(key, defaultValue);
     }
@@ -47,33 +45,20 @@ public int getIntFilter(String key) {
         return requestFilter.getIntFilter(key);
     }
 
+
     public int getIntFilter(String key, int defaultValue) {
         return requestFilter.getIntFilter(key, defaultValue);
     }
 
+
     public boolean hasFilter() {
         return requestFilter.hasFilter();
     }
 
 
     @Override
-    public Sort getSort() {
-        return pageRequest.getSort();
-    }
-
-    @Override
-    public PageRequest next() {
-        return new PageRequest(current + 1, getPageSize(), getSort());
-    }
-
-    @Override
-    public PageRequest previous() {
-        return current == 0 ? this : new PageRequest(current - 1, getPageSize(), getSort());
-    }
-
-    @Override
-    public PageRequest first() {
-        return new PageRequest(0, getPageSize(), getSort());
+    public int getPageSize() {
+        return pageSize;
     }
 
     @Override
@@ -91,37 +76,12 @@ public boolean hasPrevious() {
         return current > 0;
     }
 
-    @Override
-    public Pageable previousOrFirst() {
-        return pageRequest.previousOrFirst();
-    }
-
-    @Override
-    public boolean isPaged() {
-        return pageRequest.isPaged();
-    }
-
-    @Override
-    public boolean isUnpaged() {
-        return pageRequest.isUnpaged();
-    }
-
-    @Override
-    public Sort getSortOr(Sort sort) {
-        return pageRequest.getSortOr(sort);
-    }
-
-    @Override
-    public Optional<Pageable> toOptional() {
-        return pageRequest.toOptional();
-    }
-
     public void addSort(Sort sort) {
-        Sort nowSort = pageRequest.getSort();
+        Sort nowSort = this.sort;
         if (nowSort == Sort.unsorted()) {
-            this.pageRequest = new PageRequest(getCurrent(), getPageSize(), sort);
+            this.sort = sort;
         } else {
-            pageRequest.getSort().and(sort);
+            this.sort.and(sort);
         }
     }
 
@@ -156,4 +116,4 @@ public static PageRequest of(int page, int size) {
     public static PageRequest of(int page, int size, Sort sort) {
         return new PageRequest(page, size, sort);
     }
-}
+}