You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ki...@apache.org on 2020/07/23 09:20:41 UTC
[shardingsphere-elasticjob-ui] 12/47: Modify URI prefix and wrap
response data
This is an automated email from the ASF dual-hosted git repository.
kimmking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git
commit e4d75d3527460efc8ecc64077ccb831297a88e4a
Author: renfufei <re...@huobi.com>
AuthorDate: Mon Jul 20 14:57:33 2020 +0800
Modify URI prefix and wrap response data
---
.../elasticjob/ui/web/controller/JobConfigController.java | 9 ++++++---
.../ui/web/controller/JobOperationController.java | 14 +++++++++-----
.../ui/web/controller/ServerOperationController.java | 14 +++++++++-----
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobConfigController.java b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobConfigController.java
index 65c876b..37c0ca8 100644
--- a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobConfigController.java
+++ b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobConfigController.java
@@ -19,6 +19,8 @@ package org.apache.shardingsphere.elasticjob.ui.web.controller;
import org.apache.shardingsphere.elasticjob.lite.internal.config.pojo.JobConfigurationPOJO;
import org.apache.shardingsphere.elasticjob.ui.service.JobAPIService;
+import org.apache.shardingsphere.elasticjob.ui.web.response.ResponseResult;
+import org.apache.shardingsphere.elasticjob.ui.web.response.ResponseResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -34,7 +36,7 @@ import javax.ws.rs.core.MediaType;
* Job configuration RESTful API.
*/
@RestController
-@RequestMapping("/jobs/config")
+@RequestMapping("/api/jobs/config")
public final class JobConfigController {
private JobAPIService jobAPIService;
@@ -51,8 +53,9 @@ public final class JobConfigController {
* @return job configuration
*/
@GetMapping(value = "/{jobName}", produces = MediaType.APPLICATION_JSON)
- public JobConfigurationPOJO getJobConfig(@PathVariable("jobName") final String jobName) {
- return jobAPIService.getJobConfigurationAPI().getJobConfiguration(jobName);
+ public ResponseResult<JobConfigurationPOJO> getJobConfig(@PathVariable("jobName") final String jobName) {
+ JobConfigurationPOJO data = jobAPIService.getJobConfigurationAPI().getJobConfiguration(jobName);
+ return ResponseResultUtil.build(data);
}
/**
diff --git a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobOperationController.java b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobOperationController.java
index f5ba118..32fde53 100644
--- a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobOperationController.java
+++ b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/JobOperationController.java
@@ -20,6 +20,8 @@ package org.apache.shardingsphere.elasticjob.ui.web.controller;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.JobBriefInfo;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ShardingInfo;
import org.apache.shardingsphere.elasticjob.ui.service.JobAPIService;
+import org.apache.shardingsphere.elasticjob.ui.web.response.ResponseResult;
+import org.apache.shardingsphere.elasticjob.ui.web.response.ResponseResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -34,7 +36,7 @@ import java.util.Collection;
* Job operation RESTful API.
*/
@RestController
-@RequestMapping("/jobs")
+@RequestMapping("/api/jobs")
public final class JobOperationController {
private JobAPIService jobAPIService;
@@ -60,8 +62,9 @@ public final class JobOperationController {
* @return all jobs brief info
*/
@GetMapping(produces = MediaType.APPLICATION_JSON)
- public Collection<JobBriefInfo> getAllJobsBriefInfo() {
- return jobAPIService.getJobStatisticsAPI().getAllJobsBriefInfo();
+ public ResponseResult<Collection<JobBriefInfo>> getAllJobsBriefInfo() {
+ Collection<JobBriefInfo> data = jobAPIService.getJobStatisticsAPI().getAllJobsBriefInfo();
+ return ResponseResultUtil.build(data);
}
/**
@@ -111,8 +114,9 @@ public final class JobOperationController {
* @return sharding info
*/
@GetMapping(value = "/{jobName}/sharding", produces = MediaType.APPLICATION_JSON)
- public Collection<ShardingInfo> getShardingInfo(@PathVariable("jobName") final String jobName) {
- return jobAPIService.getShardingStatisticsAPI().getShardingInfo(jobName);
+ public ResponseResult<Collection<ShardingInfo>> getShardingInfo(@PathVariable("jobName") final String jobName) {
+ Collection<ShardingInfo> data = jobAPIService.getShardingStatisticsAPI().getShardingInfo(jobName);
+ return ResponseResultUtil.build(data);
}
/**
diff --git a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/ServerOperationController.java b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/ServerOperationController.java
index 2a36f66..601ae65 100644
--- a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/ServerOperationController.java
+++ b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/ServerOperationController.java
@@ -20,6 +20,8 @@ package org.apache.shardingsphere.elasticjob.ui.web.controller;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.JobBriefInfo;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ServerBriefInfo;
import org.apache.shardingsphere.elasticjob.ui.service.JobAPIService;
+import org.apache.shardingsphere.elasticjob.ui.web.response.ResponseResult;
+import org.apache.shardingsphere.elasticjob.ui.web.response.ResponseResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -35,7 +37,7 @@ import java.util.Collection;
* Server operation RESTful API.
*/
@RestController
-@RequestMapping("/servers")
+@RequestMapping("/api/servers")
public final class ServerOperationController {
private JobAPIService jobAPIService;
@@ -61,8 +63,9 @@ public final class ServerOperationController {
* @return all servers brief info
*/
@GetMapping(produces = MediaType.APPLICATION_JSON)
- public Collection<ServerBriefInfo> getAllServersBriefInfo() {
- return jobAPIService.getServerStatisticsAPI().getAllServersBriefInfo();
+ public ResponseResult<Collection<ServerBriefInfo>> getAllServersBriefInfo() {
+ Collection<ServerBriefInfo> data = jobAPIService.getServerStatisticsAPI().getAllServersBriefInfo();
+ return ResponseResultUtil.build(data);
}
/**
@@ -112,8 +115,9 @@ public final class ServerOperationController {
* @return Job brief info
*/
@GetMapping(value = "/{serverIp}/jobs", produces = MediaType.APPLICATION_JSON)
- public Collection<JobBriefInfo> getJobs(@PathVariable("serverIp") final String serverIp) {
- return jobAPIService.getJobStatisticsAPI().getJobsBriefInfo(serverIp);
+ public ResponseResult<Collection<JobBriefInfo>> getJobs(@PathVariable("serverIp") final String serverIp) {
+ Collection<JobBriefInfo> data = jobAPIService.getJobStatisticsAPI().getJobsBriefInfo(serverIp);
+ return ResponseResultUtil.build(data);
}
/**