refractor: new pageRequest method for spring-boot upgrade

Author: xchopin

src/main/java/org/apereo/openlrw/events/service/EventService.java

@@ -15,6 +15,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -127,7 +128,8 @@ public Event getEventForId(final String tenantId, final String orgId, final Stri
    * @return Collection<Event>
    */
   public Collection<Event> findAll(final String tenantId, final String orgId, String page, String limit) throws Exception {
-    Pageable pageRequest = new PageRequest(Integer.parseInt(page), Integer.parseInt(limit));
+    Pageable pageRequest = PageRequest.of(Integer.parseInt(page), Integer.parseInt(limit), Sort.by("eventTime").descending());
+
     try {
         Collection<MongoEvent> mongoEvents = mongoEventRepository.findTopByTenantIdAndOrganizationIdOrderByEventEventTimeDesc(tenantId, orgId, pageRequest);
 
@@ -156,8 +158,9 @@ public Collection<Event> findAll(final String tenantId, final String orgId, Stri
    * @throws EventNotFoundException
    */
   public Collection<Event> findByEdApp(final String tenantId, final String orgId, final String page, final String limit,  final String edAppId) throws EventNotFoundException {
-    Pageable pageRequest = new PageRequest(Integer.parseInt(page), Integer.parseInt(limit));
-      Collection<MongoEvent> mongoEvents = mongoEventRepository.findTopByTenantIdAndOrganizationIdAndEventEdAppIdOrderByEventEventTimeDesc(tenantId, orgId, edAppId, pageRequest);
+    Pageable pageRequest = PageRequest.of(Integer.parseInt(page), Integer.parseInt(limit), Sort.by("eventTime"));
+
+    Collection<MongoEvent> mongoEvents = mongoEventRepository.findTopByTenantIdAndOrganizationIdAndEventEdAppIdOrderByEventEventTimeDesc(tenantId, orgId, edAppId, pageRequest);
       if (mongoEvents != null && !mongoEvents.isEmpty()) {
         return mongoEvents.stream().map(MongoEvent::getEvent).collect(Collectors.toList());
       }

src/main/java/org/apereo/openlrw/oneroster/service/EnrollmentService.java

@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -185,19 +186,22 @@ public boolean deleteAll(final String tenantId, final String orgId) {
    * @throws Exception
    */
   public List<Enrollment> findAll(final String tenantId, final String orgId, String page, String limit, String orderBy) throws Exception {
-    Pageable pageRequest = new PageRequest(Integer.parseInt(page), Integer.parseInt(limit));
+    Pageable pageRequest;
     orderBy = StringUtils.lowerCase(orderBy);
     List<MongoEnrollment> mongoEnrollments;
 
     try {
       switch (orderBy) {
         case "begindate":
+          pageRequest = PageRequest.of(Integer.parseInt(page), Integer.parseInt(limit), Sort.by("beginDate").descending());
           mongoEnrollments = mongoEnrollmentRepository.findTopByTenantIdAndOrgIdOrderByEnrollmentBeginDateDesc(tenantId, orgId, pageRequest);
           break;
         case "enddate":
+          pageRequest = PageRequest.of(Integer.parseInt(page), Integer.parseInt(limit), Sort.by("endDate").descending());
           mongoEnrollments = mongoEnrollmentRepository.findTopByTenantIdAndOrgIdOrderByEnrollmentEndDateDesc(tenantId, orgId, pageRequest);
           break;
         default:
+          pageRequest = PageRequest.of(Integer.parseInt(page), Integer.parseInt(limit), Sort.unsorted());
           mongoEnrollments = mongoEnrollmentRepository.findTopByTenantIdAndOrgId(tenantId, orgId, pageRequest);
           break;
       }

src/main/java/org/apereo/openlrw/oneroster/service/ResultService.java

@@ -11,6 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -133,7 +134,7 @@ private Result getResult(final String parameter, MongoResult mongoResult) {
    */
   public List<Result> findAll(final String tenantId, final String orgId, String page, String limit) throws Exception {
     try {
-      Pageable pageRequest = new PageRequest(Integer.parseInt(page), Integer.parseInt(limit));
+      PageRequest pageRequest = PageRequest.of(Integer.parseInt(page), Integer.parseInt(limit), Sort.unsorted());
       List<MongoResult> mongoResults = mongoResultRepository.findTopByTenantIdAndOrgIdOrderByResultDateDesc(tenantId, orgId, pageRequest);
       if (mongoResults != null && !mongoResults.isEmpty()) {
         return mongoResults.stream().map(MongoResult::getResult).collect(Collectors.toList());

src/main/java/org/apereo/openlrw/risk/service/RiskService.java

@@ -127,7 +127,8 @@ public Collection<MongoRisk> getRisksForClass(final String tenantId, final Strin
         Collection<MongoRisk> mongoRisks;
 
         Query query = new Query();
-        query.with(new Sort(Sort.Direction.DESC, "dateTime")); // Order by date: the most recent
+
+        query.with(Sort.by("dateTime").descending()); // Order by date: the most recent
         query.addCriteria(where("classSourcedId").is(classId).and("orgId").is(orgId).and("tenantId").is(tenantId));
 
         if (limit > 0)
@@ -163,7 +164,7 @@ public Collection<MongoRisk> getRisksForUserAndClass(
         Collection<MongoRisk> mongoRisks;
 
         Query query = new Query();
-        query.with(new Sort(Sort.Direction.DESC, "dateTime")); // Order by date: the most recent
+        query.with(Sort.by("dateTime").descending()); // Order by date: the most recent
         query.addCriteria(where("userSourcedId").is(userId).and("classSourcedId").is(classId).and("orgId").is(orgId).and("tenantId").is(tenantId));
 
         if (limit > 0)