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
commit dba9758676ec5ab5e8b20bcff15564ddd04534ff Author: Lei Zhang <[email protected]> AuthorDate: Fri Aug 9 16:34:19 2019 +0800 SCB-1411 Fix API interface name --- .../pack/alpha/server/api/APIv1Controller.java | 2 +- .../alpha/server/api/APIv1ControllerTests.java | 38 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java index 8d6f466..976c05f 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java @@ -37,7 +37,7 @@ public class APIv1Controller { @Autowired APIv1Impl APIv1Impl; - @GetMapping(value = "/getMetrics") + @GetMapping(value = "/metrics") ResponseEntity<AlphaMetrics> metrics() { return ResponseEntity.ok(APIv1Impl.getMetrics()); } diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIv1ControllerTests.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIv1ControllerTests.java index 2b6cfbd..1169b0b 100644 --- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIv1ControllerTests.java +++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIv1ControllerTests.java @@ -102,28 +102,28 @@ public class APIv1ControllerTests { metricsBean.doSagaAvgTime(5); when(metricsService.metrics()).thenReturn(metricsBean); when(nodeStatus.getTypeEnum()).thenReturn(TypeEnum.MASTER); - mockMvc.perform(get("/alpha/api/v1/getMetrics")) + mockMvc.perform(get("/alpha/api/v1/metrics")) .andExpect(status().isOk()) .andExpect( MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) - .andExpect(jsonPath("$.getMetrics.eventReceived").value(1)) - .andExpect(jsonPath("$.getMetrics.eventAccepted").value(1)) - .andExpect(jsonPath("$.getMetrics.eventRejected").value(0)) - .andExpect(jsonPath("$.getMetrics.eventAvgTime").value(5.0)) - .andExpect(jsonPath("$.getMetrics.actorReceived").value(1)) - .andExpect(jsonPath("$.getMetrics.actorAccepted").value(1)) - .andExpect(jsonPath("$.getMetrics.actorRejected").value(0)) - .andExpect(jsonPath("$.getMetrics.actorAvgTime").value(5.0)) - .andExpect(jsonPath("$.getMetrics.repositoryReceived").value(1)) - .andExpect(jsonPath("$.getMetrics.repositoryAccepted").value(1)) - .andExpect(jsonPath("$.getMetrics.repositoryRejected").value(0)) - .andExpect(jsonPath("$.getMetrics.repositoryAvgTime").value(5.0)) - .andExpect(jsonPath("$.getMetrics.sagaBeginCounter").value(1)) - .andExpect(jsonPath("$.getMetrics.sagaEndCounter").value(1)) - .andExpect(jsonPath("$.getMetrics.sagaAvgTime").value(5.0)) - .andExpect(jsonPath("$.getMetrics.committed").value(1)) - .andExpect(jsonPath("$.getMetrics.compensated").value(1)) - .andExpect(jsonPath("$.getMetrics.suspended").value(1)) + .andExpect(jsonPath("$.metrics.eventReceived").value(1)) + .andExpect(jsonPath("$.metrics.eventAccepted").value(1)) + .andExpect(jsonPath("$.metrics.eventRejected").value(0)) + .andExpect(jsonPath("$.metrics.eventAvgTime").value(5.0)) + .andExpect(jsonPath("$.metrics.actorReceived").value(1)) + .andExpect(jsonPath("$.metrics.actorAccepted").value(1)) + .andExpect(jsonPath("$.metrics.actorRejected").value(0)) + .andExpect(jsonPath("$.metrics.actorAvgTime").value(5.0)) + .andExpect(jsonPath("$.metrics.repositoryReceived").value(1)) + .andExpect(jsonPath("$.metrics.repositoryAccepted").value(1)) + .andExpect(jsonPath("$.metrics.repositoryRejected").value(0)) + .andExpect(jsonPath("$.metrics.repositoryAvgTime").value(5.0)) + .andExpect(jsonPath("$.metrics.sagaBeginCounter").value(1)) + .andExpect(jsonPath("$.metrics.sagaEndCounter").value(1)) + .andExpect(jsonPath("$.metrics.sagaAvgTime").value(5.0)) + .andExpect(jsonPath("$.metrics.committed").value(1)) + .andExpect(jsonPath("$.metrics.compensated").value(1)) + .andExpect(jsonPath("$.metrics.suspended").value(1)) .andExpect(jsonPath("$.nodeType").value(TypeEnum.MASTER.name())) .andReturn(); }
