This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.4
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.4 by this push:
new 1a2af6940 [Improve] adjust swagger api display range and only retain
application op api. (#3669)
1a2af6940 is described below
commit 1a2af694067fd1d8ad72fae293785686bd7908ae
Author: lvshaokang <[email protected]>
AuthorDate: Tue Apr 16 22:29:03 2024 +0800
[Improve] adjust swagger api display range and only retain application op
api. (#3669)
* [Improve] adjust swagger api display range and only retain application op
api
* remove @Operation annotations
* spotless
---------
Co-authored-by: red <[email protected]>
---
.../console/base/config/OpenapiConfig.java | 9 +--
.../console/base/config/SpringProperties.java | 2 +
.../console/base/domain/ApiDocConstant.java | 2 +-
.../console/core/controller/AlertController.java | 14 -----
.../ApplicationBuildPipelineController.java | 20 -------
.../core/controller/ApplicationController.java | 67 +---------------------
.../controller/ApplicationHistoryController.java | 10 ----
.../console/core/controller/ConfigController.java | 9 ---
.../core/controller/ExternalLinkController.java | 14 -----
.../core/controller/FlinkClusterController.java | 12 ----
.../core/controller/FlinkEnvController.java | 12 ----
.../controller/FlinkPodTemplateController.java | 8 ---
.../core/controller/FlinkSqlController.java | 9 ---
.../console/core/controller/MessageController.java | 5 --
.../console/core/controller/ProjectController.java | 17 ------
.../core/controller/SavePointController.java | 23 --------
.../console/core/controller/SettingController.java | 13 -----
.../core/controller/VariableController.java | 11 ----
.../core/controller/YarnQueueController.java | 10 ----
.../system/controller/AccessTokenController.java | 47 ---------------
.../system/controller/MemberController.java | 10 ----
.../console/system/controller/MenuController.java | 6 --
.../system/controller/PassportController.java | 3 -
.../console/system/controller/RoleController.java | 9 ---
.../console/system/controller/TeamController.java | 8 ---
.../console/system/controller/UserController.java | 14 -----
.../watcher/FlinkCheckpointWatcher.scala | 2 +-
.../kubernetes/watcher/FlinkMetricsWatcher.scala | 2 +-
28 files changed, 10 insertions(+), 358 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java
index 95a4a989c..4156ad102 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java
@@ -40,6 +40,8 @@ import java.util.Collections;
@ConditionalOnWebApplication
public class OpenapiConfig implements WebMvcConfigurer {
+ private final String[] paths = new String[] {"/flink/app/start",
"/flink/app/cancel"};
+
@Bean
public OpenAPI apiV1Info() {
return new OpenAPI()
@@ -69,11 +71,6 @@ public class OpenapiConfig implements WebMvcConfigurer {
@Bean
public GroupedOpenApi publicApiV1() {
- return
GroupedOpenApi.builder().group("v1").pathsToExclude("/v2/**").build();
- }
-
- @Bean
- public GroupedOpenApi publicApiV2() {
- return GroupedOpenApi.builder().group("v2").pathsToMatch("/v2/**").build();
+ return GroupedOpenApi.builder().group("v1").pathsToMatch(paths).build();
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/SpringProperties.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/SpringProperties.java
index 174b9e082..b5c19e250 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/SpringProperties.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/SpringProperties.java
@@ -182,6 +182,8 @@ public class SpringProperties {
config.put("springdoc.packages-to-scan", "org.apache.streampark.console");
config.put("spring.mvc.pathmatch.matching-strategy", "ant_path_matcher");
+ // metrics
+ config.put("management.health.ldap.enabled", "false");
return config;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ApiDocConstant.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ApiDocConstant.java
index 31220f862..0a43d05aa 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ApiDocConstant.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/ApiDocConstant.java
@@ -19,5 +19,5 @@ package org.apache.streampark.console.base.domain;
public class ApiDocConstant {
- public static final String FLINK_APP_OP_TAG =
"FLINK_APPLICATION_OPERATION_TAG";
+ public static final String OPENAPI_TAG = "OpenAPI";
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
index aa50d1f05..9c4965ff1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
@@ -28,10 +28,6 @@ import
org.apache.streampark.console.core.service.alert.AlertConfigService;
import org.apache.streampark.console.core.service.alert.AlertService;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -48,7 +44,6 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-@Tag(name = "ALERT_TAG")
@Slf4j
@Validated
@RestController
@@ -59,35 +54,30 @@ public class AlertController {
@Autowired private AlertService alertService;
- @Operation(summary = "Create alert config")
@PostMapping(value = "/add")
public RestResponse createAlertConfig(@RequestBody AlertConfigWithParams
params) {
boolean save = alertConfigService.save(AlertConfig.of(params));
return RestResponse.success(save);
}
- @Operation(summary = "Check alert config exist")
@PostMapping(value = "/exists")
public RestResponse verifyAlertConfig(@RequestBody AlertConfigWithParams
params) {
boolean exist = alertConfigService.exist(AlertConfig.of(params));
return RestResponse.success(exist);
}
- @Operation(summary = "Update alert config")
@PostMapping(value = "/update")
public RestResponse updateAlertConfig(@RequestBody AlertConfigWithParams
params) {
boolean update = alertConfigService.updateById(AlertConfig.of(params));
return RestResponse.success(update);
}
- @Operation(summary = "Get alert config")
@PostMapping("/get")
public RestResponse getAlertConfig(@RequestBody AlertConfigWithParams
params) {
AlertConfig alertConfig = alertConfigService.getById(params.getId());
return RestResponse.success(AlertConfigWithParams.of(alertConfig));
}
- @Operation(summary = "List alert configs (Pagination)")
@PostMapping(value = "/list")
public RestResponse alertConfigsPaginationList(
@RequestBody AlertConfigWithParams params, RestRequest request) {
@@ -95,15 +85,12 @@ public class AlertController {
return RestResponse.success(page);
}
- @Operation(summary = "List alert configs")
@PostMapping(value = "/listWithOutPage")
public RestResponse alertConfigsList() {
List<AlertConfig> page = alertConfigService.list();
return RestResponse.success(page);
}
- @Operation(summary = "Delete alert config")
- @Parameters({@Parameter(name = "id", required = true, description = "config
id")})
@DeleteMapping("/delete")
public RestResponse deleteAlertConfig(
@RequestParam("id") @NotNull(message = "config id must be not null")
Long id) {
@@ -111,7 +98,6 @@ public class AlertController {
return RestResponse.success(result);
}
- @Operation(summary = "Send alert config")
@PostMapping("/send")
public RestResponse sendAlert(Long id) throws AlertException {
AlertTemplate alertTemplate = new AlertTemplate();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java
index c3f23af79..c7268fa37 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationBuildPipelineController.java
@@ -17,7 +17,6 @@
package org.apache.streampark.console.core.controller;
-import org.apache.streampark.console.base.domain.ApiDocConstant;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.core.annotation.ApiAccess;
@@ -37,11 +36,6 @@ import
org.apache.streampark.flink.packer.pipeline.PipelineType;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -54,7 +48,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-@Tag(name = "FLINK_APPLICATION_BUILD_PIPELINE_TAG")
@Slf4j
@Validated
@RestController
@@ -78,18 +71,6 @@ public class ApplicationBuildPipelineController {
* @param forceBuild forced start pipeline or not
* @return Whether the pipeline was successfully started
*/
- @Operation(
- summary = "Release application",
- tags = {ApiDocConstant.FLINK_APP_OP_TAG})
- @Parameters({
- @Parameter(name = "appId", description = "app id", required = true,
example = "100000"),
- @Parameter(
- name = "forceBuild",
- description = "force build",
- required = true,
- example = "false",
- schema = @Schema(defaultValue = "false", implementation =
boolean.class))
- })
@ApiAccess
@PermissionScope(app = "#appId")
@PostMapping(value = "build")
@@ -149,7 +130,6 @@ public class ApplicationBuildPipelineController {
* @param appId application id
* @return "pipeline" -> pipeline details, "docker" -> docker resolved
snapshot
*/
- @Operation(summary = "Get application release pipeline")
@ApiAccess
@PostMapping("/detail")
@PermissionScope(app = "#appId")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
index a3ad99c2e..ac72abe22 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
@@ -37,13 +37,11 @@ import
org.apache.streampark.console.core.service.ApplicationService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -59,7 +57,6 @@ import java.net.URI;
import java.util.HashMap;
import java.util.Map;
-@Tag(name = "FLINK_APPLICATION_TAG")
@Slf4j
@Validated
@RestController
@@ -72,7 +69,6 @@ public class ApplicationController {
@Autowired private ApplicationLogService applicationLogService;
- @Operation(summary = "Get application")
@ApiAccess
@PostMapping("get")
@PermissionScope(app = "#app.id")
@@ -82,7 +78,6 @@ public class ApplicationController {
return RestResponse.success(application);
}
- @Operation(summary = "Create application")
@PermissionScope(team = "#app.teamId")
@PostMapping("create")
@RequiresPermissions("app:create")
@@ -91,23 +86,6 @@ public class ApplicationController {
return RestResponse.success(saved);
}
- @Operation(
- summary = "Copy application",
- tags = {ApiDocConstant.FLINK_APP_OP_TAG})
- @Parameters({
- @Parameter(
- name = "id",
- description = "copied target app id",
- in = ParameterIn.QUERY,
- required = true,
- example = "100000"),
- @Parameter(
- name = "jobName",
- description = "new application name",
- in = ParameterIn.QUERY,
- example = "copy-app"),
- @Parameter(name = "args", description = "new application args", in =
ParameterIn.QUERY)
- })
@PermissionScope(app = "#app.id", team = "#app.teamId")
@PostMapping(value = "copy")
@RequiresPermissions("app:copy")
@@ -130,7 +108,6 @@ public class ApplicationController {
return RestResponse.success(true);
}
- @Operation(summary = "Get applications dashboard data")
@PostMapping("dashboard")
@PermissionScope(team = "#app.teamId")
public RestResponse dashboard(Application app) {
@@ -138,7 +115,6 @@ public class ApplicationController {
return RestResponse.success(map);
}
- @Operation(summary = "List applications")
@ApiAccess
@PostMapping("list")
@PermissionScope(team = "#app.teamId")
@@ -148,7 +124,6 @@ public class ApplicationController {
return RestResponse.success(applicationList);
}
- @Operation(summary = "Mapping application")
@AppUpdated
@PostMapping("mapping")
@PermissionScope(app = "#app.id")
@@ -158,7 +133,6 @@ public class ApplicationController {
return RestResponse.success(flag);
}
- @Operation(summary = "Revoke application")
@AppUpdated
@PermissionScope(app = "#app.id")
@PostMapping("revoke")
@@ -170,7 +144,7 @@ public class ApplicationController {
@Operation(
summary = "Start application",
- tags = {ApiDocConstant.FLINK_APP_OP_TAG})
+ tags = {ApiDocConstant.OPENAPI_TAG})
@Parameters({
@Parameter(
name = "id",
@@ -195,7 +169,6 @@ public class ApplicationController {
name = "allowNonRestored",
description = "ignore savepoint if cannot be restored",
in = ParameterIn.QUERY,
- required = false,
schema = @Schema(implementation = boolean.class, defaultValue =
"false"))
})
@ApiAccess
@@ -222,7 +195,7 @@ public class ApplicationController {
@Operation(
summary = "Cancel application",
- tags = {ApiDocConstant.FLINK_APP_OP_TAG})
+ tags = {ApiDocConstant.OPENAPI_TAG})
@ApiAccess
@Parameters({
@Parameter(
@@ -261,7 +234,6 @@ public class ApplicationController {
}
/** force stop(stop normal start or in progress) */
- @Operation(summary = "Force stop application")
@PermissionScope(app = "#app.id")
@PostMapping("forcedStop")
@RequiresPermissions("app:cancel")
@@ -270,34 +242,29 @@ public class ApplicationController {
return RestResponse.success();
}
- @Operation(summary = "Get application on yarn proxy address")
@PostMapping("yarn")
public RestResponse yarn() {
return RestResponse.success(YarnUtils.getRMWebAppProxyURL());
}
- @Operation(summary = "Get application on yarn name")
@PostMapping("name")
public RestResponse yarnName(Application app) {
String yarnName = applicationService.getYarnName(app);
return RestResponse.success(yarnName);
}
- @Operation(summary = "Check the application exist status")
@PostMapping("checkName")
public RestResponse checkName(Application app) {
AppExistsState exists = applicationService.checkExists(app);
return RestResponse.success(exists.get());
}
- @Operation(summary = "Get application conf")
@PostMapping("readConf")
public RestResponse readConf(String config) throws IOException {
String content = applicationService.readConf(config);
return RestResponse.success(content);
}
- @Operation(summary = "Get application main-class")
@PostMapping("main")
@PermissionScope(app = "#app.id")
public RestResponse getMain(Application app) {
@@ -305,7 +272,6 @@ public class ApplicationController {
return RestResponse.success(mainClass);
}
- @Operation(summary = "List application backups")
@PostMapping("backups")
@PermissionScope(app = "#backUp.appId")
public RestResponse backups(ApplicationBackUp backUp, RestRequest request) {
@@ -313,7 +279,6 @@ public class ApplicationController {
return RestResponse.success(backups);
}
- @Operation(summary = "List application operation logs")
@PostMapping("optionlog")
@PermissionScope(app = "#log.appId")
public RestResponse log(ApplicationLog log, RestRequest request) {
@@ -321,7 +286,6 @@ public class ApplicationController {
return RestResponse.success(applicationList);
}
- @Operation(summary = "Delete application operation log")
@PermissionScope(app = "#log.appId")
@PostMapping("deleteOperationLog")
@RequiresPermissions("app:delete")
@@ -330,7 +294,6 @@ public class ApplicationController {
return RestResponse.success(deleted);
}
- @Operation(summary = "Delete application")
@PermissionScope(app = "#app.id")
@PostMapping("delete")
@RequiresPermissions("app:delete")
@@ -339,7 +302,6 @@ public class ApplicationController {
return RestResponse.success(deleted);
}
- @Operation(summary = "Backup application when deleted")
@PermissionScope(app = "#backUp.appId")
@PostMapping("deletebak")
public RestResponse deleteBak(ApplicationBackUp backUp) throws
InternalException {
@@ -347,7 +309,6 @@ public class ApplicationController {
return RestResponse.success(deleted);
}
- @Operation(summary = "Check the application jar")
@PostMapping("checkjar")
public RestResponse checkjar(String jar) {
File file = new File(jar);
@@ -359,7 +320,6 @@ public class ApplicationController {
}
}
- @Operation(summary = "Upload the application jar")
@PostMapping("upload")
@RequiresPermissions("app:create")
public RestResponse upload(MultipartFile file) throws Exception {
@@ -367,7 +327,6 @@ public class ApplicationController {
return RestResponse.success(uploadPath);
}
- @Hidden
@PostMapping("verifySchema")
public RestResponse verifySchema(String path) {
final URI uri = URI.create(path);
@@ -390,7 +349,6 @@ public class ApplicationController {
return restResponse;
}
- @Operation(summary = "Check the application savepoint path")
@PostMapping("checkSavepointPath")
@PermissionScope(app = "#app.id")
public RestResponse checkSavepointPath(Application app) throws Exception {
@@ -402,27 +360,6 @@ public class ApplicationController {
}
}
- @Operation(summary = "Get application on k8s deploy logs")
- @Parameters({
- @Parameter(
- name = "id",
- description = "app id",
- required = true,
- example = "100000",
- schema = @Schema(implementation = Long.class)),
- @Parameter(
- name = "offset",
- description = "number of log lines offset",
- required = true,
- example = "0",
- schema = @Schema(implementation = int.class)),
- @Parameter(
- name = "limit",
- description = "number of log lines loaded at once",
- required = true,
- example = "100",
- schema = @Schema(implementation = int.class)),
- })
@PermissionScope(app = "#id")
@PostMapping(value = "k8sStartLog")
public RestResponse k8sStartLog(Long id, Integer offset, Integer limit)
throws Exception {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java
index c40c2f8f0..b3fc8d8e6 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationHistoryController.java
@@ -22,8 +22,6 @@ import
org.apache.streampark.console.core.service.ApplicationService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -33,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-@Tag(name = "FLINK_APPLICATION_HISTORY_TAG")
@Slf4j
@Validated
@RestController
@@ -42,7 +39,6 @@ public class ApplicationHistoryController {
@Autowired private ApplicationService applicationService;
- @Operation(summary = "List the upload jar history records")
@PostMapping("uploadJars")
@RequiresPermissions("app:create")
public RestResponse listUploadJars() {
@@ -50,7 +46,6 @@ public class ApplicationHistoryController {
return RestResponse.success(jars);
}
- @Operation(summary = "List the k8s namespace history records")
@PostMapping("k8sNamespaces")
@RequiresPermissions("app:create")
public RestResponse listK8sNamespace() {
@@ -58,7 +53,6 @@ public class ApplicationHistoryController {
return RestResponse.success(namespaces);
}
- @Operation(summary = "List the session cluster history records")
@PostMapping("k8sClusterId")
@RequiresPermissions("app:create")
public RestResponse recentK8sClusterId() {
@@ -66,7 +60,6 @@ public class ApplicationHistoryController {
return RestResponse.success(clusterIds);
}
- @Operation(summary = "List the flink base image history records")
@PostMapping("flinkBaseImages")
@RequiresPermissions("app:create")
public RestResponse listFlinkBaseImage() {
@@ -74,7 +67,6 @@ public class ApplicationHistoryController {
return RestResponse.success(images);
}
- @Operation(summary = "List the flink pod template history records")
@PostMapping("flinkPodTemplates")
@RequiresPermissions("app:create")
public RestResponse listPodTemplate() {
@@ -82,7 +74,6 @@ public class ApplicationHistoryController {
return RestResponse.success(templates);
}
- @Operation(summary = "List the flink JM pod template history records")
@PostMapping("flinkJmPodTemplates")
@RequiresPermissions("app:create")
public RestResponse listJmPodTemplate() {
@@ -90,7 +81,6 @@ public class ApplicationHistoryController {
return RestResponse.success(templates);
}
- @Operation(summary = "List the flink TM pod template history records")
@PostMapping("flinkTmPodTemplates")
@RequiresPermissions("app:create")
public RestResponse listTmPodTemplate() {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java
index ba4d59e15..a31647921 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java
@@ -28,8 +28,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.ImmutableMap;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -40,7 +38,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
-@Tag(name = "CONFIG_TAG")
@Slf4j
@Validated
@RestController
@@ -49,35 +46,30 @@ public class ConfigController {
@Autowired private ApplicationConfigService applicationConfigService;
- @Operation(summary = "Get config")
@PostMapping("get")
public RestResponse get(Long id) {
ApplicationConfig config = applicationConfigService.get(id);
return RestResponse.success(config);
}
- @Operation(summary = "Get the flink application conf-template")
@PostMapping("template")
public RestResponse template() {
String config = applicationConfigService.readTemplate();
return RestResponse.success(config);
}
- @Operation(summary = "List the application configs")
@PostMapping("list")
public RestResponse list(ApplicationConfig config, RestRequest request) {
IPage<ApplicationConfig> page = applicationConfigService.page(config,
request);
return RestResponse.success(page);
}
- @Operation(summary = "List application config histories")
@PostMapping("history")
public RestResponse history(Application application) {
List<ApplicationConfig> history =
applicationConfigService.history(application);
return RestResponse.success(history);
}
- @Operation(summary = "Delete config")
@PostMapping("delete")
@RequiresPermissions("conf:delete")
public RestResponse delete(Long id) {
@@ -85,7 +77,6 @@ public class ConfigController {
return RestResponse.success(deleted);
}
- @Operation(summary = "Get system hadoop configs")
@PostMapping("sysHadoopConf")
@RequiresPermissions("app:create")
public RestResponse getSystemHadoopConfig() {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
index db1f8ec5c..66cdb0bee 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ExternalLinkController.java
@@ -24,10 +24,6 @@ import
org.apache.streampark.console.core.service.ExternalLinkService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -42,7 +38,6 @@ import javax.validation.constraints.NotNull;
import java.util.List;
-@Tag(name = "FLINK_EXTERNAL_LINK_TAG")
@Slf4j
@Validated
@RestController
@@ -51,7 +46,6 @@ public class ExternalLinkController {
@Autowired private ExternalLinkService externalLinkService;
- @Operation(summary = "List external link")
@PostMapping("/list")
@RequiresPermissions("externalLink:view")
public RestResponse list() {
@@ -59,10 +53,6 @@ public class ExternalLinkController {
return RestResponse.success(externalLink);
}
- @Operation(
- summary = "Get the application external links",
- description = "Render external link by app id")
- @Parameters({@Parameter(name = "appId", required = true, example =
"100000")})
@PostMapping("/render")
public RestResponse render(
@NotNull(message = "The flink app id cannot be null")
@RequestParam("appId") Long appId) {
@@ -70,7 +60,6 @@ public class ExternalLinkController {
return RestResponse.success(renderedExternalLink);
}
- @Operation(summary = "Create external link")
@PostMapping("/create")
@RequiresPermissions("externalLink:create")
public RestResponse create(@Valid ExternalLink externalLink) {
@@ -78,7 +67,6 @@ public class ExternalLinkController {
return RestResponse.success();
}
- @Operation(summary = "Update external link")
@PostMapping("/update")
@RequiresPermissions("externalLink:update")
public RestResponse update(@Valid ExternalLink externalLink) {
@@ -87,8 +75,6 @@ public class ExternalLinkController {
return RestResponse.success();
}
- @Operation(summary = "Delete external link")
- @Parameters({@Parameter(name = "appId", required = true, example =
"100000")})
@DeleteMapping("/delete")
@RequiresPermissions("externalLink:delete")
public RestResponse delete(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
index 0146542f1..04c4386ba 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
@@ -25,8 +25,6 @@ import
org.apache.streampark.console.core.service.FlinkClusterService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -36,7 +34,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-@Tag(name = "FLINK_CLUSTER_TAG")
@Slf4j
@Validated
@RestController
@@ -45,28 +42,24 @@ public class FlinkClusterController {
@Autowired private FlinkClusterService flinkClusterService;
- @Operation(summary = "List flink clusters")
@PostMapping("list")
public RestResponse list() {
List<FlinkCluster> flinkClusters = flinkClusterService.listCluster();
return RestResponse.success(flinkClusters);
}
- @Operation(summary = "Get flink cluster remote address")
@PostMapping("remoteUrl")
public RestResponse remoteUrl(Long id) {
FlinkCluster cluster = flinkClusterService.getById(id);
return RestResponse.success(cluster.getAddress());
}
- @Operation(summary = "Check the cluster status")
@PostMapping("check")
public RestResponse check(FlinkCluster cluster) {
ResponseResult checkResult = flinkClusterService.check(cluster);
return RestResponse.success(checkResult);
}
- @Operation(summary = "Create flink cluster")
@PostMapping("create")
@RequiresPermissions("cluster:create")
public RestResponse create(FlinkCluster cluster) {
@@ -74,7 +67,6 @@ public class FlinkClusterController {
return RestResponse.success(success);
}
- @Operation(summary = "Update flink cluster")
@PostMapping("update")
@RequiresPermissions("cluster:update")
public RestResponse update(FlinkCluster cluster) {
@@ -82,28 +74,24 @@ public class FlinkClusterController {
return RestResponse.success();
}
- @Operation(summary = "Get flink cluster")
@PostMapping("get")
public RestResponse get(Long id) throws InternalException {
FlinkCluster cluster = flinkClusterService.getById(id);
return RestResponse.success(cluster);
}
- @Operation(summary = "Start flink cluster")
@PostMapping("start")
public RestResponse start(Long id) {
flinkClusterService.start(id);
return RestResponse.success();
}
- @Operation(summary = "Shutdown flink cluster")
@PostMapping("shutdown")
public RestResponse shutdown(Long id) {
flinkClusterService.shutdown(id);
return RestResponse.success();
}
- @Operation(summary = "Delete flink cluster")
@PostMapping("delete")
public RestResponse delete(Long id) {
flinkClusterService.delete(id);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
index 0cde10904..8b72070ac 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
@@ -22,8 +22,6 @@ import
org.apache.streampark.console.base.exception.ApiDetailException;
import org.apache.streampark.console.core.entity.FlinkEnv;
import org.apache.streampark.console.core.service.FlinkEnvService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -33,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-@Tag(name = "FLINK_ENV_TAG")
@Slf4j
@Validated
@RestController
@@ -42,21 +39,18 @@ public class FlinkEnvController {
@Autowired private FlinkEnvService flinkEnvService;
- @Operation(summary = "Get flink environment")
@PostMapping("list")
public RestResponse list() {
List<FlinkEnv> list = flinkEnvService.list();
return RestResponse.success(list);
}
- @Operation(summary = "Verify flink environment")
@PostMapping("check")
public RestResponse check(FlinkEnv version) {
Integer checkResp = flinkEnvService.check(version);
return RestResponse.success(checkResp);
}
- @Operation(summary = "Create flink environment")
@PostMapping("create")
public RestResponse create(FlinkEnv version) {
try {
@@ -67,7 +61,6 @@ public class FlinkEnvController {
return RestResponse.success(true);
}
- @Operation(summary = "Get flink environment")
@PostMapping("get")
public RestResponse get(Long id) throws Exception {
FlinkEnv flinkEnv = flinkEnvService.getById(id);
@@ -75,14 +68,12 @@ public class FlinkEnvController {
return RestResponse.success(flinkEnv);
}
- @Operation(summary = "Sync flink environment conf")
@PostMapping("sync")
public RestResponse sync(Long id) throws Exception {
flinkEnvService.syncConf(id);
return RestResponse.success();
}
- @Operation(summary = "Update flink environment")
@PostMapping("update")
public RestResponse update(FlinkEnv version) throws Exception {
try {
@@ -93,21 +84,18 @@ public class FlinkEnvController {
return RestResponse.success(true);
}
- @Operation(summary = "Delete flink environment")
@PostMapping("delete")
public RestResponse delete(Long id) {
flinkEnvService.delete(id);
return RestResponse.success();
}
- @Operation(summary = "Check flink environment is valid, else throw
exception")
@PostMapping("validity")
public RestResponse validity(FlinkEnv version) {
flinkEnvService.validity(version.getId());
return RestResponse.success(true);
}
- @Operation(summary = "Update flink environment as default")
@PostMapping("default")
public RestResponse setDefault(Long id) {
flinkEnvService.setDefault(id);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
index 034a08c29..66f311b51 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
@@ -23,8 +23,6 @@ import
org.apache.streampark.flink.kubernetes.PodTemplateParser;
import org.apache.commons.lang3.StringUtils;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -37,14 +35,12 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-@Tag(name = "FLINK_POD_TEMPLATE_TAG")
@Slf4j
@Validated
@RestController
@RequestMapping("flink/podtmpl")
public class FlinkPodTemplateController {
- @Operation(summary = "Get system hosts")
@PostMapping("sysHosts")
public RestResponse getHosts() {
// hostname -> ipv4
@@ -56,14 +52,12 @@ public class FlinkPodTemplateController {
return RestResponse.success(friendlyHosts);
}
- @Operation(summary = "Get initial pod template")
@PostMapping("init")
public RestResponse getInitContent() {
return RestResponse.success(PodTemplateParser.getInitPodTemplateContent());
}
/** @param hosts hostname:ipv4,hostname:ipv4,hostname:ipv4... */
- @Operation(summary = "Get pod template of complete host-alias")
@PostMapping("compHostAlias")
public RestResponse completeHostAlias(String hosts, String podTemplate) {
Map<String, String> hostMap = covertHostsParamToMap(hosts);
@@ -88,7 +82,6 @@ public class FlinkPodTemplateController {
}
}
- @Operation(summary = "Extract host-alias from pod template")
@PostMapping("extractHostAlias")
public RestResponse extractHostAlias(String podTemplate) {
Map<String, String> hosts =
PodTemplateParser.extractHostAliasMap(podTemplate);
@@ -100,7 +93,6 @@ public class FlinkPodTemplateController {
}
/** @param hosts hostname:ipv4,hostname:ipv4,hostname:ipv4... */
- @Operation(summary = "Preview pod template with host-alias")
@PostMapping("previewHostAlias")
public RestResponse previewHostAlias(String hosts) {
Map<String, String> hostMap = covertHostsParamToMap(hosts);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
index 3ea82241f..ee2a18d33 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
@@ -32,8 +32,6 @@ import
org.apache.streampark.flink.core.FlinkSqlValidationResult;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -45,7 +43,6 @@ import javax.validation.constraints.NotNull;
import java.util.List;
-@Tag(name = "FLINK_SQL_TAG")
@Slf4j
@Validated
@RestController
@@ -58,7 +55,6 @@ public class FlinkSqlController {
@Autowired private SqlCompleteService sqlComplete;
- @Operation(summary = "Verify sql")
@PostMapping("verify")
public RestResponse verify(String sql, Long versionId, Long teamId) {
sql = variableService.replaceVariable(teamId, sql);
@@ -85,7 +81,6 @@ public class FlinkSqlController {
}
}
- @Operation(summary = "List the application sql")
@PostMapping("list")
@PermissionScope(app = "#flinkSql.appId", team = "#flinkSql.teamId")
public RestResponse list(FlinkSql flinkSql, RestRequest request) {
@@ -93,7 +88,6 @@ public class FlinkSqlController {
return RestResponse.success(page);
}
- @Operation(summary = "Delete sql")
@PostMapping("delete")
@RequiresPermissions("sql:delete")
@PermissionScope(app = "#flinkSql.appId", team = "#teamId")
@@ -102,7 +96,6 @@ public class FlinkSqlController {
return RestResponse.success(deleted);
}
- @Operation(summary = "List sql by ids")
@PostMapping("get")
@PermissionScope(app = "#appId", team = "#teamId")
public RestResponse get(Long appId, Long teamId, String id) throws
InternalException {
@@ -119,7 +112,6 @@ public class FlinkSqlController {
return RestResponse.success(new FlinkSql[] {flinkSql1, flinkSql2});
}
- @Operation(summary = "List the applications sql histories")
@PostMapping("history")
@PermissionScope(app = "#app.id", team = "#app.teamId")
public RestResponse sqlhistory(Application app) {
@@ -127,7 +119,6 @@ public class FlinkSqlController {
return RestResponse.success(sqlList);
}
- @Operation(summary = "Get the complete sql")
@PostMapping("sqlComplete")
public RestResponse getSqlComplete(@NotNull(message = "{required}") String
sql) {
return RestResponse.success().put("word", sqlComplete.getComplete(sql));
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java
index 87d763783..f13fe254c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/MessageController.java
@@ -24,8 +24,6 @@ import org.apache.streampark.console.core.enums.NoticeType;
import org.apache.streampark.console.core.service.MessageService;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -33,7 +31,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-@Tag(name = "MESSAGE_TAG")
@Slf4j
@Validated
@RestController
@@ -42,7 +39,6 @@ public class MessageController {
@Autowired private MessageService messageService;
- @Operation(summary = "List notices")
@PostMapping("notice")
public RestResponse notice(Integer type, RestRequest request) {
NoticeType noticeType = NoticeType.of(type);
@@ -50,7 +46,6 @@ public class MessageController {
return RestResponse.success(pages);
}
- @Operation(summary = "Delete notice")
@PostMapping("delnotice")
public RestResponse delNotice(Long id) {
return RestResponse.success(messageService.removeById(id));
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java
index ff341fcde..2fbbfa10a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java
@@ -29,8 +29,6 @@ import
org.apache.streampark.console.core.service.ProjectService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -43,7 +41,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-@Tag(name = "PROJECT_TAG")
@Slf4j
@Validated
@RestController
@@ -52,7 +49,6 @@ public class ProjectController {
@Autowired private ProjectService projectService;
- @Operation(summary = "Create project")
@PostMapping("create")
@PermissionScope(team = "#project.teamId")
@RequiresPermissions("project:create")
@@ -62,7 +58,6 @@ public class ProjectController {
return projectService.create(project);
}
- @Operation(summary = "Update project")
@AppUpdated
@PostMapping("update")
@RequiresPermissions("project:update")
@@ -72,14 +67,12 @@ public class ProjectController {
return RestResponse.success().data(update);
}
- @Operation(summary = "Get project")
@PostMapping("get")
@PermissionScope(team = "#project.teamId")
public RestResponse get(Project project) {
return
RestResponse.success().data(projectService.getById(project.getId()));
}
- @Operation(summary = "Build project")
@PostMapping("build")
@RequiresPermissions("project:build")
@PermissionScope(team = "#project.teamId")
@@ -88,7 +81,6 @@ public class ProjectController {
return RestResponse.success();
}
- @Operation(summary = "Get project build logs")
@PostMapping("buildlog")
@RequiresPermissions("project:build")
@PermissionScope(team = "#teamId")
@@ -99,7 +91,6 @@ public class ProjectController {
return projectService.getBuildLog(id, startOffset);
}
- @Operation(summary = "List projects")
@PostMapping("list")
@RequiresPermissions("project:view")
@PermissionScope(team = "#project.teamId")
@@ -111,7 +102,6 @@ public class ProjectController {
return RestResponse.success().data(page);
}
- @Operation(summary = "List git project branches")
@PostMapping("branches")
@PermissionScope(team = "#project.teamId")
public RestResponse branches(Project project) {
@@ -119,7 +109,6 @@ public class ProjectController {
return RestResponse.success().data(branches);
}
- @Operation(summary = "Delete project")
@PostMapping("delete")
@RequiresPermissions("project:delete")
@PermissionScope(team = "#project.teamId")
@@ -128,7 +117,6 @@ public class ProjectController {
return RestResponse.success().data(deleted);
}
- @Operation(summary = "Authenticate git project")
@PostMapping("gitcheck")
@PermissionScope(team = "#project.teamId")
public RestResponse gitCheck(Project project) {
@@ -136,7 +124,6 @@ public class ProjectController {
return RestResponse.success().data(error.getType());
}
- @Operation(summary = "Check the project")
@PostMapping("exists")
@PermissionScope(team = "#project.teamId")
public RestResponse exists(Project project) {
@@ -144,7 +131,6 @@ public class ProjectController {
return RestResponse.success().data(exists);
}
- @Operation(summary = "List project modules")
@PostMapping("modules")
@PermissionScope(team = "#project.teamId")
public RestResponse modules(Project project) {
@@ -152,7 +138,6 @@ public class ProjectController {
return RestResponse.success().data(result);
}
- @Operation(summary = "List project jars")
@PostMapping("jars")
@PermissionScope(team = "#project.teamId")
public RestResponse jars(Project project) {
@@ -160,7 +145,6 @@ public class ProjectController {
return RestResponse.success().data(result);
}
- @Operation(summary = "List project configurations")
@PostMapping("listconf")
@PermissionScope(team = "#project.teamId")
public RestResponse listConf(Project project) {
@@ -168,7 +152,6 @@ public class ProjectController {
return RestResponse.success().data(list);
}
- @Operation(summary = "List the team projects")
@PostMapping("select")
@PermissionScope(team = "#teamId")
public RestResponse select(@RequestParam Long teamId) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java
index 1e69f5e95..ffaece95f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java
@@ -30,11 +30,6 @@ import
org.apache.streampark.console.core.service.SavePointService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -44,7 +39,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Nullable;
-@Tag(name = "SAVEPOINT_TAG")
@Slf4j
@Validated
@RestController
@@ -55,7 +49,6 @@ public class SavePointController {
@Autowired private SavePointService savePointService;
- @Operation(summary = "List application savepoint histories")
@PostMapping("history")
@PermissionScope(app = "#sp.appId", team = "#sp.teamId")
public RestResponse history(SavePoint sp, RestRequest request) {
@@ -63,7 +56,6 @@ public class SavePointController {
return RestResponse.success(page);
}
- @Operation(summary = "Delete savepoint")
@PostMapping("delete")
@RequiresPermissions("savepoint:delete")
@PermissionScope(app = "#sp.appId", team = "#sp.teamId")
@@ -74,21 +66,6 @@ public class SavePointController {
return RestResponse.success(deleted);
}
- @Operation(
- summary = "Trigger savepoint",
- description = "trigger savepoint for specified application")
- @Parameters({
- @Parameter(
- name = "appId",
- description = "app id",
- required = true,
- example = "100000",
- schema = @Schema(implementation = Long.class)),
- @Parameter(
- name = "savepointPath",
- description = "specified savepoint path",
- schema = @Schema(implementation = String.class))
- })
@ApiAccess
@PostMapping("trigger")
@RequiresPermissions("savepoint:trigger")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java
index f3926ea57..bece4a832 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java
@@ -28,8 +28,6 @@ import
org.apache.streampark.console.core.service.SettingService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -39,7 +37,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-@Tag(name = "SETTING_TAG")
@Slf4j
@Validated
@RestController
@@ -48,7 +45,6 @@ public class SettingController {
@Autowired private SettingService settingService;
- @Operation(summary = "List settings")
@PostMapping("all")
@RequiresPermissions("setting:view")
public RestResponse all() {
@@ -58,7 +54,6 @@ public class SettingController {
return RestResponse.success(setting);
}
- @Operation(summary = "Get setting")
@PostMapping("get")
@RequiresPermissions("setting:view")
public RestResponse get(String key) {
@@ -66,7 +61,6 @@ public class SettingController {
return RestResponse.success(setting);
}
- @Operation(summary = "Update setting")
@PostMapping("update")
@RequiresPermissions("setting:update")
public RestResponse update(Setting setting) {
@@ -74,7 +68,6 @@ public class SettingController {
return RestResponse.success(updated);
}
- @Operation(summary = "get Docker config")
@PostMapping("docker")
@RequiresPermissions("setting:view")
public RestResponse docker() {
@@ -82,7 +75,6 @@ public class SettingController {
return RestResponse.success(dockerConfig);
}
- @Operation(summary = "check docker setting")
@PostMapping("check/docker")
@RequiresPermissions("setting:view")
public RestResponse checkDocker(DockerConfig dockerConfig) {
@@ -90,7 +82,6 @@ public class SettingController {
return RestResponse.success(result);
}
- @Operation(summary = "Update docker setting")
@PostMapping("update/docker")
@RequiresPermissions("setting:update")
public RestResponse updateDocker(DockerConfig dockerConfig) {
@@ -98,7 +89,6 @@ public class SettingController {
return RestResponse.success(updated);
}
- @Operation(summary = "get sender email")
@PostMapping("email")
@RequiresPermissions("setting:view")
public RestResponse email() {
@@ -106,7 +96,6 @@ public class SettingController {
return RestResponse.success(senderEmail);
}
- @Operation(summary = "check email")
@PostMapping("check/email")
@RequiresPermissions("setting:view")
public RestResponse checkEmail(SenderEmail senderEmail) {
@@ -114,7 +103,6 @@ public class SettingController {
return RestResponse.success(result);
}
- @Operation(summary = "Update sender email")
@PostMapping("update/email")
@RequiresPermissions("setting:update")
public RestResponse updateEmail(SenderEmail senderEmail) {
@@ -122,7 +110,6 @@ public class SettingController {
return RestResponse.success(updated);
}
- @Operation(summary = "Check hadoop status")
@PostMapping("check/hadoop")
public RestResponse checkHadoop() {
try {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java
index b57b4c4b8..9017243ff 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/VariableController.java
@@ -26,8 +26,6 @@ import
org.apache.streampark.console.core.service.VariableService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -43,7 +41,6 @@ import javax.validation.constraints.NotBlank;
import java.util.List;
-@Tag(name = "VARIABLE_TAG")
@Slf4j
@Validated
@RestController
@@ -59,7 +56,6 @@ public class VariableController {
* @param variable
* @return
*/
- @Operation(summary = "List variables")
@PostMapping("page")
@RequiresPermissions("variable:view")
public RestResponse page(RestRequest restRequest, Variable variable) {
@@ -77,7 +73,6 @@ public class VariableController {
* @param keyword Fuzzy search keywords through variable code or
description, Nullable.
* @return
*/
- @Operation(summary = "List variables")
@PostMapping("list")
public RestResponse variableList(@RequestParam Long teamId, String keyword) {
List<Variable> variableList = variableService.findByTeamId(teamId,
keyword);
@@ -87,7 +82,6 @@ public class VariableController {
return RestResponse.success(variableList);
}
- @Operation(summary = "List the variable depend applications")
@PostMapping("dependApps")
@RequiresPermissions("variable:depend_apps")
public RestResponse dependApps(RestRequest restRequest, Variable variable) {
@@ -95,7 +89,6 @@ public class VariableController {
return RestResponse.success(dependApps);
}
- @Operation(summary = "Create variable")
@PostMapping("post")
@RequiresPermissions("variable:add")
public RestResponse addVariable(@Valid Variable variable) {
@@ -103,7 +96,6 @@ public class VariableController {
return RestResponse.success();
}
- @Operation(summary = "Update variable")
@PutMapping("update")
@RequiresPermissions("variable:update")
public RestResponse updateVariable(@Valid Variable variable) {
@@ -111,7 +103,6 @@ public class VariableController {
return RestResponse.success();
}
- @Operation(summary = "Get variable")
@PostMapping("showOriginal")
@RequiresPermissions("variable:show_original")
public RestResponse showOriginal(@RequestParam Long id) {
@@ -119,7 +110,6 @@ public class VariableController {
return RestResponse.success(v);
}
- @Operation(summary = "Delete variable")
@DeleteMapping("delete")
@RequiresPermissions("variable:delete")
public RestResponse deleteVariable(@Valid Variable variable) {
@@ -127,7 +117,6 @@ public class VariableController {
return RestResponse.success();
}
- @Operation(summary = "Check variable code")
@PostMapping("check/code")
public RestResponse checkVariableCode(
@RequestParam Long teamId, @NotBlank(message = "{required}") String
variableCode) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java
index 9edead6dc..b6945a09d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/YarnQueueController.java
@@ -26,8 +26,6 @@ import
org.apache.streampark.console.core.service.YarnQueueService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -35,7 +33,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-@Tag(name = "YARN_QUEUE_TAG")
@Slf4j
@Validated
@RestController
@@ -51,7 +48,6 @@ public class YarnQueueController {
* @param yarnQueue optional fields used to search.
* @return RestResponse with IPage<{@link YarnQueue}> object.
*/
- @Operation(summary = "List yarn queues")
@ApiAccess
@PostMapping("list")
public RestResponse list(RestRequest restRequest, YarnQueue yarnQueue) {
@@ -59,14 +55,12 @@ public class YarnQueueController {
return RestResponse.success(queuePage);
}
- @Operation(summary = "Check yarn queue valid")
@ApiAccess
@PostMapping("check")
public RestResponse check(YarnQueue yarnQueue) {
return RestResponse.success(yarnQueueService.checkYarnQueue(yarnQueue));
}
- @Operation(summary = "Create yarn queue")
@ApiAccess
@PostMapping("create")
@RequiresPermissions("yarnQueue:create")
@@ -74,7 +68,6 @@ public class YarnQueueController {
return RestResponse.success(yarnQueueService.createYarnQueue(yarnQueue));
}
- @Operation(summary = "Update yarn queue")
@ApiAccess
@PostMapping("update")
@RequiresPermissions("yarnQueue:update")
@@ -83,9 +76,6 @@ public class YarnQueueController {
return RestResponse.success();
}
- @Operation(
- summary = "Delete yarn queue",
- description = "delete by (team id & yarn queue) or yarn queue id")
@ApiAccess
@PostMapping("delete")
@RequiresPermissions("yarnQueue:delete")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
index f6cddef20..1eb982107 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
@@ -30,12 +30,7 @@ import
org.apache.streampark.console.system.service.AccessTokenService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -46,7 +41,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-@Tag(name = "ACCESS_TOKEN_TAG")
@RestController
@RequestMapping("token")
public class AccessTokenController {
@@ -56,19 +50,6 @@ public class AccessTokenController {
@Autowired private ServiceHelper serviceHelper;
/** generate token string */
- @Operation(summary = "Create token")
- @Parameters({
- @Parameter(
- name = "userId",
- description = "user id",
- required = true,
- example = "100000",
- schema = @Schema(implementation = Long.class)),
- @Parameter(
- name = "description",
- description = "token description",
- schema = @Schema(implementation = String.class))
- })
@PostMapping(value = "create")
@RequiresPermissions("token:add")
public RestResponse createToken(
@@ -78,7 +59,6 @@ public class AccessTokenController {
return accessTokenService.create(userId, description);
}
- @Operation(summary = "Verify current user token")
@PostMapping(value = "check")
public RestResponse verifyToken() {
Long userId = serviceHelper.getUserId();
@@ -99,14 +79,6 @@ public class AccessTokenController {
}
/** query token list */
- @Operation(summary = "List tokens")
- @Parameters({
- @Parameter(
- name = "userId",
- in = ParameterIn.QUERY,
- description = "user id",
- schema = @Schema(implementation = Long.class))
- })
@PostMapping(value = "list")
@RequiresPermissions("token:view")
public RestResponse tokensList(
@@ -116,15 +88,6 @@ public class AccessTokenController {
}
/** update token status */
- @Operation(summary = "Toggle token")
- @Parameters({
- @Parameter(
- name = "tokenId",
- description = "token id",
- required = true,
- example = "1",
- schema = @Schema(implementation = Long.class))
- })
@PostMapping("toggle")
@RequiresPermissions("token:add")
public RestResponse toggleToken(@NotNull(message = "{required}") Long
tokenId) {
@@ -132,15 +95,6 @@ public class AccessTokenController {
}
/** delete token by id */
- @Operation(summary = "Delete token")
- @Parameters({
- @Parameter(
- name = "tokenId",
- description = "token id",
- required = true,
- example = "1",
- schema = @Schema(implementation = Long.class))
- })
@DeleteMapping(value = "delete")
@RequiresPermissions("token:delete")
public RestResponse deleteToken(@NotBlank(message = "{required}") Long
tokenId) {
@@ -152,7 +106,6 @@ public class AccessTokenController {
* copy cURL, hardcode now, there is no need for configuration here, because
there are several
* fixed interfaces
*/
- @Operation(summary = "Generate api with token")
@PermissionScope(app = "#appId", team = "#teamId")
@PostMapping(value = "curl")
public RestResponse copyRestApiCurl(
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
index 00a427c39..6ef6bf654 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MemberController.java
@@ -28,8 +28,6 @@ import
org.apache.streampark.console.system.service.MemberService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -44,7 +42,6 @@ import javax.validation.constraints.NotBlank;
import java.util.List;
-@Tag(name = "MEMBER_TAG")
@Slf4j
@Validated
@RestController
@@ -53,7 +50,6 @@ public class MemberController {
@Autowired private MemberService memberService;
- @Operation(summary = "List members")
@PostMapping("list")
@RequiresPermissions("member:view")
public RestResponse memberList(RestRequest restRequest, Member member) {
@@ -61,7 +57,6 @@ public class MemberController {
return RestResponse.success(userList);
}
- @Operation(summary = "List candidate users")
@PostMapping("candidateUsers")
@RequiresPermissions("member:add")
public RestResponse candidateUsers(Long teamId) {
@@ -69,21 +64,18 @@ public class MemberController {
return RestResponse.success(userList);
}
- @Operation(summary = "List teams")
@PostMapping("teams")
public RestResponse listTeams(Long userId) {
List<Team> teamList = memberService.findUserTeams(userId);
return RestResponse.success(teamList);
}
- @Operation(summary = "Check the username")
@PostMapping("check/user")
public RestResponse check(@NotBlank(message = "{required}") Long teamId,
String userName) {
Member result = this.memberService.findByUserName(teamId, userName);
return RestResponse.success(result == null);
}
- @Operation(summary = "Create member")
@PermissionScope(team = "#member.teamId")
@PostMapping("post")
@RequiresPermissions("member:add")
@@ -92,7 +84,6 @@ public class MemberController {
return RestResponse.success();
}
- @Operation(summary = "Delete member")
@PermissionScope(team = "#member.teamId")
@DeleteMapping("delete")
@RequiresPermissions("member:delete")
@@ -101,7 +92,6 @@ public class MemberController {
return RestResponse.success();
}
- @Operation(summary = "Update member")
@PermissionScope(team = "#member.teamId")
@PutMapping("update")
@RequiresPermissions("member:update")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
index 6252df3a1..c4ebcfeb5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
@@ -25,8 +25,6 @@ import
org.apache.streampark.console.system.service.MenuService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -40,7 +38,6 @@ import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Map;
-@Tag(name = "MENU_TAG")
@Slf4j
@Validated
@RestController
@@ -51,7 +48,6 @@ public class MenuController {
@Autowired private ServiceHelper serviceHelper;
- @Operation(summary = "List menu-routes")
@PostMapping("router")
public RestResponse getUserRouters(Long teamId) {
// TODO The teamId is required, get routers should be called after choose
teamId.
@@ -60,7 +56,6 @@ public class MenuController {
return RestResponse.success(routers);
}
- @Operation(summary = "List menus")
@PostMapping("list")
@RequiresPermissions("menu:view")
public RestResponse menuList(Menu menu) {
@@ -68,7 +63,6 @@ public class MenuController {
return RestResponse.success(maps);
}
- @Operation(summary = "Create menu")
@PostMapping("post")
@RequiresPermissions("menu:add")
public RestResponse addMenu(@Valid Menu menu) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
index 5334e68e2..401198143 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
@@ -33,7 +33,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +46,6 @@ import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.Map;
-@Tag(name = "PASSPORT_TAG")
@Validated
@RestController
@RequestMapping("passport")
@@ -57,7 +55,6 @@ public class PassportController {
@Autowired private Authenticator authenticator;
- @Operation(summary = "Signin")
@PostMapping("signin")
public RestResponse signin(
HttpServletRequest request,
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
index 85a5749d6..884f9ecac 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
@@ -27,8 +27,6 @@ import
org.apache.streampark.console.system.service.RoleService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -44,7 +42,6 @@ import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.stream.Collectors;
-@Tag(name = "ROLE_TAG")
@Slf4j
@Validated
@RestController
@@ -54,7 +51,6 @@ public class RoleController {
@Autowired private RoleService roleService;
@Autowired private RoleMenuServie roleMenuServie;
- @Operation(summary = "List roles")
@PostMapping("list")
@RequiresPermissions("role:view")
public RestResponse roleList(RestRequest restRequest, Role role) {
@@ -62,14 +58,12 @@ public class RoleController {
return RestResponse.success(roleList);
}
- @Operation(summary = "Check the role name")
@PostMapping("check/name")
public RestResponse checkRoleName(@NotBlank(message = "{required}") String
roleName) {
Role result = this.roleService.findByName(roleName);
return RestResponse.success(result == null);
}
- @Operation(summary = "List role menus")
@PostMapping("menu")
public RestResponse getRoleMenus(@NotBlank(message = "{required}") String
roleId) {
List<RoleMenu> list = this.roleMenuServie.getByRoleId(roleId);
@@ -80,7 +74,6 @@ public class RoleController {
return RestResponse.success(roleMenus);
}
- @Operation(summary = "Create role")
@PostMapping("post")
@RequiresPermissions("role:add")
public RestResponse addRole(@Valid Role role) {
@@ -88,7 +81,6 @@ public class RoleController {
return RestResponse.success();
}
- @Operation(summary = "Delete role")
@DeleteMapping("delete")
@RequiresPermissions("role:delete")
public RestResponse deleteRole(Long roleId) {
@@ -96,7 +88,6 @@ public class RoleController {
return RestResponse.success();
}
- @Operation(summary = "Update role")
@PutMapping("update")
@RequiresPermissions("role:update")
public RestResponse updateRole(Role role) throws Exception {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
index 1882d6d7b..ea45e1a32 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/TeamController.java
@@ -25,8 +25,6 @@ import
org.apache.streampark.console.system.service.TeamService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -39,7 +37,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
-@Tag(name = "TEAM_TAG")
@Slf4j
@Validated
@RestController
@@ -48,21 +45,18 @@ public class TeamController {
@Autowired private TeamService teamService;
- @Operation(summary = "List teams")
@PostMapping("list")
public RestResponse teamList(RestRequest restRequest, Team team) {
IPage<Team> teamList = teamService.page(team, restRequest);
return RestResponse.success(teamList);
}
- @Operation(summary = "Check the team name")
@PostMapping("check/name")
public RestResponse checkTeamName(@NotBlank(message = "{required}") String
teamName) {
Team result = this.teamService.findByName(teamName);
return RestResponse.success(result == null);
}
- @Operation(summary = "Create team")
@PostMapping("post")
@RequiresPermissions("team:add")
public RestResponse addTeam(@Valid Team team) {
@@ -70,7 +64,6 @@ public class TeamController {
return RestResponse.success();
}
- @Operation(summary = "Delete team")
@DeleteMapping("delete")
@RequiresPermissions("team:delete")
public RestResponse deleteTeam(Team team) {
@@ -78,7 +71,6 @@ public class TeamController {
return RestResponse.success();
}
- @Operation(summary = "Update team")
@PutMapping("update")
@RequiresPermissions("team:update")
public RestResponse updateTeam(Team team) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index 80e41306f..a5d34b0f0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -32,8 +32,6 @@ import
org.apache.streampark.console.system.service.UserService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -49,7 +47,6 @@ import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
-@Tag(name = "USER_TAG")
@Slf4j
@Validated
@RestController
@@ -62,7 +59,6 @@ public class UserController {
@Autowired private ServiceHelper serviceHelper;
- @Operation(summary = "List users")
@PostMapping("list")
@RequiresPermissions("user:view")
public RestResponse userList(RestRequest restRequest, User user) {
@@ -70,7 +66,6 @@ public class UserController {
return RestResponse.success(userList);
}
- @Operation(summary = "Create user")
@PostMapping("post")
@RequiresPermissions("user:add")
public RestResponse addUser(@Valid User user) throws Exception {
@@ -79,7 +74,6 @@ public class UserController {
return RestResponse.success();
}
- @Operation(summary = "Update user")
@PutMapping("update")
@PermissionScope(user = "#user.id")
@RequiresPermissions("user:update")
@@ -88,7 +82,6 @@ public class UserController {
return RestResponse.success();
}
- @Operation(summary = "Delete user")
@DeleteMapping("delete")
@PermissionScope(user = "#userId")
@RequiresPermissions("user:delete")
@@ -97,7 +90,6 @@ public class UserController {
return RestResponse.success();
}
- @Operation(summary = "List without token users")
@RequiresPermissions("token:add")
@PostMapping("getNoTokenUser")
public RestResponse getNoTokenUser() {
@@ -105,14 +97,12 @@ public class UserController {
return RestResponse.success(userList);
}
- @Operation(summary = "Check the username")
@PostMapping("check/name")
public RestResponse checkUserName(@NotBlank(message = "{required}") String
username) {
boolean result = this.userService.findByName(username) == null;
return RestResponse.success(result);
}
- @Operation(summary = "Update password")
@PermissionScope(user = "#user.id")
@PutMapping("password")
public RestResponse updatePassword(User user) throws Exception {
@@ -120,7 +110,6 @@ public class UserController {
return RestResponse.success();
}
- @Operation(summary = "Reset password")
@PutMapping("password/reset")
@RequiresPermissions("user:reset")
public RestResponse resetPassword(@NotBlank(message = "{required}") String
username)
@@ -129,7 +118,6 @@ public class UserController {
return RestResponse.success(newPass);
}
- @Operation(summary = "Init the user teams")
@PostMapping("initTeam")
public RestResponse initTeam(Long teamId, Long userId) {
Team team = teamService.getById(teamId);
@@ -140,7 +128,6 @@ public class UserController {
return RestResponse.success();
}
- @Operation(summary = "Set the current user teams")
@PostMapping("setTeam")
public RestResponse setTeam(Long teamId) {
Team team = teamService.getById(teamId);
@@ -159,7 +146,6 @@ public class UserController {
return new RestResponse().data(infoMap);
}
- @Operation(summary = "List the team users")
@PostMapping("appOwners")
public RestResponse appOwners(Long teamId) {
List<User> userList = userService.findByAppOwner(teamId);
diff --git
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
index e3ca21f77..4abd10df8 100644
---
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
+++
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkCheckpointWatcher.scala
@@ -69,7 +69,7 @@ class FlinkCheckpointWatcher(conf: MetricWatcherConfig =
MetricWatcherConfig.def
/** closes resource, relinquishing any underlying resources. */
override def doClose(): Unit = {
- if (!timerSchedule.isCancelled) {
+ if (Option(timerSchedule).isDefined && !timerSchedule.isCancelled) {
timerSchedule.cancel(true)
}
logInfo("[flink-k8s] FlinkCheckpointWatcher closed.")
diff --git
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkMetricsWatcher.scala
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkMetricsWatcher.scala
index 7201dec13..569c5a2fc 100644
---
a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkMetricsWatcher.scala
+++
b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/watcher/FlinkMetricsWatcher.scala
@@ -69,7 +69,7 @@ class FlinkMetricWatcher(conf: MetricWatcherConfig =
MetricWatcherConfig.default
/** closes resource, relinquishing any underlying resources. */
override def doClose(): Unit = {
- if (!timerSchedule.isCancelled) {
+ if (Option(timerSchedule).isDefined && !timerSchedule.isCancelled) {
timerSchedule.cancel(true)
}
logInfo("[flink-k8s] FlinkMetricWatcher closed.")
