From 2ff5e719f193d989b27b8b385b4df6f1eb8552eb Mon Sep 17 00:00:00 2001
From: Boniface Chacha <bonifacechacha@gmail.com>
Date: Wed, 20 Nov 2019 14:26:34 +0300
Subject: [PATCH] Upgraded to the new API by spring data 2.2 (#21)

* Upgraded to spring boot 2.2.0
* ignore .idea folder for IntelliJ
---
 .gitignore                                                   | 1 +
 pom.xml                                                      | 2 +-
 .../artur/spring/dataprovider/PageableDataProvider.java      | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index b76a5ce..425b735 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 .settings
 .project
 .classpath
+.idea
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 043ecab..d053627 100644
--- 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
index e8d6301..1143c9c 100644
--- 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);
         }
     }