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 fd843246e42746f6acff073f2af3a121f4af65df Author: Lei Zhang <[email protected]> AuthorDate: Thu Jul 11 14:38:19 2019 +0800 SCB-1321 Rename RESTful /saga to /saga/akka for acceptance tests --- .../src/test/java/org/apache/servicecomb/pack/PackStepdefs.java | 4 ++-- .../servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java | 2 +- 2 files changed, 3 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 ce93b6b..9c6a194 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/last", dataTable, columnStrippingConsumer); + dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/akka/events/last", dataTable, columnStrippingConsumer); }); And("^Car Service contains the following booking orders$", (DataTable dataTable) -> { @@ -127,7 +127,7 @@ public class PackStepdefs implements En { given() .when() - .delete(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events") + .delete(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/akka/events") .then() .statusCode(is(200)); 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 d2257da..c1976a5 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 @@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @EnableKamon @Controller -@RequestMapping("/saga") +@RequestMapping("/saga/akka") @Profile("test") @ConditionalOnProperty(name= "alpha.feature.akka.enabled", havingValue = "true") // Only export this Controller for test
