You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/23 08:12:54 UTC
[shardingsphere-elasticjob-ui] 22/44: Remove jersey dependencies
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git
commit 8e7e2973a8aa436c2391fca36947cba2117c6a74
Author: menghaoranss <lo...@163.com>
AuthorDate: Tue Jul 21 10:37:01 2020 +0800
Remove jersey dependencies
---
.../web/controller/EventTraceDataSourceController.java | 16 +++++++---------
.../ui/web/controller/EventTraceHistoryController.java | 6 ++----
.../ui/web/controller/JobConfigController.java | 6 ++----
.../ui/web/controller/JobOperationController.java | 5 ++---
.../ui/web/controller/RegistryCenterController.java | 8 +++-----
.../ui/web/controller/ServerOperationController.java | 5 ++---
6 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceDataSourceController.java b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceDataSourceController.java
index 4923a63..41c9c4f 100644
--- a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceDataSourceController.java
+++ b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceDataSourceController.java
@@ -33,8 +33,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
import java.util.Collection;
/**
@@ -60,7 +58,7 @@ public final class EventTraceDataSourceController {
* @return event trace data source is activated or not
*/
@GetMapping("/activated")
- public boolean activated(@Context final HttpServletRequest request) {
+ public boolean activated(final HttpServletRequest request) {
return eventTraceDataSourceConfigurationService.loadActivated().isPresent();
}
@@ -71,7 +69,7 @@ public final class EventTraceDataSourceController {
* @return event trace data source configurations
*/
@GetMapping("/load")
- public ResponseResult<Collection<EventTraceDataSourceConfiguration>> load(@Context final HttpServletRequest request) {
+ public ResponseResult<Collection<EventTraceDataSourceConfiguration>> load(final HttpServletRequest request) {
eventTraceDataSourceConfigurationService.loadActivated().ifPresent(eventTraceDataSourceConfig -> setDataSourceNameToSession(eventTraceDataSourceConfig, request.getSession()));
return ResponseResultUtil.build(eventTraceDataSourceConfigurationService.loadAll().getEventTraceDataSourceConfiguration());
}
@@ -92,7 +90,7 @@ public final class EventTraceDataSourceController {
*
* @param config event trace data source configuration
*/
- @DeleteMapping(consumes = MediaType.APPLICATION_JSON)
+ @DeleteMapping
public ResponseResult delete(@RequestBody final EventTraceDataSourceConfiguration config) {
eventTraceDataSourceConfigurationService.delete(config.getName());
return ResponseResultUtil.success();
@@ -105,8 +103,8 @@ public final class EventTraceDataSourceController {
* @param request HTTP request
* @return success or not
*/
- @PostMapping(value = "/connectTest", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
- public ResponseResult<Boolean> connectTest(@RequestBody final EventTraceDataSourceConfiguration config, @Context final HttpServletRequest request) {
+ @PostMapping(value = "/connectTest")
+ public ResponseResult<Boolean> connectTest(@RequestBody final EventTraceDataSourceConfiguration config, final HttpServletRequest request) {
return ResponseResultUtil.build(setDataSourceNameToSession(config, request.getSession()));
}
@@ -117,8 +115,8 @@ public final class EventTraceDataSourceController {
* @param request HTTP request
* @return success or not
*/
- @PostMapping(value = "/connect", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
- public ResponseResult<Boolean> connect(@RequestBody final EventTraceDataSourceConfiguration config, @Context final HttpServletRequest request) {
+ @PostMapping(value = "/connect")
+ public ResponseResult<Boolean> connect(@RequestBody final EventTraceDataSourceConfiguration config, final HttpServletRequest request) {
boolean isConnected = setDataSourceNameToSession(eventTraceDataSourceConfigurationService.find(config.getName(), eventTraceDataSourceConfigurationService.loadAll()), request.getSession());
if (isConnected) {
eventTraceDataSourceConfigurationService.load(config.getName());
diff --git a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceHistoryController.java b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceHistoryController.java
index c8499e1..b8222c6 100644
--- a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceHistoryController.java
+++ b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/EventTraceHistoryController.java
@@ -29,8 +29,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.ws.rs.core.MediaType;
-
/**
* Event trace history RESTful API.
*/
@@ -47,7 +45,7 @@ public final class EventTraceHistoryController {
* @param requestParams query criteria
* @return job execution event trace result
*/
- @GetMapping(value = "/execution", produces = MediaType.APPLICATION_JSON)
+ @GetMapping(value = "/execution")
public BasePageResponse<JobExecutionEvent> findJobExecutionEvents(final FindJobExecutionEventsRequest requestParams) {
Page<JobExecutionEvent> jobExecutionEvents = eventTraceHistoryService.findJobExecutionEvents(requestParams);
return BasePageResponse.of(jobExecutionEvents);
@@ -59,7 +57,7 @@ public final class EventTraceHistoryController {
* @param requestParams query criteria
* @return job status trace result
*/
- @GetMapping(value = "/status", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+ @GetMapping(value = "/status")
public BasePageResponse<JobStatusTraceEvent> findJobStatusTraceEvents(final FindJobStatusTraceEventsRequest requestParams) {
Page<JobStatusTraceEvent> jobStatusTraceEvents = eventTraceHistoryService.findJobStatusTraceEvents(requestParams);
return BasePageResponse.of(jobStatusTraceEvents);
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 ad8b76e..c7d649e 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
@@ -30,8 +30,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.ws.rs.core.MediaType;
-
/**
* Job configuration RESTful API.
*/
@@ -52,7 +50,7 @@ public final class JobConfigController {
* @param jobName job name
* @return job configuration
*/
- @GetMapping(value = "/{jobName}", produces = MediaType.APPLICATION_JSON)
+ @GetMapping(value = "/{jobName}")
public ResponseResult<JobConfigurationPOJO> getJobConfig(@PathVariable("jobName") final String jobName) {
JobConfigurationPOJO data = jobAPIService.getJobConfigurationAPI().getJobConfiguration(jobName);
return ResponseResultUtil.build(data);
@@ -63,7 +61,7 @@ public final class JobConfigController {
*
* @param jobConfiguration job configuration
*/
- @PutMapping(consumes = MediaType.APPLICATION_JSON)
+ @PutMapping
public ResponseResult<Boolean> updateJobConfig(@RequestBody final JobConfigurationPOJO jobConfiguration) {
jobAPIService.getJobConfigurationAPI().updateJobConfiguration(jobConfiguration);
return ResponseResultUtil.build(Boolean.TRUE);
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 6c79d9a..734bbc3 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
@@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.ws.rs.core.MediaType;
import java.util.Collection;
/**
@@ -61,7 +60,7 @@ public final class JobOperationController {
*
* @return all jobs brief info
*/
- @GetMapping(produces = MediaType.APPLICATION_JSON)
+ @GetMapping("/getAllJobsBriefInfo")
public ResponseResult<Collection<JobBriefInfo>> getAllJobsBriefInfo() {
Collection<JobBriefInfo> data = jobAPIService.getJobStatisticsAPI().getAllJobsBriefInfo();
return ResponseResultUtil.build(data);
@@ -117,7 +116,7 @@ public final class JobOperationController {
* @param jobName job name
* @return sharding info
*/
- @GetMapping(value = "/{jobName}/sharding", produces = MediaType.APPLICATION_JSON)
+ @GetMapping(value = "/{jobName}/sharding")
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/RegistryCenterController.java b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/RegistryCenterController.java
index 1f70289..15c57ef 100644
--- a/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/RegistryCenterController.java
+++ b/shardingsphere-elasticjob-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/ui/web/controller/RegistryCenterController.java
@@ -34,8 +34,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
import java.util.Collection;
/**
@@ -92,7 +90,7 @@ public final class RegistryCenterController {
*
* @param config registry center configuration
*/
- @DeleteMapping(consumes = MediaType.APPLICATION_JSON)
+ @DeleteMapping
public ResponseResult delete(@RequestBody final RegistryCenterConfiguration config) {
regCenterService.delete(config.getName());
return ResponseResultUtil.success();
@@ -105,8 +103,8 @@ public final class RegistryCenterController {
* @param request HTTP request
* @return connected or not
*/
- @PostMapping(value = "/connect", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON)
- public ResponseResult<Boolean> connect(@RequestBody final RegistryCenterConfiguration config, @Context final HttpServletRequest request) {
+ @PostMapping(value = "/connect")
+ public ResponseResult<Boolean> connect(@RequestBody final RegistryCenterConfiguration config, final HttpServletRequest request) {
boolean isConnected = setRegistryCenterNameToSession(regCenterService.find(config.getName(), regCenterService.loadAll()), request.getSession());
if (isConnected) {
regCenterService.load(config.getName());
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 6b885b1..71c53cf 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
@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.ws.rs.core.MediaType;
import java.util.Collection;
/**
@@ -62,7 +61,7 @@ public final class ServerOperationController {
*
* @return all servers brief info
*/
- @GetMapping(produces = MediaType.APPLICATION_JSON)
+ @GetMapping("/getAllServersBriefInfo")
public ResponseResult<Collection<ServerBriefInfo>> getAllServersBriefInfo() {
Collection<ServerBriefInfo> data = jobAPIService.getServerStatisticsAPI().getAllServersBriefInfo();
return ResponseResultUtil.build(data);
@@ -118,7 +117,7 @@ public final class ServerOperationController {
* @param serverIp server IP address
* @return Job brief info
*/
- @GetMapping(value = "/{serverIp}/jobs", produces = MediaType.APPLICATION_JSON)
+ @GetMapping(value = "/{serverIp}/jobs")
public ResponseResult<Collection<JobBriefInfo>> getJobs(@PathVariable("serverIp") final String serverIp) {
Collection<JobBriefInfo> data = jobAPIService.getJobStatisticsAPI().getJobsBriefInfo(serverIp);
return ResponseResultUtil.build(data);