Upgraded to the new API by spring data 2.2 (#21)

* Upgraded to spring boot 2.2.0 * ignore .idea folder for IntelliJ
Artur- · Nov 20, 2019 · 2ff5e71 · 2ff5e71
1 parent 171f445
commit 2ff5e71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 .settings
 .project
 .classpath
+.idea
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <vaadin.version>14.0.5</vaadin.version>
+        <vaadin.version>14.0.8</vaadin.version>
 
         <!-- ZIP Manifest fields -->
         <Implementation-Version>${project.version}</Implementation-Version>

diff --git a/src/main/java/org/vaadin/artur/spring/dataprovider/PageableDataProvider.java b/src/main/java/org/vaadin/artur/spring/dataprovider/PageableDataProvider.java
@@ -33,8 +33,7 @@ protected abstract Page<T> fetchFromBackEnd(Query<T, F> query,
     private Pageable getPageable(Query<T, F> q) {
         Pair<Integer, Integer> pageSizeAndNumber = limitAndOffsetToPageSizeAndNumber(
                 q.getOffset(), q.getLimit());
-        return new PageRequest(pageSizeAndNumber.getSecond(),
-                pageSizeAndNumber.getFirst(), createSpringSort(q));
+        return PageRequest.of(pageSizeAndNumber.getSecond(), pageSizeAndNumber.getFirst(), createSpringSort(q));
     }
 
     private <T, F> Sort createSpringSort(Query<T, F> q) {
@@ -50,7 +49,7 @@ private <T, F> Sort createSpringSort(Query<T, F> q) {
         if (orders.isEmpty()) {
             return Sort.unsorted();
         } else {
-            return new Sort(orders);
+            return Sort.by(orders);
         }
     }