This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new 0acb126 change call PageRequest
0acb126 is described below
commit 0acb1261b8d992ab39bf4e15d00749837fdd48e1
Author: CMonkey <[email protected]>
AuthorDate: Mon Aug 12 12:04:13 2019 +0800
change call PageRequest
---
.../servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java | 2 +-
.../servicecomb/pack/alpha/server/SpringTxEventRepository.java | 2 +-
.../servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java | 2 +-
.../alpha/server/console/saga/SagaTransactionsController.java | 8 ++++----
.../pack/alpha/server/tcc/service/TccTxEventService.java | 4 ++--
.../alpha/server/console/saga/SagaTransactionsControllerTest.java | 8 ++++----
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
index c183dde..dcd7389 100644
---
a/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
+++
b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
@@ -23,7 +23,7 @@ import static
org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
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/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
index 173125d..bb8d4fb 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
@@ -31,7 +31,7 @@ import kamon.annotation.Segment;
@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/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
index 8966616..1487da7 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
@@ -63,7 +63,7 @@ public class SpringTxTimeoutRepository implements
TxTimeoutRepository {
@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/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
index b4675d2..b8baf54 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
@@ -115,19 +115,19 @@ public class SagaTransactionsController {
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/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
index e5d44a1..f0a8f19 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
@@ -131,7 +131,7 @@ public class TccTxEventService {
}
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 class TccTxEventService {
}
public void clearCompletedGlobalTx(int size) {
- tccTxEventRepository.clearCompletedGlobalTx(new PageRequest(0, size));
+ tccTxEventRepository.clearCompletedGlobalTx(PageRequest.of(0, size));
}
}
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
index b07fc6d..60bbb59 100644
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
+++
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
@@ -73,17 +73,17 @@ public class SagaTransactionsControllerTest {
// 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<>();
