change call PageRequest

apache · Aug 12, 2019 · 0acb126 · 0acb126
1 parent 24594bd
commit 0acb126
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/...core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java b/...core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
@@ -23,7 +23,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

diff --git a/...erver/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java b/...erver/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
@@ -31,7 +31,7 @@
 
 @EnableKamon
 class SpringTxEventRepository implements TxEventRepository {
-  private static final PageRequest SINGLE_TX_EVENT_REQUEST = new PageRequest(0, 1);
+  private static final PageRequest SINGLE_TX_EVENT_REQUEST = PageRequest.of(0, 1);
   private final TxEventEnvelopeRepository eventRepo;
 
   SpringTxEventRepository(TxEventEnvelopeRepository eventRepo) {

diff --git a/...ver/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java b/...ver/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
@@ -63,7 +63,7 @@ public void markTimeoutAsDone() {
   @Override
   @Segment(name = "findFirstTimeout", category = "application", library = "kamon")
   public List<TxTimeout> findFirstTimeout() {
-    List<TxTimeout> timeoutEvents = timeoutRepo.findFirstTimeoutTxOrderByExpireTimeAsc(new PageRequest(0, 1));
+    List<TxTimeout> timeoutEvents = timeoutRepo.findFirstTimeoutTxOrderByExpireTimeAsc(PageRequest.of(0, 1));
     timeoutEvents.forEach(event -> timeoutRepo
         .updateStatusByGlobalTxIdAndLocalTxId(PENDING.name(), event.globalTxId(), event.localTxId()));
     return timeoutEvents;

diff --git a/...ava/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java b/...ava/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
@@ -115,19 +115,19 @@ ResponseEntity<Collection<SagaTransactionsController.TxEventVo>> recentTransacti
     List<SagaTransactionsController.TxEventVo> eventVos = new LinkedList<>();
     switch (status) {
       case "PENDING":
-        events = eventRepository.findPendingEvents(new PageRequest(0, count));
+        events = eventRepository.findPendingEvents(PageRequest.of(0, count));
         events.forEach(event -> eventVos.add(new SagaTransactionsController.TxEventVo(event)));
         break;
       case "COMMITTED":
-        events = eventRepository.findCommittedEvents(new PageRequest(0, count));
+        events = eventRepository.findCommittedEvents(PageRequest.of(0, count));
         events.forEach(event -> eventVos.add(new SagaTransactionsController.TxEventVo(event)));
         break;
       case "COMPENSATING":
-        events = eventRepository.findCompensatingEvents(new PageRequest(0, count));
+        events = eventRepository.findCompensatingEvents(PageRequest.of(0, count));
         events.forEach(event -> eventVos.add(new SagaTransactionsController.TxEventVo(event)));
         break;
       case "ROLLBACKED":
-        events = eventRepository.findRollBackedEvents(new PageRequest(0, count));
+        events = eventRepository.findRollBackedEvents(PageRequest.of(0, count));
         events.forEach(event -> eventVos.add(new SagaTransactionsController.TxEventVo(event)));
         break;
       default:

diff --git a/...src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java b/...src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
@@ -131,7 +131,7 @@ public boolean onCoordinatedEvent(TccTxEvent tccTxEvent) {
   }
 
   public void handleTimeoutTx(Date deadLine, int size) {
-    tccTxEventRepository.findTimeoutGlobalTx(deadLine, TccTxType.STARTED.name(), new PageRequest(0, size))
+    tccTxEventRepository.findTimeoutGlobalTx(deadLine, TccTxType.STARTED.name(), PageRequest.of(0, size))
         .ifPresent(e -> e.forEach(t -> {
           GlobalTxEvent globalTxEvent = new GlobalTxEvent(
               t.getServiceName(),
@@ -146,6 +146,6 @@ public void handleTimeoutTx(Date deadLine, int size) {
   }
 
   public void clearCompletedGlobalTx(int size) {
-    tccTxEventRepository.clearCompletedGlobalTx(new PageRequest(0, size));
+    tccTxEventRepository.clearCompletedGlobalTx(PageRequest.of(0, size));
   }
 }
diff --git a/...org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java b/...org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
@@ -73,17 +73,17 @@ public void setUp() throws Exception {
     // Populate events for /recent API's
     eventStarted = new LinkedList<>();
     eventStarted.add(populateEvents(TxStartedEvent.name()));
-    when(eventRepository.findPendingEvents(new PageRequest(0, 5))).thenReturn(eventStarted);
-    when(eventRepository.findCompensatingEvents(new PageRequest(0, 5))).thenReturn(eventStarted);
+    when(eventRepository.findPendingEvents(PageRequest.of(0, 5))).thenReturn(eventStarted);
+    when(eventRepository.findCompensatingEvents(PageRequest.of(0, 5))).thenReturn(eventStarted);
 
     eventCompensated = new LinkedList<>();
     eventCompensated.add(populateEvents(TxCompensatedEvent.name()));
-    when(eventRepository.findRollBackedEvents(new PageRequest(0, 5))).thenReturn(eventCompensated);
+    when(eventRepository.findRollBackedEvents(PageRequest.of(0, 5))).thenReturn(eventCompensated);
 
     eventCommitted = new LinkedList<>();
     eventCommitted.add(populateEvents(TxEndedEvent.name()));
     eventCommitted.add(populateEvents(SagaEndedEvent.name()));
-    when(eventRepository.findCommittedEvents(new PageRequest(0, 5))).thenReturn(eventCommitted);
+    when(eventRepository.findCommittedEvents(PageRequest.of(0, 5))).thenReturn(eventCommitted);
 
     // Populate events for /transactions
     pendingTransactions = new LinkedList<>();