This is an automated email from the ASF dual-hosted git repository. zhanglei pushed a commit to branch SCB-1321 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 07815c224fe25568658aa72657417d1103ee668e Author: Lei Zhang <[email protected]> AuthorDate: Wed Jul 10 20:05:40 2019 +0800 SCB-1321 Modify RESTful API /saga/events to /saga/events/last --- .../src/test/java/org/apache/servicecomb/pack/PackStepdefs.java | 2 +- .../pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java | 3 ++- .../servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java index 711edd2..ce93b6b 100644 --- a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java +++ b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java @@ -102,7 +102,7 @@ public class PackStepdefs implements En { map.keySet().retainAll(dataTable.topCells()); }; - dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events", dataTable, columnStrippingConsumer); + dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events/last", dataTable, columnStrippingConsumer); }); And("^Car Service contains the following booking orders$", (DataTable dataTable) -> { diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java index 1a49527..c1690c6 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java @@ -51,6 +51,7 @@ public class SagaDataExtension extends AbstractExtensionId<SagaDataExt> { public void putSagaData(String globalTxId, SagaData sagaData) { if(!globalTxIds.contains(globalTxId)){ + lastGlobalTxId = globalTxId; globalTxIds.add(globalTxId); } sagaDataMap.put(globalTxId, sagaData); @@ -75,7 +76,7 @@ public class SagaDataExtension extends AbstractExtensionId<SagaDataExt> { } public SagaData getLastSagaData() { - return sagaDataMap.get(lastGlobalTxId); + return getSagaData(lastGlobalTxId); } } diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java index 7790286..d2257da 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java @@ -55,7 +55,7 @@ class FsmSagaDataController { ActorSystem system; @Trace("getEvents") - @GetMapping(value = "/events") + @GetMapping(value = "/events/last") ResponseEntity<Collection<Map>> events() { LOG.info("Get the events request"); List<Map> eventVos = new LinkedList<>();
