This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 5ad0f07ee [INLONG-4908][Manager] Fix Illegal DefaultValue null for
parameter type integer (#4912)
5ad0f07ee is described below
commit 5ad0f07eee5329118ec864ff59c1d73bcde82adf
Author: healchow <[email protected]>
AuthorDate: Thu Jul 7 19:45:29 2022 +0800
[INLONG-4908][Manager] Fix Illegal DefaultValue null for parameter type
integer (#4912)
---
inlong-manager/manager-common/pom.xml | 58 +------
inlong-manager/manager-dao/pom.xml | 164 +-------------------
inlong-manager/manager-service/pom.xml | 168 ++++++++++++++++++++-
inlong-manager/manager-web/pom.xml | 4 +
.../manager/web/controller/DataNodeController.java | 2 +-
.../web/controller/InlongClusterController.java | 4 +-
.../manager/web/controller/WorkflowController.java | 22 +--
.../web/controller/WorkflowEventController.java | 16 +-
.../controller/openapi/OpenClusterController.java | 2 +-
inlong-manager/manager-workflow/pom.xml | 8 +-
inlong-manager/pom.xml | 10 ++
11 files changed, 218 insertions(+), 240 deletions(-)
diff --git a/inlong-manager/manager-common/pom.xml
b/inlong-manager/manager-common/pom.xml
index 8273b30b0..771c1786d 100644
--- a/inlong-manager/manager-common/pom.xml
+++ b/inlong-manager/manager-common/pom.xml
@@ -86,60 +86,6 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>byte-buddy</artifactId>
- <groupId>net.bytebuddy</groupId>
- </exclusion>
- <exclusion>
- <artifactId>classmate</artifactId>
- <groupId>com.fasterxml</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-annotations</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-aop</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-beans</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-context</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-plugin-core</artifactId>
- <groupId>org.springframework.plugin</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-plugin-metadata</artifactId>
- <groupId>org.springframework.plugin</groupId>
- </exclusion>
- <exclusion>
- <artifactId>springfox-spi</artifactId>
- <groupId>io.springfox</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -181,6 +127,10 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
diff --git a/inlong-manager/manager-dao/pom.xml
b/inlong-manager/manager-dao/pom.xml
index 21a983154..d703011e7 100644
--- a/inlong-manager/manager-dao/pom.xml
+++ b/inlong-manager/manager-dao/pom.xml
@@ -45,6 +45,10 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
@@ -78,164 +82,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>hive-llap-server</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-runner</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-server</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-servlet</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-http</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-rewrite</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-webapp</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>javax.servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- <exclusion>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <groupId>javax.servlet.jsp</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-slf4j-impl</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-web</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-1.2-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>protobuf-java</artifactId>
- <groupId>com.google.protobuf</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hive-classification</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hbase-client</artifactId>
- <groupId>org.apache.hbase</groupId>
- </exclusion>
- <exclusion>
- <artifactId>tephra-hbase-compat-1.0</artifactId>
- <groupId>co.cask.tephra</groupId>
- </exclusion>
- <exclusion>
- <artifactId>json</artifactId>
- <groupId>com.tdunning</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jdk.tools</artifactId>
- <groupId>jdk.tools</groupId>
- </exclusion>
- <exclusion>
- <artifactId>nimbus-jose-jwt</artifactId>
- <groupId>com.nimbusds</groupId>
- </exclusion>
- <exclusion>
-
<artifactId>dropwizard-metrics-hadoop-metrics2-reporter</artifactId>
- <groupId>com.github.joshelser</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>hive-llap-tez</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hive-vector-code-gen</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-slf4j-impl</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-1.2-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hadoop-yarn-registry</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- <exclusion>
- <artifactId>groovy-all</artifactId>
- <groupId>org.codehaus.groovy</groupId>
- </exclusion>
- <exclusion>
- <artifactId>protobuf-java</artifactId>
- <groupId>com.google.protobuf</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-core</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ST4</artifactId>
- <groupId>org.antlr</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avatica</artifactId>
- <groupId>org.apache.calcite.avatica</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-druid</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ivy</artifactId>
- <groupId>org.apache.ivy</groupId>
- </exclusion>
- <exclusion>
- <artifactId>stax-api</artifactId>
- <groupId>stax</groupId>
- </exclusion>
- </exclusions>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency>
<dependency>
- <groupId>ru.yandex.clickhouse</groupId>
- <artifactId>clickhouse-jdbc</artifactId>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
</dependency>
</dependencies>
diff --git a/inlong-manager/manager-service/pom.xml
b/inlong-manager/manager-service/pom.xml
index 6a996b094..164d6a4fe 100644
--- a/inlong-manager/manager-service/pom.xml
+++ b/inlong-manager/manager-service/pom.xml
@@ -70,6 +70,10 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
@@ -114,7 +118,164 @@
</exclusion>
</exclusions>
</dependency>
- <!-- elastic search -->
+
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-jdbc</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>hive-llap-server</artifactId>
+ <groupId>org.apache.hive</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-runner</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-server</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-servlet</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-http</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-rewrite</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javax.servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-web</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-1.2-api</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>protobuf-java</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hive-classification</artifactId>
+ <groupId>org.apache.hive</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hbase-client</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>tephra-hbase-compat-1.0</artifactId>
+ <groupId>co.cask.tephra</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>json</artifactId>
+ <groupId>com.tdunning</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jdk.tools</artifactId>
+ <groupId>jdk.tools</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <groupId>com.nimbusds</groupId>
+ </exclusion>
+ <exclusion>
+
<artifactId>dropwizard-metrics-hadoop-metrics2-reporter</artifactId>
+ <groupId>com.github.joshelser</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>hive-llap-tez</artifactId>
+ <groupId>org.apache.hive</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hive-vector-code-gen</artifactId>
+ <groupId>org.apache.hive</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-1.2-api</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hadoop-yarn-registry</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>groovy-all</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>protobuf-java</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>calcite-core</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>ST4</artifactId>
+ <groupId>org.antlr</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>avatica</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>calcite-druid</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>ivy</artifactId>
+ <groupId>org.apache.ivy</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>stax-api</artifactId>
+ <groupId>stax</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
@@ -223,6 +384,11 @@
<artifactId>hbase-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>ru.yandex.clickhouse</groupId>
+ <artifactId>clickhouse-jdbc</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/inlong-manager/manager-web/pom.xml
b/inlong-manager/manager-web/pom.xml
index 12756fed9..275b654a8 100644
--- a/inlong-manager/manager-web/pom.xml
+++ b/inlong-manager/manager-web/pom.xml
@@ -109,6 +109,10 @@
<artifactId>javassist</artifactId>
<groupId>org.javassist</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>swagger-annotations</artifactId>
+ <groupId>io.swagger.core.v3</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
index 93a0d074b..976206c69 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
@@ -62,7 +62,7 @@ public class DataNodeController {
@GetMapping(value = "/node/get/{id}")
@ApiOperation(value = "Get node by id")
- @ApiImplicitParam(name = "id", value = "data node ID", dataTypeClass =
Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Data node ID", dataTypeClass =
Integer.class, required = true)
public Response<DataNodeResponse> get(@PathVariable Integer id) {
return Response.success(dataNodeService.get(id));
}
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
index 10b29ce33..57f74b777 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
@@ -93,7 +93,7 @@ public class InlongClusterController {
@DeleteMapping(value = "/cluster/tag/delete/{id}")
@ApiOperation(value = "Delete cluster tag by id")
@OperationLog(operation = OperationType.DELETE)
- @ApiImplicitParam(name = "id", value = "Cluster ID", dataTypeClass =
Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Cluster tag ID", dataTypeClass =
Integer.class, required = true)
@RequiresRoles(value = UserRoleCode.ADMIN)
public Response<Boolean> deleteTag(@PathVariable Integer id) {
return Response.success(clusterService.deleteTag(id,
LoginUserUtils.getLoginUserDetail().getUsername()));
@@ -178,7 +178,7 @@ public class InlongClusterController {
@RequestMapping(value = "/cluster/node/delete/{id}", method =
RequestMethod.DELETE)
@ApiOperation(value = "Delete cluster node")
@OperationLog(operation = OperationType.DELETE)
- @ApiImplicitParam(name = "id", value = "Cluster node id", dataTypeClass =
Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Cluster node ID", dataTypeClass =
Integer.class, required = true)
public Response<Boolean> deleteNode(@PathVariable Integer id) {
return Response.success(clusterService.deleteNode(id,
LoginUserUtils.getLoginUserDetail().getUsername()));
}
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
index c487c3127..edf21c2e3 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
@@ -72,7 +72,7 @@ public class WorkflowController {
@PostMapping("/workflow/cancel/{id}")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Cancellation process")
- @ApiImplicitParam(name = "id", value = "WorkflowProcess ID", dataTypeClass
= Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Process ID", dataTypeClass =
Integer.class, required = true)
public Response<WorkflowResult> cancel(@PathVariable Integer id,
@RequestBody WorkflowOperation operation) {
String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.cancel(id, operator,
operation.getRemark()));
@@ -81,7 +81,7 @@ public class WorkflowController {
@PostMapping("/workflow/continue/{id}")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Continue process")
- @ApiImplicitParam(name = "id", value = "WorkflowProcess ID", dataTypeClass
= Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Process ID", dataTypeClass =
Integer.class, required = true)
public Response<WorkflowResult> continueProcess(@PathVariable Integer id,
@RequestBody WorkflowOperation operation) {
String operator = LoginUserUtils.getLoginUserDetail().getUsername();
@@ -91,7 +91,7 @@ public class WorkflowController {
@PostMapping("/workflow/approve/{id}")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Approval and consent")
- @ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass =
Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Task ID", dataTypeClass =
Integer.class, required = true)
public Response<WorkflowResult> approve(@PathVariable Integer id,
@RequestBody WorkflowTaskRequest operation) {
String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.approve(id,
operation.getRemark(), operation.getForm(), operator));
@@ -100,7 +100,7 @@ public class WorkflowController {
@PostMapping("/workflow/reject/{id}")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Approval rejected")
- @ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass =
Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Task ID", dataTypeClass =
Integer.class, required = true)
public Response<WorkflowResult> reject(@PathVariable Integer id,
@RequestBody WorkflowTaskRequest operation) {
String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.reject(id,
operation.getRemark(), operator));
@@ -108,8 +108,8 @@ public class WorkflowController {
@PostMapping("/workflow/transfer/{id}")
@OperationLog(operation = OperationType.UPDATE)
- @ApiOperation(value = "Turn to do", notes = "Change approver")
- @ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass =
Integer.class, required = true)
+ @ApiOperation(value = "Turn to another approver", notes = "Change
approver")
+ @ApiImplicitParam(name = "id", value = "Task ID", dataTypeClass =
Integer.class, required = true)
public Response<WorkflowResult> transfer(@PathVariable Integer id,
@RequestBody WorkflowTaskRequest operation) {
String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.transfer(id,
operation.getRemark(),
@@ -118,8 +118,8 @@ public class WorkflowController {
@PostMapping("/workflow/complete/{id}")
@OperationLog(operation = OperationType.UPDATE)
- @ApiOperation(value = "Finish task by id")
- @ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass =
Integer.class, required = true)
+ @ApiOperation(value = "Complete task by ID")
+ @ApiImplicitParam(name = "id", value = "Task ID", dataTypeClass =
Integer.class, required = true)
public Response<WorkflowResult> complete(@PathVariable Integer id,
@RequestBody WorkflowTaskRequest request) {
String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.complete(id,
request.getRemark(), operator));
@@ -129,7 +129,7 @@ public class WorkflowController {
@ApiOperation(value = "Get process detail")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "Process ID", dataTypeClass
= Integer.class, required = true),
- @ApiImplicitParam(name = "taskId", value = "Task ID",
dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "taskId", value = "Task ID",
dataTypeClass = Integer.class, example = "1")
})
public Response<ProcessDetailResponse> detail(@PathVariable(name = "id")
Integer id,
@RequestParam(required = false) Integer taskId) {
@@ -138,14 +138,14 @@ public class WorkflowController {
}
@GetMapping("/workflow/listProcess")
- @ApiOperation(value = "List my processes")
+ @ApiOperation(value = "Get process list by paginating")
public Response<PageInfo<ProcessResponse>> listProcess(ProcessQuery query)
{
query.setApplicant(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(workflowService.listProcess(query));
}
@GetMapping("/workflow/listTask")
- @ApiOperation(value = "List my tasks")
+ @ApiOperation(value = "Get task list by paginating")
public Response<PageInfo<TaskResponse>> listTask(TaskQuery query) {
query.setApprover(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(workflowService.listTask(query));
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
index cf9ce269d..3835bd889 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
@@ -50,7 +50,7 @@ public class WorkflowEventController {
@GetMapping("/workflow/event/detail/{id}")
@ApiOperation(value = "Get event details")
- @ApiImplicitParam(name = "id", value = "event id", dataTypeClass =
Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Event ID", dataTypeClass =
Integer.class, required = true)
public Response<EventLogView> get(@PathVariable Integer id) {
return Response.success(workflowEventService.get(id));
}
@@ -64,8 +64,8 @@ public class WorkflowEventController {
@Deprecated
@PostMapping("/workflow/event/executeEventListener/{id}")
@OperationLog(operation = OperationType.UPDATE)
- @ApiOperation(value = "Execute the listener based on the log ID")
- @ApiImplicitParam(name = "id", value = "event id", dataTypeClass =
Integer.class, required = true)
+ @ApiOperation(value = "Execute the listener based on the event log ID")
+ @ApiImplicitParam(name = "id", value = "Event log ID", dataTypeClass =
Integer.class, required = true)
public Response<Object> executeEventListener(@PathVariable Integer id) {
workflowEventService.executeEventListener(id);
return Response.success();
@@ -74,10 +74,10 @@ public class WorkflowEventController {
@Deprecated
@PostMapping("/workflow/event/executeProcessEventListener")
@OperationLog(operation = OperationType.UPDATE)
- @ApiOperation(value = "Re-execute the specified listener according to the
process ID")
+ @ApiOperation(value = "Re-execute the specified listener based on the
process ID")
@ApiImplicitParams({
- @ApiImplicitParam(name = "processId", value = "process id",
dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "listenerName", value = "listener name",
dataTypeClass = String.class)
+ @ApiImplicitParam(name = "processId", value = "Process ID",
dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "listenerName", value = "Listener name",
dataTypeClass = String.class)
})
public Response<Object> executeProcessEventListener(@RequestParam Integer
processId,
@RequestParam String listenerName) {
@@ -90,8 +90,8 @@ public class WorkflowEventController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Re-execute the specified listener based on the task
ID")
@ApiImplicitParams({
- @ApiImplicitParam(name = "taskId", value = "task id",
dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "listenerName", value = "listener name",
dataTypeClass = String.class)
+ @ApiImplicitParam(name = "taskId", value = "Task ID",
dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "listenerName", value = "Listener name",
dataTypeClass = String.class)
})
public Response<Object> executeTaskEventListener(Integer taskId, String
listenerName) {
workflowEventService.executeTaskEventListener(taskId, listenerName);
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenClusterController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenClusterController.java
index 725214e0f..bdaf27848 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenClusterController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenClusterController.java
@@ -46,7 +46,7 @@ public class OpenClusterController {
@GetMapping(value = "/cluster/get/{id}")
@ApiOperation(value = "Get cluster by id")
- @ApiImplicitParam(name = "id", value = "common cluster ID", dataTypeClass
= Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "Cluster ID", dataTypeClass =
Integer.class, required = true)
public Response<ClusterInfo> get(@PathVariable Integer id) {
return Response.success(clusterService.get(id));
}
diff --git a/inlong-manager/manager-workflow/pom.xml
b/inlong-manager/manager-workflow/pom.xml
index c257027a3..c92d12626 100644
--- a/inlong-manager/manager-workflow/pom.xml
+++ b/inlong-manager/manager-workflow/pom.xml
@@ -70,12 +70,8 @@
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
</dependency>
</dependencies>
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index 944bc603a..73c22f81d 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -48,6 +48,16 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-oas</artifactId>
<version>${spring.fox.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
